redrecord 0.5 → 0.6

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.6. Don't bother marshalling when storing integers
 
 v0.5. Support cache verify method
 

data/lib/redrecord.rb

@@ -11,6 +11,22 @@ class Redrecord
     def is_marshalled?(str)
       Marshal.dump(nil)[0,2] == str[0,2]
     end
+    def unmarshal(str)
+      if(is_marshalled?(str))
+        Marshal.load(str)
+      elsif(str =~ /^\d+$/)
+        str.to_i
+      else
+        str
+      end
+    end
+    def marshal(obj)
+      if Integer===obj || String===obj && obj !~ /^\d+$/ && !is_marshalled?(obj)
+        obj.to_s
+      else
+        Marshal.dump(obj)
+      end
+    end
     def redis_op(op, *args)
       if @enabled
         begin
@@ -18,7 +34,7 @@ class Redrecord
             redis.send(op, *args)
           end
         rescue Exception => e
-          STDERR.puts "Redrecord: Disabling redis due to exception (#{e})"
+          $stderr.puts "Redrecord: Disabling redis due to exception (#{e})"
           @enabled = false
         end
       end
@@ -116,13 +132,13 @@ class Redrecord
         *(self.class.redrecord_cached_fields.map {|f|
           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)]
+          [f.to_s, Redrecord.marshal(val)]
         }.flatten)
       )
     end
     
     def verify_cache!
-      redrecord_redis_cache && redrecord_redis_cache.keys.each do |key|
+      (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"
@@ -141,7 +157,7 @@ class Redrecord
     def redrecord_cached_attrib_hash
       @redrecord_cached_attrib_hash ||= Hash.new do |h,k|
         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
+          Redrecord.unmarshal(cached)
         else
           redrecord_uncached_value(k)
         end

data/redrecord.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "redrecord"
-  s.version = "0.5"
+  s.version = "0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]

data/test/test_all.rb

@@ -37,6 +37,12 @@ class TestRedrecord < Test::Unit::TestCase
     u2 = TestUser.new(1, 'John', 'Smith')
     assert_nil u2.nil
   end
+  
+  def test_number
+    @user.save
+    assert_equal '12345', $redis.hget('TestUser:1', 'number')
+    assert_equal 12345, @user.number_with_cache
+  end
 
   def test_invalidation_on_save
     @user.save
@@ -90,6 +96,7 @@ class TestRedrecord < Test::Unit::TestCase
         :nil         => nil,
         :group_names => [],
         :valid?      => true,
+        :number      => 12345,
         :full_name   => 'John Smith'},
       @user.cached_fields)
   end
@@ -102,6 +109,7 @@ class TestRedrecord < Test::Unit::TestCase
         :nil         => nil,
         :group_names => [],
         :valid?      => true,
+        :number      => 12345,
         :full_name   => 'John Smith'},
       @user.attribs_with_cached_fields)
   end
@@ -132,15 +140,17 @@ class TestRedrecord < Test::Unit::TestCase
   
   def test_disable_due_to_exception
     Redrecord.redis = nil
+    old = $stderr ; $stderr = StringIO.new
     @user.save
+    $stderr = old
     assert_equal false, Redrecord.enabled
   end
 
   def test_verify_ok
     @user.save
-    assert_equal ["full_name", "nil", "group_names", "valid?"].sort, @user.verify_cache!.sort
+    assert_equal ["full_name", "nil", "group_names", "valid?", "number"].sort, @user.verify_cache!.sort
   end
-  
+
   def test_verify_fail
     @user.save
     assert_raises RuntimeError do

data/test/test_helper.rb

@@ -68,5 +68,8 @@ class TestUser < TestModel
     def valid?
       true
     end
+    def number
+      12345
+    end
   end
 end

metadata

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