encrypted_cookie_store-instructure 1.2.6 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1b7aff6c8074b413e1a4d0551fcab85ccaf6732
-  data.tar.gz: b94f627a07f1ce9d92148b725036a6cab33ca077
+SHA256:
+  metadata.gz: eb7c53623b366da62357f1348401eacdc3ace0cda08df3d2baf9a63dbe055df7
+  data.tar.gz: deb8705d889c4111fb0078c3252126d268ade6a6bd264a57c3ee583f6adcb5d0
 SHA512:
-  metadata.gz: dd4fc6a3d423ba3a30537848f7cf14cdcfff77c9f4b2366e66d2317b9b9bddc9994710075fbcd37c7e659f4818b859c1b474e3be4e04fce3b3fb65ccc12df04a
-  data.tar.gz: 7cd4977213ccdbc0f2ac8008413bcc254743f67be5c7ec7f92403d95f0d1589f53079d7fcf20a3edcfcda518db40fbf10de7c2af342bedc47f9eaa9b81e5d764
+  metadata.gz: 7b23745ea67837701c13100356523a6c1ab125c4b2ae3d8f2077d151abed687689ef840121da1417b43d925ab769d54c2ff2d9b3e2ee89df76429153717dde03
+  data.tar.gz: 184092a8d7463b7b3ec1269e835198f0f7a5cabb66c1827152da51e473690cb2d1f378e0080a32ceaa6bed75f9098bb3eba1b29b19f15b101a428113151829fc

data/encrypted_cookie_store-instructure.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{encrypted_cookie_store-instructure}
-  s.version = "1.2.6"
+  s.version = "1.2.11"
 
   s.authors = ["Cody Cutrer", "Jacob Fugal", "James Williams"]
   s.date = %q{2013-12-20}
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.summary = %q{EncryptedCookieStore for Ruby on Rails 4.2}
   s.description = %q{A secure version of Rails' built in CookieStore}
 
-  s.add_dependency "actionpack", ">= 4.2", "< 5.2"
+  s.add_dependency "actionpack", ">= 4.2", "< 6.2"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-rails", "~> 3.5"

data/lib/encrypted_cookie_store.rb

@@ -97,7 +97,7 @@ module ActionDispatch
               data.stringify_keys!
             end
             data ||= {}
-            set_header(req, 'encrypted_cookie_store.original_cookie', data.deep_dup.except(:timestamp))
+            set_header(req, 'encrypted_cookie_store.original_cookie', data.deep_dup.except('timestamp'))
             data
           end
           set_header(req, k, v)
@@ -108,8 +108,16 @@ module ActionDispatch
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{write_session}(req, sid, session_data, options)
           session_data = super
-          session_data.delete(:timestamp)
-          marshal(session_data, options)
+          if session_data.is_a?(::ActionDispatch::Session::CookieStore::SessionId)
+            session_id = session_data
+            session_data = session_data.cookie_value
+            session_data.delete('timestamp')
+            session_id.instance_variable_set(:@cookie_value, marshal(session_data, options)) # swap out the cookie value
+            session_id
+          else
+            session_data.delete('timestamp')
+            marshal(session_data, options)
+          end
         end
       RUBY
 
@@ -124,7 +132,7 @@ module ActionDispatch
       end
 
       def session_changed?(req, session)
-        (session || {}).to_hash.stringify_keys.except(:timestamp) != (get_header(req, 'encrypted_cookie_store.original_cookie') || {})
+        (session || {}).to_hash.stringify_keys.except('timestamp') != (get_header(req, 'encrypted_cookie_store.original_cookie') || {})
       end
 
       def refresh_session?(req, options)
@@ -183,7 +191,7 @@ module ActionDispatch
             @logger.error("Could not unmarshal session_data: #{session_data.inspect}") if @logger
           end
 
-          loaded_data[:timestamp] = timestamp if loaded_data && timestamp
+          loaded_data['timestamp'] = timestamp if loaded_data && timestamp
           loaded_data
         else
           nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_cookie_store-instructure
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.11
 platform: ruby
 authors:
 - Cody Cutrer
 - Jacob Fugal
 - James Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-12-20 00:00:00.000000000 Z
@@ -21,7 +21,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A secure version of Rails' built in CookieStore
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -88,7 +88,7 @@ files:
 homepage: http://github.com/ccutrer/encrypted_cookie_store
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: EncryptedCookieStore for Ruby on Rails 4.2
 test_files: []