Use MultiJson to produce HashWithIndifferentAccess

From bogdanRada's patch
#61 (comment)

Author: Rada Bogdan Raul

Rakefile

@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+require 'bundler/setup'
 require "bundler/gem_tasks"
 require 'rake/testtask'
 

activerecord-session_store.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 4.0.0', '< 5')
   s.add_dependency('actionpack', '>= 4.0.0', '< 5')
   s.add_dependency('railties', '>= 4.0.0', '< 5')
+  s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
 
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('appraisal')

lib/active_record/session_store.rb

@@ -1,6 +1,7 @@
 require 'action_dispatch/session/active_record_store'
 require "active_record/session_store/extension/logger_silencer"
 require 'active_support/core_ext/hash/keys'
+require 'multi_json'
 
 module ActiveRecord
   module SessionStore
@@ -57,12 +58,12 @@ def self.dump(value)
       # Uses built-in JSON library to encode/decode session
       class JsonSerializer
         def self.load(value)
-          hash = JSON.parse(value, quirks_mode: true).with_indifferent_access
+          hash = MultiJson.load(value).with_indifferent_access
           hash[:value]
         end
 
         def self.dump(value)
-          JSON.generate({value: value}, quirks_mode: true)
+          MultiJson.dump(value: value)
         end
       end
 

test/action_controller_test.rb

@@ -2,6 +2,7 @@
 
 class ActionControllerTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base
+    protect_from_forgery
     def no_session_access
       head :ok
     end

test/session_test.rb

@@ -13,6 +13,7 @@ def setup
         ActiveRecord::Base.connection.schema_cache.clear!
         Session.drop_table! if Session.table_exists?
         @session_klass = Class.new(Session)
+        ActiveRecord::SessionStore::Session.serializer = :json
       end
 
       def test_data_column_name
@@ -38,7 +39,8 @@ def test_json_serialization
         s = session_klass.create!(:data => 'world', :session_id => '7')
 
         sessions = ActiveRecord::Base.connection.execute("SELECT * FROM #{Session.table_name}")
-        assert_equal JSON.generate({value: s.data}, quirks_mode: true), sessions[0][Session.data_column_name]
+        data = Session.deserialize(sessions[0][Session.data_column_name])
+        assert_equal s.data, data
       end
 
       def test_hybrid_serialization
@@ -54,7 +56,7 @@ def test_hybrid_serialization
         # Check that first was serialized with Marshal and second as JSON
         sessions = ActiveRecord::Base.connection.execute("SELECT * FROM #{Session.table_name}")
         assert_equal ::Base64.encode64(Marshal.dump(s1.data)), sessions[0][Session.data_column_name]
-        assert_equal JSON.generate({value: s2.data}, quirks_mode: true), sessions[1][Session.data_column_name]
+        assert_equal  s2.data, Session.deserialize(sessions[1][Session.data_column_name])
       end
 
       def test_hybrid_deserialization
@@ -77,7 +79,7 @@ def test_hybrid_deserialization
         # and reserializes as JSON
         session.save
         sessions = ActiveRecord::Base.connection.execute("SELECT * FROM #{Session.table_name}")
-        assert_equal JSON.generate({value: s.data}, quirks_mode: true), sessions[0][Session.data_column_name]
+        assert_equal s.data,Session.deserialize(sessions[0][Session.data_column_name])
       end
 
       def test_find_by_sess_id_compat