second_level_cache 2.1.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb07072700dce834842d9754944d53a7979dee6e
-  data.tar.gz: af6487f82394c38724fb9b7dd5b74bcfab99c461
+  metadata.gz: f9098d3b53d06dba76eac46bf8ff1cfd425264b3
+  data.tar.gz: 77d704ad5801a62ef5724a0b27f9d29622c1c1af
 SHA512:
-  metadata.gz: 6c3c0b7fee0c8d0a3438293a9f2ce74162ef64a42efa52022cb68a71ef8c84c7b54b371c1563f6a5a2022c64621db43905d709ea995537d2ae262798bc004809
-  data.tar.gz: ad86ef72719f22ea78ba9c20e968d06ce8de57b9969aca6f4a2ac937edb6511892cceb80407623bb7131f9c2c4421d7528c99703d982dfab2a7d6e0722344361
+  metadata.gz: d7f1f0d957c2fa492acf8ece6fd84c119f655ddfa3b5312c77b66ea03b58f88c47bfd3799ffc64a8375fdca7d8af87fcfaab2996038a3325850f4bace189d5cd
+  data.tar.gz: 0bff288d367e69dccd31a9fff26563965750cdbd755fbd1032c4e8e3b8eb5387a21ddf1267a7a6b486017af78a492b7fc5f0dff0caedf627435980e28ec701a1

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.2"
+gem "second_level_cache", "~> 2.1.5"
 ```
 
 For ActiveRecord 3:

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -30,7 +30,7 @@ module SecondLevelCache
       
       def cache_uniq_key(where_values)
         ext_key = where_values.collect { |k,v|
-          v = Digest::MD5.hexdigest(v) if v.size >= 32
+          v = Digest::MD5.hexdigest(v) if v && v.size >= 32
           [k,v].join("_")
         }.join(",")
         "uniq_key_#{self.name}_#{ext_key}"

data/lib/second_level_cache/record_marshal.rb

@@ -19,7 +19,24 @@ module RecordMarshal
     # load a cached record
     def load(serialized)
       return unless serialized
-      serialized[0].constantize.instantiate(serialized[1])
+      #fix issues 19
+      #fix 2.1.2 object.changed? ActiveRecord::SerializationTypeMismatch: Attribute was supposed to be a Hash, but was a String. -- "{:a=>\"t\", :b=>\"x\"}"
+      #fix 2.1.4 object.changed? is true
+      #fix Rails 4.2 is deprecating `serialized_attributes` without replacement to Rails 5 is deprecating `serialized_attributes` without replacement
+      klass, attributes = serialized[0].constantize, serialized[1]
+      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)
+        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)
+        end
+      end
+      klass.instantiate(attributes)
     end
 
     def load_multi(serializeds)

data/lib/second_level_cache/version.rb

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

data/second_level_cache.gemspec

@@ -35,5 +35,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "activerecord", ["> 4.0.0", "< 5.0"]
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency 'pry'
   gem.add_development_dependency "database_cleaner", "~> 1.3.0"
 end

data/test/fetch_by_uniq_key_test.rb

@@ -10,6 +10,7 @@ class FetchByUinqKeyTest < ActiveSupport::TestCase
   def test_cache_uniq_key
     assert_equal User.send(:cache_uniq_key, { :name => "hooopo" } ), "uniq_key_User_name_hooopo"
     assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => 2 } ), "uniq_key_User_foo_1,bar_2"
+    assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => nil } ), "uniq_key_User_foo_1,bar_"
     long_val = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => long_val } ), "uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
   end

data/test/record_marshal_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 class RecordMarshalTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+    @user = User.create :name => 'csdn', :email => 'test@csdn.com', :options => [1,2]
   end
 
   def test_should_dump_active_record_object
@@ -17,6 +17,11 @@ class RecordMarshalTest < ActiveSupport::TestCase
   def test_should_load_active_record_object
     @user.write_second_level_cache
     assert_equal @user, User.read_second_level_cache(@user.id)
+    assert_equal Array, User.read_second_level_cache(@user.id).options.class
+    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
+    assert User.read_second_level_cache(@user.id).persisted?
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.5
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired