freeform 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODAyM2M4Y2YyNjA5NGY3NTQ3MzhiY2RlZGEwODc4NDllZjNkYWY3ZQ==
+    NTJlZjkyNzA0NTJlNzRhZjkyMjFjOGJmMjQyZjBkNDE5MmRiYzNjNA==
   data.tar.gz: !binary |-
-    MGYyOTkyNTNmMjBiZmM1OTg0MzRiODNkMWY4OWQwOTIxZjA2Y2Y4Zg==
+    NmZjYjBkNGU2NjBhOGVlMzQ5ZTM2YTcwMDAyMTdjYzViZDFjYjNhOQ==
 SHA512:
   metadata.gz: !binary |-
-    NTBmNzczODc3YTI3MTczNzFmYTQ1MTAwZDE0YmViMTkyZTdjNmQ2NTIyZGU2
-    NjU1NzFjYTcxZWRmNDM4MTg3YjJkMTY5MjgzMzdkMzdhYjc2Y2EzMWE5YzVh
-    YzUxY2NmYmUwZGVlYmE3MmE5OTFjYzhhZjE0MWI5NzBiNmRiN2I=
+    ZDMwZWJiYjljYzU5NWU3M2FkYzIxOTdkZGRlYzg2YzM4ODVmN2IzNzM2NjUy
+    YTdmODEzMDg3ODc5OGJiZmUzOTAxOTllNzBkNzI1OGZlNmVjZjBlNjY3NWM3
+    MGYxZDZmMGIwNjAzYWQyMDRlYjAzNDA2Yjg5Y2VkYzY4NTJiMDk=
   data.tar.gz: !binary |-
-    Mzk5YzNkMzJhMjdhNDA1ZWJkMjJlZWQ3OTc3ZjU1NmRiY2Q1ODA2YzVlNzk1
-    ZjIyZjJlZDhlNzZjZDU0MjI0NDFiYTIzZGU1OGM4Mzg3ZjYyODcyNDVkYjI5
-    ZmE4ZGRhNTQ1YTM3MjQyNDM0YjgwOWRhZDkxMTVmMDU1ZTk0ZjA=
+    ZDQzZDlkMjY1ZTYyMzZmODcyOTVkNGViNDFiZmJjMTcwZGQ0ZjIzYmU1MmVl
+    OTlkZDA4MTY2ZTEwNjdkMmYzYzU2N2I4OTNhZjdhMzU0MzM2ZDU4Yzc0ODRj
+    ZjUwYjYxNDc3YWZjMDJiYWUyZDkwY2VjMjMxODYwNGMzMzQ2ZWE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freeform (1.0.2)
+    freeform (1.0.3)
       activemodel
       formtastic
       nested_form (~> 0.3.2)
@@ -70,7 +70,7 @@ GEM
     nested_form (0.3.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)

data/lib/freeform/builder/builder_mixin.rb

@@ -70,7 +70,6 @@ module FreeForm
       args << options
       hidden_field(:_destroy, :value => 0) << @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}) }
@@ -88,14 +87,15 @@ module FreeForm
     end
 
     def fields_for_nested_model(name, object, options, block)
-      classes = 'fields'
-      classes << ' marked_for_destruction' if object.respond_to?(:marked_for_destruction?) && object.marked_for_destruction?
-
       perform_wrap   = options.fetch(:nested_wrapper, true)
       perform_wrap &&= options[:wrapper] != false # wrap even if nil
 
       if perform_wrap
-        @template.content_tag(:div, super, :class => classes)
+        if object.respond_to?(:marked_for_destruction?) && object.marked_for_destruction?
+          @template.content_tag(:div, super, :class => 'fields marked_for_destruction', :style => "display: none;")
+        else
+          @template.content_tag(:div, super, :class => 'fields')
+        end
       else
         super
       end
@@ -108,4 +108,4 @@ module FreeForm
       assocs.join('_') + '_fields_blueprint'
     end
   end
-end
+end

data/lib/freeform/version.rb

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

data/spec/acceptance_spec.rb

@@ -229,7 +229,45 @@ describe FreeForm::Form do
       end
     end
 
-    context "with invalid, marked for destruction nested model", :failing => true do
+    context "with invalid form, and invalid marked for destruction nested model", :failing => true 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",

data/spec/builder/builder_spec.rb

@@ -7,8 +7,8 @@ require "spec_helper"
         form_input_key :milestone
         form_models :milestone
         allow_destroy_on_save
-        
-        property :name, :on => :milestone  
+
+        property :name, :on => :milestone
       end
       # This wrapper just avoids CONST warnings
       v, $VERBOSE = $VERBOSE, nil
@@ -22,9 +22,9 @@ require "spec_helper"
         form_input_key :task
         form_models :task
         allow_destroy_on_save
-        
+
         property :name, :on => :task
-  
+
         has_many :milestones, :class => Module::MilestoneForm, :default_initializer => :milestone_initializer
 
         def milestone_initializer
@@ -43,11 +43,11 @@ require "spec_helper"
         form_input_key :project
         form_models :project
         allow_destroy_on_save
-        
+
         property :name, :on => :project
-  
+
         has_many :tasks, :class => Module::TaskForm, :default_initializer => :task_initializer
-        
+
         def task_initializer
           {:task => Task.new}
         end
@@ -58,7 +58,7 @@ require "spec_helper"
       $VERBOSE = v
       klass
     end
-    
+
     let(:form) { form_class.new(:project => Project.new) }
 
     let(:template) do
@@ -133,11 +133,11 @@ require "spec_helper"
         end
       end
 
-      it "wraps nested fields marked for destruction with an additional class" do
+      it "wraps nested fields marked for destruction with an additional class, and hides them" do
         task = form.build_task
         task.mark_for_destruction
         fields = subject.fields_for(:tasks) { 'Task' }
-        fields.should eq('<div class="fields marked_for_destruction">Task</div>')
+        fields.should eq('<div class="fields marked_for_destruction" style="display: none;">Task</div>')
       end
 
       it "puts blueprint into data-blueprint attribute" do
@@ -212,4 +212,4 @@ require "spec_helper"
       end
     end
   end
-end
+end