Merge pull request #9 from iron-io/rails4optionsbug

Fix for rails 4 session options issue, doesn't support merge method anym...
iron-io · Feb 6, 2014 · 6ea477c · 6ea477c
2 parents 58b3c90 + 755cb31
commit 6ea477c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    iron_cache_rails (0.1.3)
+    iron_cache_rails (0.1.5)
       iron_cache (>= 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    iron_cache (1.3.0)
-      iron_core (>= 0.4.2)
-    iron_core (0.4.4)
-      rest (>= 2.1.1)
-    mime-types (1.19)
-    minitest (4.1.0)
-    net-http-persistent (2.8)
-    rake (0.9.2.2)
-    rest (2.1.1)
+    iron_cache (1.4.0)
+      iron_core (>= 0.5.1)
+    iron_core (1.0.3)
+      rest (>= 2.6.4)
+    minitest (5.2.2)
+    net-http-persistent (2.9.1)
+    netrc (0.7.7)
+    rake (10.1.1)
+    rest (2.7.0)
       net-http-persistent
-      rest-client (>= 0.3.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    test-unit (2.5.2)
-    uber_config (1.0.5)
+      rest_client (>= 1.7.1)
+    rest_client (1.7.2)
+      netrc (~> 0.7.7)
+    test-unit (2.5.5)
+    uber_config (1.1.0)
 
 PLATFORMS
   ruby

diff --git a/lib/action_dispatch/session/iron_cache.rb b/lib/action_dispatch/session/iron_cache.rb
@@ -33,7 +33,7 @@ def get_session(env, session_id)
 
       def set_session(env, session_id, session, options={})
         with_namespace(session_id, options) do |cache, k|
-          cache.put(k, serialize_entry(session, options), options)
+          cache.put(k, serialize_entry(session, options), options.to_hash) # need to_hash because options is: http://rubydoc.info/docs/rails/ActionDispatch/Request/Session/Options
         end
 
         session_id