couch_potato 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f37912f0e7ed48878e92e5ad8ef34d106359f15
-  data.tar.gz: 020faa774590847e21f942504cf9fb02df3683e7
+  metadata.gz: 66ce129081c4c70157fc61c40f500d9460660900
+  data.tar.gz: 7be5df77cd9c672f71db5782440237702a7e1c8c
 SHA512:
-  metadata.gz: 6a6fce1ef1c76b01c073ac3706d894d5c567d05afe20ef4177672950f96db1011c9f6aee607852a7d0c605e303250ecec4ad0acbbc9494b30b603a25690924cd
-  data.tar.gz: 240d66a1fcb88a3214c946fd51e924abf314410c8b14a203423626d6d777633ee0764ebffbfb2e62b707539c218da0b01da29068f717fe2057b69f1f6d9a2921
+  metadata.gz: 8f3e28aad6d21326a3497f995b242c055ec764c786d73571bbc72053ee84954277832a3f519e61b1667c0a323d1ed0f02a45eb6f1a343c3611f7cec6091cb624
+  data.tar.gz: 84f5e3b8ceb96051d8af95f0101b5620ac24b54736e4db36ccf8ad6ffe524c787140def2c242fd77d2f27fed8a2999a86803a94a6121ea7e8ea401ae956726cb

data/CHANGES.md

@@ -1,5 +1,9 @@
 ## Changes
 
+### 1.4.0
+
+* Added support for passing the model to blocks for computing the default value of a property (Alexander Lang)
+
 ### 1.3.0
 
 * Add support for built-in couchdb reduce functions in map reduce specs (Andy Morris)

data/lib/couch_potato/persistence/properties.rb

@@ -74,7 +74,9 @@ module CouchPotato
         #  class Book
         #    property :title
         #    property :year
-        #    property :publisher, :type => Publisher
+        #    property :publisher, type: Publisher
+        #    property :published_at, default: -> { Date.current }
+        #    property :next_year, default: ->(book) { book.year + 1 }
         #  end
         def property(name, options = {})
           undefine_attribute_methods

data/lib/couch_potato/persistence/simple_property.rb

@@ -62,7 +62,11 @@ module CouchPotato
             value = instance_variable_get("@#{name}")
             if value.nil? && !options[:default].nil?
               default = if options[:default].respond_to?(:call)
-                options[:default].call
+                if options[:default].arity == 1
+                  options[:default].call self
+                else
+                  options[:default].call
+                end
               else
                 clone_attribute(options[:default])
               end

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/default_property_spec.rb

@@ -7,6 +7,7 @@ class Test
   property :complex, :default => [1, 2, 3]
   property :false_value, :default => false
   property :proc, :default => Proc.new { 1 + 2 }
+  property :proc_arity_one, :default => Proc.new {|test| test.test * 2 }
 end
 
 describe 'default properties' do
@@ -14,13 +15,13 @@ describe 'default properties' do
     recreate_db
   end
 
-  it "should use the default value if nothing is supplied" do
+  it "uses the default value if nothing is supplied" do
     t = Test.new
 
     t.test.should == 'Test value'
   end
 
-  it "should persist the default value if nothing is supplied" do
+  it "persists the default value if nothing is supplied" do
     t = Test.new
     CouchPotato.database.save_document! t
 
@@ -28,16 +29,16 @@ describe 'default properties' do
     t.test.should == 'Test value'
   end
 
-  it "should not have the same default for two instances of the object" do
+  it "does not have the same default for two instances of the object" do
     t = Test.new
     t2 = Test.new
     t.complex.object_id.should_not == t2.complex.object_id
   end
-  
-  it "should not return the default value when the actual value is empty" do
+
+  it "does not return the default value when the actual value is empty" do
     t = Test.new(:complex => []).complex.should == []
   end
-  
+
   it "uses the default value also if the default is false" do
     t = Test.new
     t.false_value.should == false
@@ -47,4 +48,10 @@ describe 'default properties' do
     t = Test.new
     t.proc.should == 3
   end
+
+  it 'passes the model to a block with arity 1' do
+    t = Test.new
+
+    expect(t.proc_arity_one).to eql('Test valueTest value')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json