second_level_cache 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9098d3b53d06dba76eac46bf8ff1cfd425264b3
-  data.tar.gz: 77d704ad5801a62ef5724a0b27f9d29622c1c1af
+  metadata.gz: 1392768f194ffb89966d45e3ff188e76d7434969
+  data.tar.gz: 5cd7882ada9458b1f3adae84c283baa5e1ecfa3d
 SHA512:
-  metadata.gz: d7f1f0d957c2fa492acf8ece6fd84c119f655ddfa3b5312c77b66ea03b58f88c47bfd3799ffc64a8375fdca7d8af87fcfaab2996038a3325850f4bace189d5cd
-  data.tar.gz: 0bff288d367e69dccd31a9fff26563965750cdbd755fbd1032c4e8e3b8eb5387a21ddf1267a7a6b486017af78a492b7fc5f0dff0caedf627435980e28ec701a1
+  metadata.gz: b2714be392bb81513af6919240e559dd326d0361a4d24c020083aa4a74416e6ae5f7d576d923da4b6ee610b71ceaaafdd8cb8753969e2a7968c1ae9cb35fc748
+  data.tar.gz: ed1c0d06863e6385415bd25946851e7726b4887d4c4125345052b2685979ccc837eb53ede7075e25a67f88c8ee3a0ec8f9413eb72d245132aeae7e7ddffd6f61

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 4.1'

data/README.md

@@ -17,7 +17,7 @@ Write-Through: As objects are created, updated, and deleted, all of the caches a
 In your gem file:
 
 ```ruby
-gem "second_level_cache", "~> 2.1.5"
+gem "second_level_cache", "~> 2.1.6"
 ```
 
 For ActiveRecord 3:

data/lib/second_level_cache/record_marshal.rb

@@ -27,13 +27,28 @@ module RecordMarshal
       if ::ActiveRecord::VERSION::STRING < '4.2.0'
         klass.serialized_attributes.each do |k, v|
           next if attributes[k].nil? || attributes[k].is_a?(String)
-          attributes[k] = attributes[k].serialized_value if attributes[k].respond_to?(:unserialize)
+          if attributes[k].respond_to?(:unserialize)
+            if attributes[k].serialized_value.is_a?(String)
+              attributes[k] = attributes[k].serialized_value
+              next
+            end
+
+            if ::ActiveRecord::VERSION::STRING >= '4.1.0' && attributes[k].coder == ActiveRecord::Coders::JSON
+              attributes[k] = attributes[k].serialized_value.to_json
+            else
+              attributes[k] = attributes[k].serialized_value
+            end
+          end
         end
       else
         klass.columns.select{|t| t.cast_type.is_a?(::ActiveRecord::Type::Serialized) }.each do |c|
           name, coder = c.name, c.cast_type.coder
           next if attributes[name].nil? || attributes[name].is_a?(String)
-          attributes[name] = coder.dump(attributes[name]) if attributes[name].is_a?(coder.object_class)
+          if coder.is_a?(ActiveRecord::Coders::YAMLColumn)
+            attributes[name] = coder.dump(attributes[name]) if attributes[name].is_a?(coder.object_class)
+          elsif coder == ActiveRecord::Coders::JSON
+            attributes[name] = attributes[name].to_json
+          end
         end
       end
       klass.instantiate(attributes)

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module SecondLevelCache 
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

data/test/model/user.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
   t.text    :options
+  t.text    :json_options
   t.string  :name, :unique => true
   t.string  :email
   t.integer :books_count, :default => 0
@@ -11,6 +12,9 @@ end
 class User < ActiveRecord::Base
   CacheVersion = 3
   serialize :options, Array
+  if ::ActiveRecord::VERSION::STRING >= '4.1.0'
+    serialize :json_options, JSON
+  end
   acts_as_cached(:version => CacheVersion, :expires_in => 3.day)
   has_one  :account
   has_many :books

data/test/record_marshal_test.rb

@@ -3,7 +3,17 @@ require 'test_helper'
 
 class RecordMarshalTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com', :options => [1,2]
+    if ::ActiveRecord::VERSION::STRING >= '4.1.0'
+      @json_options = { "name" => 'Test', "age" => 18 }
+      @user = User.create :name => 'csdn',
+                :email => 'test@csdn.com',
+                :options => [1,2],
+                :json_options => @json_options
+    else
+      @user = User.create :name => 'csdn',
+                :email => 'test@csdn.com',
+                :options => [1,2]
+    end
   end
 
   def test_should_dump_active_record_object
@@ -21,6 +31,11 @@ class RecordMarshalTest < ActiveSupport::TestCase
     assert_equal Array, User.read_second_level_cache(@user.id).reload.options.class
     assert_equal User.read_second_level_cache(@user.id).changed?, false
     assert_equal [1,2], User.read_second_level_cache(@user.id).options
+    if ::ActiveRecord::VERSION::STRING >= '4.1.0'
+      result = User.read_second_level_cache(@user.id)
+      assert_equal @json_options["name"], result.json_options["name"]
+      assert_equal @json_options, result.json_options
+    end
     assert User.read_second_level_cache(@user.id).persisted?
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Hooopo