freeform 1.0.11 → 2.0.0

data/lib/freeform/form.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'ostruct'
 require 'active_model'
 require 'freeform/form/form_input_key'
+require 'freeform/form/model'
 require 'freeform/form/nested'
 require 'freeform/form/property'
 require 'freeform/form/validation'
@@ -15,10 +16,15 @@ module FreeForm
     include ActiveModel::Conversion
     include ActiveModel::Validations
     include FreeForm::FormInputKey
+    include FreeForm::Model
     include FreeForm::Nested
     include FreeForm::Property
     include FreeForm::Validation
 
+    # Default Validations
+    #----------------------------------------------------------------------------
+    validate_nested_forms
+
     # Instance Methods
     #----------------------------------------------------------------------------
     # Required for ActiveModel
@@ -30,61 +36,44 @@ module FreeForm
     end
 
     def save
-      return false unless valid? || marked_for_destruction?
-
-      # Save or destroy myself.
-      self.class.models.each do |form_model|
-        model = send(form_model)
-        # This is for form models.
-        unless model.is_a?(Array)
-          if marked_for_destruction?
-            model.destroy
-          else
-            model.save
-          end
-        end
-      end
-
-      # Loop through nested models sending them the save call
-      self.class.models.each do |form_model|
-        model = send(form_model)
-        # This is for nested models.
-        if model.is_a?(Array)
-          model.each { |m| m.save }
-        end
+      if valid?
+        before_save
+        models.each { |m| m.destroy if m.marked_for_destruction? }
+        models.each { |m| m.save unless m.marked_for_destruction? }
+        after_save
+        true
+      else
+        false
       end
     end
 
     def save!
-      raise FreeForm::FormInvalid, "form invalid." unless valid?
-
-      self.class.models.each do |form_model|
-        model = send(form_model)
-        model.is_a?(Array) ? model.each { |m| m.save! } : save_or_destroy!(model)
+      if valid?
+        save
+      else
+        raise FreeForm::FormInvalid, "form invalid." 
       end
     end
 
-  private
-    def initialize_child_models
-      self.class.child_models.each do |c|
-        send("initialize_#{c}")
-      end
+    def destroy
+      models.each { |m| m.destroy }
     end
 
-    def save_or_destroy(model)
-      marked_for_destruction? ? model.destroy : model.save
+    def marked_for_destruction?
+      respond_to?(:_destroy) ? _destroy : false
     end
 
-    def save_or_destroy!(model)
-      if marked_for_destruction?
-        model.destroy
-      else
-        model.save!
-      end
+    def before_save
     end
 
-    def marked_for_destruction?
-      respond_to?(:_destroy) ? _destroy : false
+    def after_save
+    end
+
+  private
+    def initialize_child_models
+      self.class.child_models.each do |c|
+        send("initialize_#{c}")
+      end
     end
   end
 end

data/lib/freeform/version.rb

@@ -1,3 +1,3 @@
 module Freeform
-  VERSION = "1.0.11"
+  VERSION = "2.0.0"
 end

data/spec/acceptance_spec.rb

@@ -1,30 +1,13 @@
 require 'spec_helper'
+require 'freeform/form'
 
 describe FreeForm::Form do
-  let!(:task_class) do
-    klass = Class.new(FreeForm::Form) do
-      form_input_key :task
-      form_model :task
-      validate_models
-      allow_destroy_on_save
-
-      property :name,          :on => :task
-      property :start_date,    :on => :task
-      property :end_date,      :on => :task
-    end
-    # This wrapper just avoids CONST warnings
-    v, $VERBOSE = $VERBOSE, nil
-      Module.const_set("TaskForm", klass)
-    $VERBOSE = v
-    klass
-  end
-
   let(:form_class) do
     klass = Class.new(FreeForm::Form) do
       form_input_key :company
       form_models :company
       child_model :project do
-        company.project.present? ? company.project : company.build_project
+        company.project || company.build_project
       end
       validate_models
       allow_destroy_on_save
@@ -33,9 +16,18 @@ describe FreeForm::Form do
       property :name,     :on => :project, :as => :project_name
       property :due_date, :on => :project
 
-      has_many :tasks, :class => Module::TaskForm, :default_initializer => :default_task_initializer
+      has_many :tasks do
+        form_input_key :task
+        form_model :task
+        validate_models
+        allow_destroy_on_save
+
+        property :name,          :on => :task
+        property :start_date,    :on => :task
+        property :end_date,      :on => :task
+      end
 
-      def default_task_initializer
+      def task_initializer
         { :task => project.tasks.build }
       end
     end
@@ -46,35 +38,48 @@ describe FreeForm::Form do
     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_1)  { Task.create!(:project => project, :name => "Task 1", :start_date => Date.new(2014, 2, 2), :end_date => Date.new(2014, 3, 3)) }
+  let(:task_2)  { Task.create!(:project => project, :name => "Task 2", :start_date => Date.new(2014, 9, 1), :end_date => Date.new(2014, 10, 1)) }
+
   let(:form) do
-    form_class.new( :company => Company.new ).tap do |f|
-      f.build_task
+    form_class.new( :company => company ).tap do |f|
+      company.project.tasks.each do |task|
+        f.build_task(:task => task)
+      end
     end
   end
 
+  before(:each) do
+    company.reload
+    project.reload
+    task_1.reload
+    task_2.reload
+  end
+
   describe "form initialization", :initialization => true do
     it "initializes with Company model" do
-      form.company.should be_a(Company)
+      form.company.should eq(company)
     end
 
     it "initializes with Project model" do
-      form.project.should be_a(Project)
+      form.project.should eq(project)
     end
 
     it "initializes with Task model" do
-      form.tasks.first.task.should be_a(Task)
+      form.tasks.first.task.should eq(task_1)
     end
 
     it "initializes with Task with project parent" do
       task = form.tasks.first.task
-      task.should eq(form.project.tasks.first)
+      task.project.should eq(form.project)
     end
   end
 
   describe "building nested models", :nested_models => true do
     it "can build multiple tasks" do
-      form.tasks.count.should eq(1)
-      form.build_task
+      form.tasks.count.should eq(2)
       form.build_task
       form.tasks.count.should eq(3)
     end
@@ -85,6 +90,13 @@ describe FreeForm::Form do
       task_2 = form.tasks.last.task
       task_1.should_not eq(task_2)
     end
+
+    it "builds new tasks with project parent" do
+      form.build_task
+      task_1 = form.tasks.first.task
+      task_2 = form.tasks.last.task
+      task_1.project.should eq(task_2.project)
+    end
   end
 
   describe "assigning parameters", :assign_params => true do
@@ -187,8 +199,8 @@ describe FreeForm::Form do
         form.errors[:project_name].should eq(["can't be blank"])
       end
 
-      it "should have errors on last tasks's start_date" do
-        form.tasks.last.errors[:start_date].should eq(["can't be blank"])
+      it "should not have errors on last tasks's start_date" do
+        form.tasks.last.errors[:start_date].should be_empty
       end
     end
 
@@ -202,9 +214,9 @@ describe FreeForm::Form do
         :tasks_attributes => {
           "0" => {
             :name => "task_1",
-            "start_date(1i)" => "2012",
-            "start_date(2i)" => "1",
-            "start_date(3i)" => "2",
+            "start_date(1i)" => nil,
+            "start_date(2i)" => nil,
+            "start_date(3i)" => nil,
           },
           "1" => {
             :name => "task_2",
@@ -224,84 +236,8 @@ describe FreeForm::Form do
         form.should_not be_valid
       end
 
-      it "should have errors on last tasks's start_date" do
-        form.tasks.last.errors[:start_date].should eq(["can't be blank"])
-      end
-    end
-
-    context "with invalid form, and invalid marked for destruction nested model" do
-      let(:attributes) do {
-        :company_name => "",
-        :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 not be valid" do
-        form.should_not be_valid
-      end
-
-      it "should not have errors" do
-        form.errors[:company_name].should eq(["can't be blank"])
-      end
-    end
-
-    context "with marked for destruction invalid nested model" 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
+      it "should have errors on first tasks's start_date" do
+        form.tasks.first.errors[:start_date].should eq(["can't be blank"])
       end
     end
 
@@ -369,19 +305,45 @@ describe FreeForm::Form do
         form.fill(attributes)
       end
 
-      it "should return false on 'save'" do
-        form.save.should be_false
+      describe "#save" do
+        it "should return false on 'save'" do
+          form.save.should be_false
+        end
+
+        it "does not update company model" do
+          form.save
+          company.reload.name.should_not eq("dummycorp")
+        end
+
+        it "does not update project model" do
+          form.save
+          project.reload.due_date.should_not eq(Date.new(2014, 10, 30))
+        end
+
+        it "does not update the first task model" do
+          form.save
+          task_1.reload.name.should_not eq("task_1")
+          task_1.reload.start_date.should_not eq(Date.new(2012, 1, 2))
+        end
+
+        it "does not update the second task model" do
+          form.save
+          task_2.reload.name.should_not eq("task_2")
+          task_2.reload.end_date.should_not eq(Date.new(2011, 12, 15))
+        end
       end
 
-      it "should raise error on 'save!'" do
-        expect{ form.save! }.to raise_error(FreeForm::FormInvalid)
+      describe "#save!" do
+        it "should raise error on 'save!'" do
+          expect{ form.save! }.to raise_error(FreeForm::FormInvalid)
+        end
       end
     end
 
-    context "with invalid attributes, and marked for destruction nested model" do
+    context "with invalid, marked for destruction attributes" do
       let(:attributes) do {
         :company_name => "dummycorp",
-        :project_name => "",
+        :project_name => "my_project",
         "due_date(1i)" => "2014",
         "due_date(2i)" => "10",
         "due_date(3i)" => "30",
@@ -392,8 +354,8 @@ describe FreeForm::Form do
             "start_date(2i)" => "1",
             "start_date(3i)" => "2",
           },
-          "3234322345" => {
-            :name => "task_2",
+          "1" => {
+            :name => nil,
             "end_date(1i)" => "2011",
             "end_date(2i)" => "12",
             "end_date(3i)" => "15",
@@ -406,82 +368,40 @@ describe FreeForm::Form do
         form.fill(attributes)
       end
 
-      it "should not be valid" do
-        form.should_not be_valid
-      end
+      describe "#save" do
+        it "should return true on 'save'" do
+          form.save.should be_true
+        end
 
-      describe "persisting destroy after failed save" do
-        before(:each) { form.save }
+        it "updates company model" do
+          form.save
+          company.reload.name.should eq("dummycorp")
+        end
 
-        it "should have the second form still set to _destroy" do
-          form.tasks.second.should be_marked_for_destruction
+        it "updates project model" do
+          form.save
+          project.reload.name.should eq("my_project")
+          project.reload.due_date.should eq(Date.new(2014, 10, 30))
         end
-      end
 
-#       it "should have valid company and project after save", :failing => true do
-#         form.save
-# #        form.tasks.first.task.destroy
-#         form.company.should be_valid
-#         form.project.valid?
-#         puts "Errors = #{form.project.errors.inspect}"
-#         form.project.should be_valid
-#       end
-
-#       it "should not raise error on 'save!'" do
-#         expect{ form.save! }.to_not raise_error
-#       end
-     end
-
-    context "with invalid, marked for destruction nested model" do
-      let(:attributes) do {
-        :company_name => "dummycorp",
-        :project_name => "railsapp",
-        "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
+        it "updates the first task model" do
+          form.save
+          task_1.reload.name.should eq("task_1")
+          task_1.reload.start_date.should eq(Date.new(2012, 1, 2))
+        end
 
-      before(:each) do
-        form.fill(attributes)
+        it "destroys the second task model", :failing => true do
+          form.save
+          task_2.should_not exist_in_database
+        end
       end
 
-      it { is pending }
-
-#       it "should have valid company and project after save", :failing => true do
-#         form.save
-# #        form.tasks.last.task.destroy
-# #        form.valid?
-#         form.company.should be_valid
-#         form.project.valid?
-#         # puts "Errors = #{form.project.errors.inspect}"
-
-#         # form.project.tasks.each do |task|
-#         #   puts "Task = #{task.inspect}"
-#         #   puts "Valid = #{task.valid?}"
-#         #   puts "Errors = #{task.errors.inspect}"
-#         # end
-#         form.project.should be_valid
-#       end
-
-# #       it "should not raise error on 'save!'" do
-# #         expect{ form.save! }.to_not raise_error
-# #       end
+      describe "#save!" do
+        it "should not raise error on 'save!'" do
+          expect{ form.save! }.to_not raise_error
+        end
       end
+    end
 
     context "with valid attributes" do
       let(:attributes) do {
@@ -492,13 +412,13 @@ describe FreeForm::Form do
         "due_date(3i)" => "30",
         :tasks_attributes => {
           "0" => {
-            :name => "task_1",
+            :name => "new_task_1",
             "start_date(1i)" => "2012",
             "start_date(2i)" => "1",
             "start_date(3i)" => "2",
           },
           "1" => {
-            :name => "task_2",
+            :name => "new_task_2",
             "start_date(1i)" => "2011",
             "start_date(2i)" => "8",
             "start_date(3i)" => "15",
@@ -513,81 +433,41 @@ describe FreeForm::Form 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)
-        form.tasks.first.task.should_receive(:save).and_return(true)
-        form.tasks.last.task.should_receive(:save).and_return(true)
-        form.save
-      end
+      describe "#save" do
+        it "should return true on 'save'" do
+          form.save.should be_true
+        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)
-        form.tasks.first.task.should_receive(:save!).and_return(true)
-        form.tasks.last.task.should_receive(:save!).and_return(true)
-        form.save!
-      end
+        it "updates company model" do
+          form.save
+          company.reload.name.should eq("dummycorp")
+        end
 
-      describe "destroying on save", :destroy_on_save => true do
-        describe "save" do
-          it "destroys models on save if set" do
-            form._destroy = true
-            form.company.should_receive(:destroy).and_return(true)
-            form.project.should_receive(:destroy).and_return(true)
-            form.tasks.first.task.should_receive(:save).and_return(true)
-            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)
-            form.project.should_receive(:destroy).and_return(true)
-            form.tasks.first.task.should_receive(:save).and_return(true)
-            form.tasks.last.task.should_receive(:save).and_return(true)
-            form.save
-          end
-
-          it "destroys nested models on save if set" do
-            form.tasks.first._destroy = true
-            form.company.should_receive(:save).and_return(true)
-            form.project.should_receive(:save).and_return(true)
-            form.tasks.first.task.should_receive(:destroy).and_return(true)
-            form.tasks.last.task.should_receive(:save).and_return(true)
-            form.save
-          end
+        it "updates project model" do
+          form.save
+          project.reload.name.should eq("railsapp")
+          project.reload.due_date.should eq(Date.new(2014, 10, 30))
         end
 
-        describe "save!" do
-          it "destroys models on save! if set" do
-            form._destroy = true
-            form.company.should_receive(:destroy).and_return(true)
-            form.project.should_receive(:destroy).and_return(true)
-            form.tasks.first.task.should_receive(:save!).and_return(true)
-            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)
-            form.project.should_receive(:destroy).and_return(true)
-            form.tasks.first.task.should_receive(:save!).and_return(true)
-            form.tasks.last.task.should_receive(:save!).and_return(true)
-            form.save!
-          end
-
-          it "destroys nested models on save! if set" do
-            form.tasks.last._destroy = true
-            form.company.should_receive(:save!).and_return(true)
-            form.project.should_receive(:save!).and_return(true)
-            form.tasks.first.task.should_receive(:save!).and_return(true)
-            form.tasks.last.task.should_receive(:destroy).and_return(true)
-            form.save!
-          end
+        it "updates the first task model" do
+          form.save
+          task_1.reload.name.should eq("new_task_1")
+          task_1.reload.start_date.should eq(Date.new(2012, 1, 2))
+        end
+
+        it "updates the second task model" do
+          form.save
+          task_2.reload.name.should eq("new_task_2")
+          task_2.reload.start_date.should eq(Date.new(2011, 8, 15))
+          task_2.reload.end_date.should eq(Date.new(2011, 12, 15))
+        end
+      end
+
+      describe "#save!" do
+        it "should not raise error on 'save!'" do
+          expect{ form.save! }.to_not raise_error
         end
       end
     end
   end
-end
+end