redrecord 0.6 → 0.7

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7. Fix for inherited ActiveRecord classes and cache verify function bug
+
 v0.6. Don't bother marshalling when storing integers
 
 v0.5. Support cache verify method

data/lib/redrecord.rb

@@ -46,11 +46,11 @@ class Redrecord
     module ClassMethods
 
       def redrecord_cached_fields
-        @redrecord_cached_fields ||= []
+        @redrecord_cached_fields ||= [] + (superclass.respond_to?(:redrecord_cached_fields) ? [*superclass.redrecord_cached_fields] : [])
       end
 
       def redrecord_invalidation_fields
-        @redrecord_invalidation_fields ||= []
+        @redrecord_invalidation_fields ||= [] + (superclass.respond_to?(:redrecord_invalidation_fields) ? [*superclass.redrecord_invalidation_fields] : [])
       end
       
       def redis_cache(*fields, &bl)
@@ -59,6 +59,7 @@ class Redrecord
           class_eval(&bl)
           fields.push(*(instance_methods - old_methods))
         end
+        fields = fields.select {|f| instance_method(f).arity < 1 }
         redrecord_cached_fields.push(*fields)
         fields.each do |f|
           aliased_target, punctuation = f.to_s.sub(/([?!=])$/, ''), $1
@@ -140,8 +141,9 @@ class Redrecord
     def verify_cache!
       (redis_cached_keys = Redrecord.redis_op(:hkeys, redrecord_key)) && redis_cached_keys.each do |key|
         calculated = redrecord_uncached_value(key)
-        if(redrecord_cached_attrib_hash[key] != calculated)
-          raise "#{redrecord_key}.#{key}: expected <#{calculated}> but got <#{redrecord_cached_attrib_hash[key]}> from redis cache"
+        cachedval = Redrecord.unmarshal(Redrecord.redis_op(:hget, redrecord_key, key))
+        if(calculated != cachedval)
+          raise "#{redrecord_key}.#{key}: expected <#{calculated}> but got <#{cachedval}> from redis cache"
         end
       end
     end

data/redrecord.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redrecord"
-  s.version = "0.6"
+  s.version = "0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2012-02-08"
+  s.date = "2012-02-17"
   s.description = "Redis cacheing for ActiveRecord"
   s.email = "andrew@modulus.org"
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/redrecord.rb"]

data/test/test_all.rb

@@ -158,5 +158,11 @@ class TestRedrecord < Test::Unit::TestCase
       @user.verify_cache!
     end
   end  
+  
+  def test_inherited_invalidations
+    assert_equal [:user], TestGroup.redrecord_invalidation_fields
+    assert_equal [:user], TestDeepGroup.redrecord_invalidation_fields
+    assert_equal [], TestModel.redrecord_invalidation_fields
+  end
 
 end

data/test/test_helper.rb

@@ -48,6 +48,9 @@ class TestGroup < TestModel
   invalidate_cache_on :user
 end
 
+class TestDeepGroup < TestGroup
+end
+
 class TestUser < TestModel
   attr_accessor :first_name, :last_name, :id, :recalculated
   def initialize(id, first_name=nil, last_name=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redrecord
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &73055740 !ruby/object:Gem::Requirement
+  requirement: &82176900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73055740
+  version_requirements: *82176900
 - !ruby/object:Gem::Dependency
   name: active_model
-  requirement: &73054380 !ruby/object:Gem::Requirement
+  requirement: &82311130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73054380
+  version_requirements: *82311130
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &73053190 !ruby/object:Gem::Requirement
+  requirement: &82310630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73053190
+  version_requirements: *82310630
 description: Redis cacheing for ActiveRecord
 email: andrew@modulus.org
 executables: []