simple_form_object 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e75708032f5ece35823c27133168dd7fbb3e0b
-  data.tar.gz: b4f81546088524d43bb1c089fcea2faffb970672
+  metadata.gz: 73485885f010300cc9a362e85612e3f279f52926
+  data.tar.gz: 908ce72ef544b469e02cbd9328065f0a18a28b4d
 SHA512:
-  metadata.gz: 09391560a4129904907e4226eacf3658629c0fa9444cfa136b2751f288cc230167959fd2029d11f9877b4e4307c3304e0291fb1dcf195dcba34414e84c00b2bd
-  data.tar.gz: 2f053446f2c8a30044e79e598e90e00d10b0e14718d086a1f081703efe11f2c33c592782db188adb8e654dee10cdbda77149e8fba5b9bd1903c9e6ba99b47800
+  metadata.gz: f761ced4db494a667e2734d2fe591c0e5756ad545ad9d2eab0adc6ecd73c8cf4aff623600484e90e42be89099f207c8c2b593f41af74872752d70a9bf2f68b40
+  data.tar.gz: 5d819b5438d3d7caccddbf3231b3cc9e4ec2715712a532077547c2619340de44ba553226ef9a0c50a01ecf3afe721f65351172034601064d976fba935a32b1b5

data/lib/simple_form_object/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormObject
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/simple_form_object.rb

@@ -102,12 +102,20 @@ module SimpleFormObject
 
     def apply_default_to(form)
       if form.send(@name).nil?
-        form.send("#{@name}=", @default) if @apply_default
+        form.send("#{@name}=", default_value(form)) if @apply_default
       end
     end
 
     private
 
+    def default_value(context)
+      if @default.respond_to?(:call)
+        context.instance_eval(&@default)
+      else
+        @default
+      end
+    end
+
     def extract_options
       @apply_default = true
       @default = options.fetch(:default) { @apply_default = false; nil }

data/spec/attribute_spec.rb

@@ -54,5 +54,23 @@ describe SimpleFormObject::Attribute do
       end
     end
 
+    context 'with a lambda/proc default' do
+      let(:default) { Proc.new { :bar } }
+
+      it 'calls the lambda' do
+        expect(form).to receive("#{name}=").with(:bar)
+        attribute.apply_default_to(form)
+      end
+
+      context 'when the proc references the form' do
+        let(:default) { Proc.new { current_foo } }
+        let(:form) { double('Form', foo: nil, current_foo: :bar) }
+
+        it 'calls the lambda' do
+          expect(form).to receive("#{name}=").with(:bar)
+          attribute.apply_default_to(form)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_object
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Leonard Garvey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel