active_redis_orm 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ee3727d5395eeabf2d760c12804c8f1e44599f
-  data.tar.gz: 1a306062eb3d4efdc56f1f7cfe3d35e76d2ec728
+  metadata.gz: 1e1021d6d4648f60ea3e3a7fe147b34c3e6bcf55
+  data.tar.gz: 24eda56cdfd8fac30bb28da108c3afe8dbc2f763
 SHA512:
-  metadata.gz: 2886bd6a3a46e1ec1990ae972e30f7aee3ddbdfa660dacbd6a9214c4449a317e1680d3bba32ab1217936c9229c12a9f885801eb860d991ec7ac9318aaf9a91e7
-  data.tar.gz: 112cfe96ba02cea3a7e6256b535630ccf49b1741d394af0912acd5a05dec4c1237d9c854f66aa4a09c90518e80f0e44e853a54df52292ec7dde2d421f7f636e8
+  metadata.gz: a232580244b896dbf48b713d6d3e4710c188ce1bc622b8f116ea8ae3a6ccbec4637234e2af65eb4d1452bb6a6c7f39a0049f282276906eb3750e0521a6aa6f0a
+  data.tar.gz: 9385c39fb427b4f1bc5b4a416ecfa98c461df4f099aaaef428c7dae2b642dfd97206ff952f34383c75bc72ba928355b6c86e7b8934ea634ef68040f30a6269d0

data/lib/active_redis/attributes.rb

@@ -81,6 +81,10 @@ module ActiveRedis
       else
         string_field(field_name, options)
       end
+
+      if options[:default]
+        set_default(field_name, options[:default])
+      end
     end
 
     def string_field(field_name, options)
@@ -391,11 +395,18 @@ module ActiveRedis
             if value.blank?
               nil
             else
-              Date.parse(value)
+              Date.parse(value) rescue nil
             end
           end
         end
 
+        def #{field_name}=(value)
+          value = ActiveRedis::NilObject.new if (Date.parse(value.to_s) rescue nil).blank?
+          #{field_name}_will_change!
+          value = ActiveRedis::NilObject.new if value.nil?
+          @attributes[:#{field_name}] = value
+        end
+
         def set_#{field_name}(value)
           #{field_name}_object.value = value.last.to_s
           after_set(:#{field_name})
@@ -443,5 +454,18 @@ module ActiveRedis
         end
       }
     end
+
+    def set_default(field_name, default)
+      before_create do
+        if send(field_name).blank?
+          if default.is_a?(Proc)
+            value = default.call(self)
+          else
+            value = default
+          end
+          send("#{field_name}=", value)
+        end
+      end
+    end
   end
 end

data/lib/active_redis/nil_object.rb

@@ -3,5 +3,9 @@ module ActiveRedis
     def nil?
       true
     end
+
+    def present?
+      false
+    end
   end
 end

data/lib/active_redis/save.rb

@@ -44,9 +44,9 @@ module ActiveRedis
     end
 
     def perform_create
+      #TODO: check if no object exists under that id
+      @id ||= SecureRandom.uuid().delete('-')
       run_callbacks :create do
-        #TODO: check if no object exists under that id
-        @id ||= SecureRandom.uuid().delete('-')
         perform_save
       end
     end

data/lib/active_redis/version.rb

@@ -1,3 +1,3 @@
 module ActiveRedis
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/attributes_spec.rb

@@ -3,10 +3,19 @@ require "active_redis_orm"
 describe ActiveRedis do
   class AttributesObject < ActiveRedis::Base
     attr_accessible :foo, :bar, :list
+    field :foo, default: lambda{|item| item.id}
+    field :bar, default: "barbar"
+    field :list
   end
 
   it "deals with attributes in string or symbol implementation" do
     AttributesObject.should be_attr_accessible("bar")
     AttributesObject.should be_attr_accessible(:bar)
   end
+
+  it "sets the defaults" do
+    item = AttributesObject.create(list: "123")
+    item.foo.should == item.id
+    item.bar.should == "barbar"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Caspy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler