freeform 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDBmMWJjMDZmMGU4MDBlNzgxMTg3ZmNhYWExMmVlZWNlY2RjYTQ5Mg==
+    ODAyM2M4Y2YyNjA5NGY3NTQ3MzhiY2RlZGEwODc4NDllZjNkYWY3ZQ==
   data.tar.gz: !binary |-
-    MzNiYjRlODQ0YTM2ZjIxMGQxMTljZjY0NzQ5MmU4OTI1MzJjNjA0NA==
+    MGYyOTkyNTNmMjBiZmM1OTg0MzRiODNkMWY4OWQwOTIxZjA2Y2Y4Zg==
 SHA512:
   metadata.gz: !binary |-
-    M2I0OTUxZWEzYjk0OGFiNzljYzBlZDQ0MWFjYTNkZjMxYWY2MjMzMTU0N2U4
-    ODAyNmU1M2NiYTAyNjI1YjRmMmVkOTZhNGYxNDA5NmU0YWUyMjJiNzgwN2U4
-    Y2IwYWE3NmI4NDIzMTUwZDE4NzM0ZWFiMGI0MzA1OTM4MzEwZGM=
+    NTBmNzczODc3YTI3MTczNzFmYTQ1MTAwZDE0YmViMTkyZTdjNmQ2NTIyZGU2
+    NjU1NzFjYTcxZWRmNDM4MTg3YjJkMTY5MjgzMzdkMzdhYjc2Y2EzMWE5YzVh
+    YzUxY2NmYmUwZGVlYmE3MmE5OTFjYzhhZjE0MWI5NzBiNmRiN2I=
   data.tar.gz: !binary |-
-    MzYzMDFlNWYyMTM5YzVjOWQ0NGMwMTMzYzJlMzAyNjczZjgyMzdiMGZlYTE0
-    OWQyMDM2YjY3NDhmYzU2ZmE3NDUzNjRhM2MyOTBlMzUzNGRiZTQ0ZjkxZDll
-    ZjgwMWIyMjNmMjkyMGFhOGNkYzIxNDk4MDQ4ZWQzODBmNjllZDc=
+    Mzk5YzNkMzJhMjdhNDA1ZWJkMjJlZWQ3OTc3ZjU1NmRiY2Q1ODA2YzVlNzk1
+    ZjIyZjJlZDhlNzZjZDU0MjI0NDFiYTIzZGU1OGM4Mzg3ZjYyODcyNDVkYjI5
+    ZmE4ZGRhNTQ1YTM3MjQyNDM0YjgwOWRhZDkxMTVmMDU1ZTk0ZjA=

data/.gitignore

@@ -6,3 +6,9 @@ test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/*
 test/dummy/.sass-cache
+spec/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3-journal
+spec/dummy/log/*.log
+spec/dummy/tmp/*
+spec/dummy/.sass-cache
+tmp/*

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+
+# whitelist
+branches:
+  only:
+    - master

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freeform (1.0.1)
+    freeform (1.0.2)
       activemodel
       formtastic
       nested_form (~> 0.3.2)

data/lib/freeform/form/validation.rb

@@ -4,16 +4,16 @@ module FreeForm
       base.extend(ClassMethods)
       extend FreeForm::Property
     end
-        
+
     module ClassMethods
       def validate_models
         validate :model_validity
       end
     end
-      
+
   protected
     def model_validity
-      self.class.models.each do |form_model|                
+      self.class.models.each do |form_model|
         if send(form_model).is_a?(Array)
           # If it's an array, we're dealing with nested forms
           errors.add(:base, "has invalid nested forms") unless validate_nested_forms(send(form_model))
@@ -23,32 +23,35 @@ module FreeForm
         end
       end
     end
-  
+
   private
     def validate_nested_forms(form_array)
       form_validity = true
-      form_array.each do |model| 
-        form_validity = false unless model.valid?
+      form_array.each do |model|
+        destroyed = model.respond_to?(:marked_for_destruction?) ? model.marked_for_destruction? : false
+        unless model.valid? || destroyed
+          form_validity = false
+        end
       end
       form_validity
     end
-  
+
     def validate_form_model(form_model)
       model = send(form_model)
       append_errors(form_model)
       return model.valid?
     end
-    
+
     def append_errors(form_model)
       model = send(form_model)
       model.valid?
-      model.errors.each do |error, message| 
+      model.errors.each do |error, message|
         if find_form_field_from_model_field(form_model, error)
           self.errors.add(find_form_field_from_model_field(form_model, error), message)
         end
       end
     end
-    
+
     def find_form_field_from_model_field(model, field)
       self.class.property_mappings.each_pair do |property, attributes|
         if (attributes[:model] == model.to_sym) && (attributes[:field] == field.to_sym)
@@ -58,4 +61,4 @@ module FreeForm
       return false
     end
   end
-end
+end

data/lib/freeform/version.rb

@@ -1,3 +1,3 @@
 module Freeform
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/acceptance_spec.rb

@@ -7,7 +7,7 @@ describe FreeForm::Form do
       form_model :task
       validate_models
       allow_destroy_on_save
-      
+
       property :name,          :on => :task
       property :start_date,    :on => :task
       property :end_date,      :on => :task
@@ -23,18 +23,18 @@ describe FreeForm::Form do
     klass = Class.new(FreeForm::Form) do
       form_input_key :company
       form_models :company
-      child_model :project do 
+      child_model :project do
         company.project.present? ? company.project : company.build_project
       end
       validate_models
       allow_destroy_on_save
-      
+
       property :name,     :on => :company, :as => :company_name
       property :name,     :on => :project, :as => :project_name
       property :due_date, :on => :project
 
       has_many :tasks, :class => Module::TaskForm, :default_initializer => :default_task_initializer
-      
+
       def default_task_initializer
         { :task => Task.new(:project => project) }
       end
@@ -51,7 +51,7 @@ describe FreeForm::Form do
     f.build_task
     f
   end
-  
+
   describe "form initialization", :initialization => true do
     it "initializes with Company model" do
       form.company.should be_a(Company)
@@ -65,7 +65,7 @@ describe FreeForm::Form do
       form.tasks.first.task.should be_a(Task)
     end
 
-    it "initializes with Task with project parent", :failing => true do
+    it "initializes with Task with project parent" do
       task = form.tasks.first.task
       task.project.should eq(form.project)
     end
@@ -109,11 +109,11 @@ describe FreeForm::Form do
         }
       } }
     end
-    
+
     before(:each) do
       form.fill(attributes)
     end
-    
+
     it "assigns company name" do
       form.company_name.should eq("dummycorp")
       form.company.name.should eq("dummycorp")
@@ -173,12 +173,12 @@ describe FreeForm::Form do
           }
         } }
       end
-      
+
       before(:each) do
         form.fill(attributes)
         form.valid?
       end
-      
+
       it "should be invalid" do
         form.should_not be_valid
       end
@@ -214,12 +214,12 @@ describe FreeForm::Form do
           }
         } }
       end
-      
+
       before(:each) do
         form.fill(attributes)
         form.valid?
       end
-      
+
       it "should be invalid" do
         form.should_not be_valid
       end
@@ -229,6 +229,44 @@ describe FreeForm::Form do
       end
     end
 
+    context "with invalid, marked for destruction nested model", :failing => true do
+      let(:attributes) do {
+        :company_name => "dummycorp",
+        :project_name => "rails app",
+        "due_date(1i)" => "2014",
+        "due_date(2i)" => "10",
+        "due_date(3i)" => "30",
+        :tasks_attributes => {
+          "0" => {
+            :name => "task_1",
+            "start_date(1i)" => "2012",
+            "start_date(2i)" => "1",
+            "start_date(3i)" => "2",
+          },
+          "1" => {
+            :name => "task_2",
+            "end_date(1i)" => "2011",
+            "end_date(2i)" => "12",
+            "end_date(3i)" => "15",
+            :_destroy => "1"
+          }
+        } }
+      end
+
+      before(:each) do
+        form.fill(attributes)
+        form.valid?
+      end
+
+      it "should be valid" do
+        form.should be_valid
+      end
+
+      it "should not have errors" do
+        form.errors.should be_empty
+      end
+    end
+
     context "with valid attributes" do
       let(:attributes) do {
         :company_name => "dummycorp",
@@ -254,11 +292,11 @@ describe FreeForm::Form do
           }
         } }
       end
-      
+
       before(:each) do
         form.fill(attributes)
       end
-      
+
       it "should be valid" do
         form.should be_valid
       end
@@ -288,11 +326,11 @@ describe FreeForm::Form do
           }
         } }
       end
-      
+
       before(:each) do
         form.fill(attributes)
       end
-      
+
       it "should return false on 'save'" do
         form.save.should be_false
       end
@@ -327,11 +365,11 @@ describe FreeForm::Form do
           }
         } }
       end
-      
+
       before(:each) do
         form.fill(attributes)
       end
-      
+
       it "should return true on 'save', and call save on other models" do
         form.company.should_receive(:save).and_return(true)
         form.project.should_receive(:save).and_return(true)
@@ -358,7 +396,7 @@ describe FreeForm::Form do
             form.tasks.last.task.should_receive(:save).and_return(true)
             form.save
           end
-    
+
           it "destroys models on save if set through attribute" do
             form.fill({:_destroy => "1"})
             form.company.should_receive(:destroy).and_return(true)
@@ -377,7 +415,7 @@ describe FreeForm::Form do
             form.save
           end
         end
-        
+
         describe "save!" do
           it "destroys models on save! if set" do
             form._destroy = true
@@ -387,7 +425,7 @@ describe FreeForm::Form do
             form.tasks.last.task.should_receive(:save!).and_return(true)
             form.save!
           end
-  
+
           it "destroys models on save! if set" do
             form.fill({:_destroy => "1"})
             form.company.should_receive(:destroy).and_return(true)
@@ -409,4 +447,4 @@ describe FreeForm::Form do
       end
     end
   end
-end
+end