redis-persistence 0.0.8 → 0.0.9

data/lib/redis/persistence.rb

@@ -145,7 +145,9 @@ class Redis
         properties << name.to_s unless properties.include?(name.to_s)
 
         # Save property default value (when relevant):
-        property_defaults[name.to_sym] = options[:default] if options[:default]
+        unless (default_value = options.delete(:default)).nil?
+          property_defaults[name.to_sym] = default_value.respond_to?(:call) ? default_value.call : default_value
+        end
 
         # Save property casting (when relevant):
         property_types[name.to_sym]    = options[:class]   if options[:class]
@@ -224,10 +226,10 @@ class Redis
 
       def __find_one(id, options={})
         families = options[:families] == 'all' ? family_properties.keys.map(&:to_s) : [DEFAULT_FAMILY.to_s] | Array(options[:families])
-        data = __redis.hmget("#{self.model_name.plural}:#{id}", *families)
+        data = __redis.hmget("#{self.model_name.plural}:#{id}", *families).compact
 
-        unless data.compact.empty?
-          attributes = data.compact.inject({}) { |hash, item| hash.update( MultiJson.decode(item, :symbolize_keys => true) ); hash }
+        unless data.empty?
+          attributes = data.inject({}) { |hash, item| hash.update( MultiJson.decode(item, :symbolize_keys => true) ); hash }
           instance   = self.new attributes
           instance.__loaded_families = families
           instance
@@ -353,7 +355,7 @@ class Redis
       def reload(options={})
         families = self.__loaded_families | Array(options[:families])
         reloaded = self.class.find(self.id, options.merge(families: families))
-        self.attributes        = reloaded.attributes
+        self.__update_attributes reloaded.attributes
         self.__loaded_families = reloaded.__loaded_families
         self
       end

data/lib/redis/persistence/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Persistence
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/redis-persistence.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "shoulda"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "turn"
+  gem.add_development_dependency "rake"
 end

data/test/models.rb

@@ -125,3 +125,10 @@ class ModelWithDefaultsInFamilies
   property :name
   property :tags, :default => [], :family => 'tags'
 end
+
+class ModelWithDefaultLambdas
+  include Redis::Persistence
+
+  property :name
+  property :created_at, :default => lambda { Time.now }
+end

data/test/redis_persistence_test.rb

@@ -76,6 +76,11 @@ class RedisPersistenceTest < ActiveSupport::TestCase
       assert_equal true, d.admin
     end
 
+    should "evaluate lambdas as default values" do
+      d = ModelWithDefaultLambdas.new
+      assert_kind_of Time, d.created_at
+    end
+
     should "return time as time" do
       a = PersistentArticle.create created: Time.new(2011, 11, 9).utc
       assert_instance_of Time, a.created

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-persistence
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -156,6 +156,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple ActiveModel-compatible persistence layer in Redis
 email:
 - karmi@karmi.cz
@@ -197,18 +213,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3162523581224626166
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3162523581224626166
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -220,3 +230,4 @@ test_files:
 - test/active_model_lint_test.rb
 - test/models.rb
 - test/redis_persistence_test.rb
+has_rdoc: