freeform 2.0.1 → 2.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWE2NTA4YmE3ZWY3ZjNjMDkzM2VmOTA4NzU5ZjI4Mjc3ZGQ0NTFkOA==
+    YjBhNTViMmQwZDkyOTM5ZTU0N2Q0OGU0YmNhYjcyNmRhZDc4ZDI2MQ==
   data.tar.gz: !binary |-
-    Y2U1NjU4ZWJkZDIzOGMwODkwMDY5YTY3ZmFmOTRkOTdjMTRlZTA3Yg==
+    ZDI2ZDk5NGEzNDk4MmFmMmU0ZDlmZjJjMzI0NmZkMjUxZGU0NmYzZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmJiNTNlMDUyM2U1ZThlZDJhODFkYzNjOTVlNmQ5MzAzYjViZmE3ZWRkZGIz
-    Zjc1Y2ZmNTY0MDY3NjhmYWZjNWM4MGRhNDM0Y2M2YTVhOTk5ZWFmNGE0NTgw
-    MDJjMmNjOWRiN2I0ZTlmYWFjZWY1ZDhmNmMxZDYzMGY3OGVjOWY=
+    NDk3MjViNGU5NWFhMmMyNGQyMTI4MTdlMDIzMjcwOWU1YjRkN2JkNGQzMTVh
+    MWY4ZmQwOTAzM2NkNzQyMTliOWRkM2RhZWE0NDdiOGQyZmQ1NDA2ZTIxOGMw
+    MDZjZGNmMTY2MDE0ODc3ZTQ2ZGUyOThjMzI2OGEzNzZhMTM0OWM=
   data.tar.gz: !binary |-
-    YjhhZWZhZGJhYjA4NjYwZTljM2ExNDE5NGJjYzAxNzJkZjhmM2RjMTdjZmYw
-    NDgyMmVhNjFjNjE0Y2ZiN2ZkNzFlOGU0NTZhOTViMTNhMjQ2OTYyM2JiMTlj
-    MmIwNzU1MjlmYTEwZGUwNWJhZDczMTcxMzFhZjZiZmEwZmIzOWM=
+    ZjIzNTA2NmY1MjNlYmVkOGViNjlhNjFkMTA1MDE0OGMxODRiZTU2NDY3MjZh
+    MDgxMzVlNWVkZmMzZmRjZThlMDY4YmRlN2U5ODY4NzFlZGE5ZjBlNjU1ZGZm
+    YjY1OTFkNjBjMGUxZjBiNGYyZDRkZjBiYzQ5Y2Y1NzMwYTk0Nzg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freeform (2.0.0)
+    freeform (2.0.1)
       activemodel
       formtastic
       rails (>= 3.2.0)

data/lib/freeform/form/property.rb

@@ -55,13 +55,14 @@ module FreeForm
     end
 
     def assign_params(params)
+      formatted_params = params.stringify_keys
       self.tap do |s|
-        FreeForm::DateParamsFilter.new.call(params)
-        before_assign_params(params)
-        params.each_pair do |attribute, value|
+        FreeForm::DateParamsFilter.new.call(formatted_params)
+        before_assign_params(formatted_params)
+        formatted_params.each_pair do |attribute, value|
           assign_attribute(attribute, value)
         end
-        after_assign_params(params)
+        after_assign_params(formatted_params)
       end
     end
     alias_method :assign_attributes, :assign_params
@@ -70,15 +71,9 @@ module FreeForm
 
     def before_assign_params(params)
     end
-    alias_method :before_assign_attributes, :before_assign_params
-    alias_method :before_populate, :before_assign_params
-    alias_method :before_fill, :before_assign_params
 
     def after_assign_params(params)
     end
-    alias_method :after_assign_attributes, :after_assign_params
-    alias_method :after_populate, :after_assign_params
-    alias_method :after_fill, :after_assign_params
 
     def model_property_mappings
       self.class.property_mappings

data/lib/freeform/version.rb

@@ -1,3 +1,3 @@
 module Freeform
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/acceptance_spec.rb

@@ -390,7 +390,7 @@ describe FreeForm::Form do
           task_1.reload.start_date.should eq(Date.new(2012, 1, 2))
         end
 
-        it "destroys the second task model", :failing => true do
+        it "destroys the second task model" do
           form.save
           task_2.should_not exist_in_database
         end

data/spec/form/persistence_spec.rb

@@ -185,7 +185,7 @@ describe FreeForm::Form do
       end
 
       describe "#save" do
-        it "should return true on 'save'", :failing => true do
+        it "should return true on 'save'" do
           form.save.should be_true
         end
 
@@ -261,6 +261,212 @@ describe FreeForm::Form do
     end
   end
 
+  describe "before and after save hooks", :hooks => true do
+    describe "before save", :before_save => true do
+      let(:form_class) do
+        klass = Class.new(FreeForm::Form) do
+          form_input_key :task
+          form_models :task
+          validate_models
+          allow_destroy_on_save
+
+          property :name,        :on => :task
+          property :start_date,  :on => :task
+          property :end_date,    :on => :task
+          validates :name, :presence => true
+
+          has_many :milestones do
+            form_input_key :milestone
+            form_model :milestone
+            validate_models
+            allow_destroy_on_save
+
+            property :name,          :on => :milestone
+          end
+
+          def milestone_initializer
+            { :milestone => task.milestones.build }
+          end
+
+          def before_save
+            task.project.update_attribute(:name, "DummyProject")
+          end
+        end
+        # This wrapper just avoids CONST warnings
+        v, $VERBOSE = $VERBOSE, nil
+          Module.const_set("AcceptanceForm", klass)
+        $VERBOSE = v
+        klass
+      end
+
+      let(:company) { Company.create!(:name => "Demo Corporation") }
+      let(:project) { Project.create!(:owner => company, :name => "Widget", :due_date => Date.new(2014, 1, 1)) }
+      let(:task)  { Task.new(:project => project) }
+
+      let(:form) do
+        form_class.new( :task => task ).tap do |f|
+          f.build_milestone
+        end
+      end
+
+      context "with invalid attributes" do
+        let(:attributes) do {
+          :name => nil,
+          "start_date(1i)" => "2012",
+          "start_date(2i)" => "1",
+          "start_date(3i)" => "2",
+          "end_date(1i)" => "2011",
+          "end_date(2i)" => "12",
+          "end_date(3i)" => "15",
+          :milestones_attributes => {
+            "0" => {
+              :name => "milestone_1",
+            },
+            "1310201" => {
+              :name => "milestone_2",
+            }
+          } }
+        end
+
+        before(:each) { form.fill(attributes) }
+
+        it "does not run before_save on save" do
+          form.save
+          project.reload.name.should_not eq("DummyProject")
+        end
+      end
+
+      context "with valid attributes" do
+        let(:attributes) do {
+          :name => "taskname",
+          "start_date(1i)" => "2012",
+          "start_date(2i)" => "1",
+          "start_date(3i)" => "2",
+          "end_date(1i)" => "2011",
+          "end_date(2i)" => "12",
+          "end_date(3i)" => "15",
+          :milestones_attributes => {
+            "0" => {
+              :name => "milestone_1",
+            },
+            "1310201" => {
+              :name => "milestone_2",
+            }
+          } }
+        end
+
+        before(:each) { form.fill(attributes) }
+
+        it "runs before_save on save" do
+          form.save
+          project.reload.name.should eq("DummyProject")
+        end
+      end
+    end
+
+    describe "after save", :after_save => true do
+      let(:form_class) do
+        klass = Class.new(FreeForm::Form) do
+          form_input_key :task
+          form_models :task
+          validate_models
+          allow_destroy_on_save
+
+          property :name,        :on => :task
+          property :start_date,  :on => :task
+          property :end_date,    :on => :task
+          validates :name, :presence => true
+
+          has_many :milestones do
+            form_input_key :milestone
+            form_model :milestone
+            validate_models
+            allow_destroy_on_save
+
+            property :name,          :on => :milestone
+          end
+
+          def milestone_initializer
+            { :milestone => task.milestones.build }
+          end
+
+          def after_save
+            task.project.update_attribute(:name, "DummyProject")
+          end
+        end
+        # This wrapper just avoids CONST warnings
+        v, $VERBOSE = $VERBOSE, nil
+          Module.const_set("AcceptanceForm", klass)
+        $VERBOSE = v
+        klass
+      end
+
+      let(:company) { Company.create!(:name => "Demo Corporation") }
+      let(:project) { Project.create!(:owner => company, :name => "Widget", :due_date => Date.new(2014, 1, 1)) }
+      let(:task)  { Task.new(:project => project) }
+
+      let(:form) do
+        form_class.new( :task => task ).tap do |f|
+          f.build_milestone
+        end
+      end
+
+      context "with invalid attributes" do
+        let(:attributes) do {
+          :name => nil,
+          "start_date(1i)" => "2012",
+          "start_date(2i)" => "1",
+          "start_date(3i)" => "2",
+          "end_date(1i)" => "2011",
+          "end_date(2i)" => "12",
+          "end_date(3i)" => "15",
+          :milestones_attributes => {
+            "0" => {
+              :name => "milestone_1",
+            },
+            "1310201" => {
+              :name => "milestone_2",
+            }
+          } }
+        end
+
+        before(:each) { form.fill(attributes) }
+
+        it "does not run after_save on save" do
+          form.save
+          project.reload.name.should_not eq("DummyProject")
+        end
+      end
+
+      context "with valid attributes" do
+        let(:attributes) do {
+          :name => "taskname",
+          "start_date(1i)" => "2012",
+          "start_date(2i)" => "1",
+          "start_date(3i)" => "2",
+          "end_date(1i)" => "2011",
+          "end_date(2i)" => "12",
+          "end_date(3i)" => "15",
+          :milestones_attributes => {
+            "0" => {
+              :name => "milestone_1",
+            },
+            "1310201" => {
+              :name => "milestone_2",
+            }
+          } }
+        end
+
+        before(:each) { form.fill(attributes) }
+
+        it "runs after_save on save" do
+          form.save
+          project.reload.name.should eq("DummyProject")
+        end
+      end
+    end
+  end
+
   describe "destroying", :destroying => true do
     context "without nested forms" do
       let(:task) { Task.create!(:project => project, :name => "mytask", :start_date => Date.new(2011, 1, 1), :end_date => Date.new(2012, 1, 1)) }

data/spec/form/property_spec.rb

@@ -179,7 +179,6 @@ describe FreeForm::Property do
       end
 
       it "handles individiual date components" do
-        #TODO: should pass with symbols too!!
         form.assign_attributes({  
           "attribute_1(3i)" => 5, 
           "attribute_1(2i)" => 6, 
@@ -189,6 +188,91 @@ describe FreeForm::Property do
       end
     end
 
+    describe "before_assign_params", :before_assign_params => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          include FreeForm::Property
+          declared_model :first_model
+          declared_model :second_model
+          
+          property :attribute_1, :on => :first_model
+          property :attribute_2, :on => :first_model, :ignore_blank => true
+          property :attribute_3, :on => :second_model, :ignore_blank => true
+          property :attribute_4, :on => :second_model
+  
+          def initialize(h)
+            h.each {|k,v| send("#{k}=",v)}
+          end
+
+          def before_assign_params(params)
+            params.delete("attribute_1")
+          end
+        end
+      end
+  
+      let(:form) do
+        form_class.new(
+          :first_model  => OpenStruct.new(:attribute_1 => "first", :attribute_2 => "second"),
+          :second_model => OpenStruct.new(:attribute_3 => "third", :attribute_4 => "fourth"),
+        )
+      end
+      
+      it "deletes attribute_1 from params" do
+        form.assign_attributes({ 
+          :attribute_1 => "changed", :attribute_2 => 182.34, 
+          :attribute_3 => 45, :attribute_4 => Date.new(2013, 10, 10) })
+ 
+        form.attribute_1.should_not eq("changed")
+        form.attribute_2.should eq(182.34)
+        form.attribute_3.should eq(45)
+        form.attribute_4.should eq(Date.new(2013, 10, 10))
+      end
+    end
+
+    describe "after_assign_params", :after_assign_params => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          include FreeForm::Property
+          declared_model :first_model
+          declared_model :second_model
+          
+          property :attribute_1, :on => :first_model
+          property :attribute_2, :on => :first_model, :ignore_blank => true
+          property :attribute_3, :on => :second_model, :ignore_blank => true
+          property :attribute_4, :on => :second_model
+  
+          def initialize(h)
+            h.each {|k,v| send("#{k}=",v)}
+          end
+
+          def after_assign_params(params)
+            params.delete("attribute_1")
+            assign_attribute("attribute_3", "overwritten")
+          end
+        end
+      end
+  
+      let(:form) do
+        form_class.new(
+          :first_model  => OpenStruct.new(:attribute_1 => "first", :attribute_2 => "second"),
+          :second_model => OpenStruct.new(:attribute_3 => "third", :attribute_4 => "fourth"),
+        )
+      end
+      
+      it "deletes attribute_1 from params" do
+        form.assign_attributes({ 
+          :attribute_1 => "changed", :attribute_2 => 182.34, 
+          :attribute_3 => 45, :attribute_4 => Date.new(2013, 10, 10) })
+ 
+        form.attribute_1.should eq("changed")
+        form.attribute_2.should eq(182.34)
+        form.attribute_3.should eq("overwritten")
+        form.attribute_4.should eq(Date.new(2013, 10, 10))
+      end
+    end
+
     describe "model_property_mappings", :model_property_mappings => true do
       let(:form_class) do
         Class.new(Module) do

data/spec/form/validation_spec.rb

@@ -160,7 +160,7 @@ describe FreeForm::Validation do
       form.errors[:form_property].should eq(["can't be blank"])
     end
 
-    it "has error on address street", :failing => true do
+    it "has error on address street" do
       form.valid?
       form.addresses.first.errors[:street].should eq(["can't be blank"])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freeform
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - brycesenz