redrecord 0.2 → 0.3

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.3. Support bang and question mark method rewrites
+
 v0.2. Support disabling cache on timeout
 
 v0.1. First version

data/lib/redrecord.rb

@@ -17,8 +17,9 @@ class Redrecord
           Timeout.timeout(@timeout || 15) do
             redis.send(op, *args)
           end
-        rescue Timeout::Error
-          @enabled = nil
+        rescue Exception => e
+          STDERR.puts "Redrecord: Disabling redis due to exception (#{e})"
+          @enabled = false
         end
       end
     end
@@ -44,7 +45,8 @@ class Redrecord
         end
         redrecord_cached_fields.push(*fields)
         fields.each do |f|
-          define_method "#{f}_with_cache" do
+          aliased_target, punctuation = f.to_s.sub(/([?!=])$/, ''), $1
+          define_method("#{aliased_target}_with_cache#{punctuation}") do
             cached_method(f)
           end
           alias_method_chain f, :cache
@@ -95,6 +97,7 @@ class Redrecord
           record.remove_from_cache!
         elsif command == :save
           record.add_to_cache!
+          # possible todo: cascade invalidation (but avoid loops)
         end
       end
       Redrecord.update_queue.clear
@@ -111,7 +114,8 @@ class Redrecord
     def add_to_cache!
       Redrecord.redis_op(:hmset, redrecord_key,
         *(self.class.redrecord_cached_fields.map {|f|
-          val = send("#{f}_without_cache")
+          aliased_target, punctuation = f.to_s.sub(/([?!=])$/, ''), $1
+          val = send("#{aliased_target}_without_cache#{punctuation}")
           [f.to_s, String===val && !Redrecord.is_marshalled?(val) ? val : Marshal.dump(val)]
         }.flatten)
       )
@@ -130,7 +134,8 @@ class Redrecord
         h[k.to_sym] = if(cached = (redrecord_redis_cache && redrecord_redis_cache[k.to_s] unless new_record?))
           Redrecord.is_marshalled?(cached) ? Marshal.load(cached) : cached
         else
-          send("#{k}_without_cache")
+          aliased_target, punctuation = k.to_s.sub(/([?!=])$/, ''), $1
+          send("#{aliased_target}_without_cache#{punctuation}")
         end
       end
     end

data/redrecord.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redrecord"
-  s.version = "0.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2012-01-25"
+  s.date = "2012-01-26"
   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

@@ -9,6 +9,7 @@ require "#{File.dirname(__FILE__)}/test_helper"
 class TestRedrecord < Test::Unit::TestCase
   def setup
     $redis.flushdb
+    Redrecord.redis = $redis
     Redrecord.enabled = true
     @user = TestUser.new(1, 'John', 'Smith')
     $saved = {}
@@ -88,6 +89,7 @@ class TestRedrecord < Test::Unit::TestCase
     assert_equal({
         :nil         => nil,
         :group_names => [],
+        :valid?      => true,
         :full_name   => 'John Smith'},
       @user.cached_fields)
   end
@@ -99,6 +101,7 @@ class TestRedrecord < Test::Unit::TestCase
         :id          => 1,
         :nil         => nil,
         :group_names => [],
+        :valid?      => true,
         :full_name   => 'John Smith'},
       @user.attribs_with_cached_fields)
   end
@@ -120,5 +123,17 @@ class TestRedrecord < Test::Unit::TestCase
     assert_nil $redis.hget('TestUser:1', 'full_name')
   end
 
+  def test_question_marked_method
+    @user.save
+    u2 = TestUser.new(1, 'Bob', 'Smith')
+    assert_equal true, u2.valid?
+    assert !u2.recalculated    
+  end
   
+  def test_disable_due_to_exception
+    Redrecord.redis = nil
+    @user.save
+    assert_equal false, Redrecord.enabled
+  end
+
 end

data/test/test_helper.rb

@@ -1,8 +1,6 @@
 
 # WARNING: The database specified here will be CLEARED of ALL DATA
 $redis = Redis.new(:host => 'localhost', :port => 6379, :db => 15)
-Redrecord.redis = $redis
-Redrecord.enabled = true
 
 class TestModel
   extend ActiveModel::Callbacks
@@ -67,5 +65,8 @@ class TestUser < TestModel
     def group_names
       $saved.values.select {|v| TestGroup===v && v.user.id == self.id }.map(&:name).sort
     end
+    def valid?
+      true
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redrecord
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &81395770 !ruby/object:Gem::Requirement
+  requirement: &71491920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81395770
+  version_requirements: *71491920
 - !ruby/object:Gem::Dependency
   name: active_model
-  requirement: &81395260 !ruby/object:Gem::Requirement
+  requirement: &71490960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81395260
+  version_requirements: *71490960
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &81394630 !ruby/object:Gem::Requirement
+  requirement: &71490120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81394630
+  version_requirements: *71490120
 description: Redis cacheing for ActiveRecord
 email: andrew@modulus.org
 executables: []