freeform 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTJlZjkyNzA0NTJlNzRhZjkyMjFjOGJmMjQyZjBkNDE5MmRiYzNjNA==
+    NmE5OGYzZDc5Mzg0NjRiZmY2ZDQ5MzIyMzFkNmIxNmU4MmY0M2NiMw==
   data.tar.gz: !binary |-
-    NmZjYjBkNGU2NjBhOGVlMzQ5ZTM2YTcwMDAyMTdjYzViZDFjYjNhOQ==
+    ZjBjODM1YzBkNTI4NjY1MGU5YWVlOTRhY2ZlYWM3YWVhNjhlZTIxNA==
 SHA512:
   metadata.gz: !binary |-
-    ZDMwZWJiYjljYzU5NWU3M2FkYzIxOTdkZGRlYzg2YzM4ODVmN2IzNzM2NjUy
-    YTdmODEzMDg3ODc5OGJiZmUzOTAxOTllNzBkNzI1OGZlNmVjZjBlNjY3NWM3
-    MGYxZDZmMGIwNjAzYWQyMDRlYjAzNDA2Yjg5Y2VkYzY4NTJiMDk=
+    ZDFmMDcwMjc3YjJjOGI0OWY1M2Q1ZjAyOTE2NWM1MGVhNzczZjhmZmM0ZGZj
+    NTEyNzBhZGRiYjEwYWQwNmEyNGQ2MTUxZDE0YWEyOTUzYzE5YTBhM2E4Mjkz
+    ODMyZDQxYzljODQ4YzAzN2Y2OWFjYTQzY2IzNDY0MTUwYWZiMTU=
   data.tar.gz: !binary |-
-    ZDQzZDlkMjY1ZTYyMzZmODcyOTVkNGViNDFiZmJjMTcwZGQ0ZjIzYmU1MmVl
-    OTlkZDA4MTY2ZTEwNjdkMmYzYzU2N2I4OTNhZjdhMzU0MzM2ZDU4Yzc0ODRj
-    ZjUwYjYxNDc3YWZjMDJiYWUyZDkwY2VjMjMxODYwNGMzMzQ2ZWE=
+    OGYwZjZjNTZkZTAxNDg2YTg2OTRjNjUzNjk0NDE5Y2JmMWQ4Mzk5ZDI0MDFm
+    NGQwMWM3Y2I5MGQ4OThiODUyYzE4OGIyNDllMGQ4NDdjMTI0ODM1ODQ1OTU5
+    ZDFhNGY4YzM4MjgxMjViN2EwZTQxMzk3NzRlYTk3NzBjYzU0ZWM=

data/Gemfile.lock

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

data/lib/freeform/builder/builder_mixin.rb

@@ -24,7 +24,6 @@ module FreeForm
         raise ArgumentError, "Invalid association. Make sure that a nested form for #{association.to_s} exists."
       end
 
-      #FIXME: I need to use the build method for child models
       model_object = options.delete(:model_object) do
         object.send("build_#{association.to_s.singularize}")
       end
@@ -68,10 +67,16 @@ module FreeForm
 
       args << (options.delete(:href) || "javascript:void(0)")
       args << options
-      hidden_field(:_destroy, :value => 0) << @template.link_to(*args, &block)
+
+      destroy = if self.object.send(:marked_for_destruction?)
+          "1"
+        else
+          "0"
+        end
+      hidden_field(:_destroy, :value => destroy) << @template.link_to(*args, &block)
     end
+
     def fields_for_with_nested_attributes(association_name, *args)
-      # TODO Test this better
       block = args.pop || Proc.new { |fields| @template.render(:partial => "#{association_name.to_s.singularize}_fields", :locals => {:f => fields}) }
 
       options = args.dup.extract_options!

data/lib/freeform/form/nested.rb

@@ -3,7 +3,7 @@ module FreeForm
     def self.included(base)
       base.extend(ClassMethods)
     end
-        
+
     module ClassMethods
       # Nested Forms
       #------------------------------------------------------------------------
@@ -32,21 +32,21 @@ module FreeForm
       def define_nested_model_methods(attribute, form_class, options={})
         singularized_attribute = attribute.to_s.singularize.to_s
 
-        # Example: form.addresses will return all nested address forms 
+        # Example: form.addresses will return all nested address forms
         define_method(:"#{attribute}") do
           value = instance_variable_get("@nested_#{attribute}")
           value ||= []
           instance_variable_set("@nested_#{attribute}", value)
         end
-        
+
         # Example: form.build_addresses (optional custom initializer)
         define_method(:"build_#{attribute}") do |initializer=nil|
           # Builder object
           parent_object = self
-          
+
           # Get correct class
           form_class = self.class.nested_forms[:"#{attribute}"]
-          
+
           # Default Initializer
           if options[:default_initializer]
             initializer ||= instance_eval(&options[:default_initializer])
@@ -84,11 +84,11 @@ module FreeForm
 
     # Instance Methods
     #--------------------------------------------------------------------------
-    protected
+  protected
     def build_models_from_param_count(attribute, params)
       # Get the difference between sets of params passed and current form objects
       num_param_models = params.length
-      num_built_models = self.send(:"#{attribute}").nil? ? 0 : self.send(:"#{attribute}").length          
+      num_built_models = self.send(:"#{attribute}").nil? ? 0 : self.send(:"#{attribute}").length
       additional_models_needed = num_param_models - num_built_models
 
       # Make up the difference by building new nested form models
@@ -97,4 +97,4 @@ module FreeForm
       end
     end
   end
-end
+end

data/lib/freeform/form/property.rb

@@ -19,11 +19,11 @@ module FreeForm
 
       def declared_model(name, opts={})
         @models ||= []
-        @models << name        
+        @models << name
         attr_accessor name
       end
       alias_method :form_model, :declared_model
-      
+
       def declared_models(*names)
         names.each do |name|
           declared_model(name)
@@ -33,9 +33,9 @@ module FreeForm
 
       def child_model(name, opts={}, &block)
         @models ||= []
-        @models << name        
+        @models << name
         @child_models ||= []
-        @child_models << name        
+        @child_models << name
         attr_accessor name
         define_method("initialize_#{name}") do
           instance_variable_set("@#{name}", instance_eval(&block))
@@ -53,8 +53,14 @@ module FreeForm
         # Define _destroy method for marked-for-destruction handling
         attr_accessor :_destroy
         define_method(:_destroy=) do |value|
-          false_values = [nil, 0 , false, "0", "false"]
-          @_destroy = !(false_values.include?(value))
+          false_values  = [nil, 0 , false, "0", "false"]
+          true_values  = [1 , true, "1", "true"]
+
+          #TODO: Test this!!
+          @_destroy = !false_values.include?(value)  # Mark initially
+          # if (@_destroy == false) # Can only switch if false
+          #   @_destroy = true if true_values.include?(value)
+          # end
         end
         alias_method :marked_for_destruction?, :_destroy
         define_method(:mark_for_destruction) do
@@ -108,7 +114,7 @@ module FreeForm
       def params_to_date(year, month, day)
         day ||= 1 # FIXME: is that really what we want? test.
         begin # TODO: test fails.
-          return Date.new(year.to_i, month.to_i, day.to_i) 
+          return Date.new(year.to_i, month.to_i, day.to_i)
         rescue ArgumentError => e
           return nil
         end
@@ -128,7 +134,7 @@ module FreeForm
 
   private
     def assign_attribute(attribute, value)
-      self.send :"#{attribute}=", value unless ignore?(attribute, value)      
+      self.send :"#{attribute}=", value unless ignore?(attribute, value)
     end
 
     def ignore?(attribute, value)
@@ -136,4 +142,4 @@ module FreeForm
       return (mapping[:ignore_blank] && value.blank?) unless mapping.nil?
     end
   end
-end
+end

data/lib/freeform/form.rb

@@ -26,44 +26,94 @@ module FreeForm
 
     def initialize(h={})
       h.each {|k,v| send("#{k}=",v)}
-      initialize_child_models      
-    end  
-    
+      initialize_child_models
+    end
+
+    # def save
+    #   return false 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)
+    #   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)
+    #   end
+    # end
+
+
     def save
-      return false unless valid?
+      return false unless valid? || marked_for_destruction?
 
+      # Loop through nested models first, sending them the save call
       self.class.models.each do |form_model|
         model = send(form_model)
-        model.is_a?(Array) ? model.each { |m| m.save } : save_or_destroy(model)
+        # This is for nested models.
+        if model.is_a?(Array)
+          model.each { |m| m.save }
+        end
+      end
+
+#      puts "Saving... #{self}"
+
+      # After nested models are handled, 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)
+#          puts "Saving model...#{model}"
+          if model.is_a?(Project)
+            # puts "All Tasks = #{Task.all}"
+            # puts "Tasks = #{model.tasks.inspect}"
+          end
+          if marked_for_destruction?
+            # puts "destroying model...#{model}"
+            model.destroy
+          else
+            model.save
+          end
+        end
       end
     end
-  
+
     def save!
       raise FreeForm::FormInvalid, "form invalid." unless valid?
 
+      # Destroy all marked-for-destruction models
+
       self.class.models.each do |form_model|
         model = send(form_model)
         model.is_a?(Array) ? model.each { |m| m.save! } : save_or_destroy!(model)
       end
-    end    
-    
+    end
+
   private
     def initialize_child_models
       self.class.child_models.each do |c|
         send("initialize_#{c}")
-      end      
+      end
     end
 
     def save_or_destroy(model)
       marked_for_destruction? ? model.destroy : model.save
     end
-    
+
     def save_or_destroy!(model)
-      marked_for_destruction? ? model.destroy : model.save!
+      if marked_for_destruction?
+        model.destroy
+      else
+        model.save!
+      end
     end
 
     def marked_for_destruction?
       respond_to?(:_destroy) ? _destroy : false
     end
   end
-end
+end

data/lib/freeform/version.rb

@@ -1,3 +1,3 @@
 module Freeform
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/acceptance_spec.rb

@@ -36,7 +36,7 @@ describe FreeForm::Form do
       has_many :tasks, :class => Module::TaskForm, :default_initializer => :default_task_initializer
 
       def default_task_initializer
-        { :task => Task.new(:project => project) }
+        { :task => project.tasks.build }
       end
     end
     # This wrapper just avoids CONST warnings
@@ -67,7 +67,7 @@ describe FreeForm::Form do
 
     it "initializes with Task with project parent" do
       task = form.tasks.first.task
-      task.project.should eq(form.project)
+      task.should eq(form.project.tasks.first)
     end
   end
 
@@ -229,7 +229,7 @@ describe FreeForm::Form do
       end
     end
 
-    context "with invalid form, and invalid marked for destruction nested model", :failing => true do
+    context "with invalid form, and invalid marked for destruction nested model" do
       let(:attributes) do {
         :company_name => "",
         :project_name => "rails app",
@@ -374,10 +374,111 @@ describe FreeForm::Form do
       end
 
       it "should raise error on 'save!'" do
-        expect{ form.save!.should be_false }.to raise_error(FreeForm::FormInvalid)
+        expect{ form.save! }.to raise_error(FreeForm::FormInvalid)
       end
     end
 
+    context "with invalid attributes, and marked for destruction nested model", :failing => true do
+      let(:attributes) do {
+        :company_name => "dummycorp",
+        :project_name => "",
+        "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",
+          },
+          "3234322345" => {
+            :name => "task_2",
+            "end_date(1i)" => "2011",
+            "end_date(2i)" => "12",
+            "end_date(3i)" => "15",
+            :_destroy => "1"
+          }
+        } }
+      end
+
+      before(:each) do
+        form.fill(attributes)
+      end
+
+      it "should not be valid" do
+        form.should_not be_valid
+      end
+
+      describe "persisting destroy after failed save" do
+        before(:each) { form.save }
+
+        it "should have the second form still set to _destroy" do
+          form.tasks.second.should be_marked_for_destruction
+        end
+      end
+
+#       it "should have valid company and project after save", :failing_1 => 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
+
+      before(:each) do
+        form.fill(attributes)
+      end
+
+      it { is pending }
+#       it "should return true on 'save'" do
+#         form.save.should be_true
+#       end
+
+#       it "should have valid company and project after save", :failing_1 => 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 valid attributes" do
       let(:attributes) do {
         :company_name => "dummycorp",

data/spec/behavior_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Full Behavior', :js => true do
+  include Capybara::DSL
+
+  [:jquery].each do |js_framework|
+
+    url = case js_framework
+    when :jquery then '/projects/new'
+    end
+
+    context "with #{js_framework}" do
+      context 'adding/removing fields' do
+        it 'adds fields and increments count' do
+          visit url
+          click_link 'Add new task'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(1)
+          click_link 'Add new task'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(2)
+          click_link 'Add new task'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(3)
+        end
+
+        it 'removes fields' do
+          visit url
+          click_link 'Add new task'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(1)
+          click_link 'Remove'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(0)
+          click_link 'Add new task'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(1)
+        end
+      end
+
+      context 'after application submission' do
+        it 'emits general remove event' do
+          visit url
+          click_link 'Add new task'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(1)
+          click_link 'Remove'
+          all("input[id^='project_tasks_attributes_']", visible: true).count.should eq(0)
+          click_button 'Submit'
+          page.should have_selector(:xpath, "//input[@id='project_tasks_attributes_0__destroy' and @value='1']", visible: false)
+        end
+      end
+    end
+  end
+end

data/spec/dummy/app/controllers/projects_controller.rb

@@ -3,9 +3,15 @@ class ProjectsController < ApplicationController
     @project = Project.new
     @form = project_form(@project)
   end
-  
+
+  def create
+    @project = Project.new
+    @form = project_form(@project).fill(params[:project])
+    render :action => :new
+  end
+
 private
   def project_form(project)
     ProjectForm.new(:project => project)
-  end  
+  end
 end

data/spec/dummy/app/forms/task_form.rb

@@ -1,10 +1,11 @@
 class TaskForm < FreeForm::Form
   form_models :task
-  property :name, :on => :task      
+  property :name, :on => :task
+  allow_destroy_on_save
 
   has_many :milestones, :class => MilestoneForm, :default_initializer => :milestone_initializer
 
   def milestone_initializer
     { :milestone => Milestone.new }
   end
-end
+end

data/spec/dummy/app/views/projects/new.html.erb

@@ -1,4 +1,4 @@
-<%= freeform_for @form do |f| -%>
+<%= freeform_for @form, :url => projects_path, :method => :post do |f| -%>
   <%= f.text_field :name %>
   <%= f.fields_for :tasks do |tf| -%>
     <%= tf.text_field :name %>
@@ -10,4 +10,5 @@
     <%= tf.link_to_remove 'Remove' %>
   <% end -%>
   <%= f.link_to_add 'Add new task', :tasks %>
+  <%= f.submit "Submit" %>
 <% end -%>