freeform 1.0.6 → 1.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODlhMjM1OTg3MTFhNzFjMGIxNGYzN2EyM2YyYjUwMWM2MTc3YzlkMg==
+    M2UxYmY1NDkyMjcyYTBkZmZkMDU1ZjdlM2Y3M2U0ODMxOGZlNzhhYg==
   data.tar.gz: !binary |-
-    YzZmYjY2MDU5NzVkMWViODZmNzI4YTFmYzZmYjMxOTMwMDU2NDE5NA==
+    NDY2MTIwYWVmMWJmZjQyNGYyZDVjNmFlN2M0MDlkZjRjMDhjY2Q0Mg==
 SHA512:
   metadata.gz: !binary |-
-    MzM3ZTk4ZTFiZGU2MzNiNGZiZjA1NmQ4YTQ3OTVhNzNiNTkyNWEzMTc2ZTkx
-    ZjE2MTI0N2ZkOWY5NzFjODdkMjdmYzlmOTkyYWVjZTk3YzhjNjg2ZmJmZDAy
-    MDM5NDA2Yzk2MDlhZjQ1ZjAwZjU4YjIxNTIxMmY2OTUzZDJmMDI=
+    NDZlYjQ4OTZhOWRiOWZlZTkyMGI2MzgyYWY5OGNhYjBmOTk0OTdkYWEzM2Nj
+    MzE4ZDJiNjIwYzU1MjY5YWZiN2U1ZTE3ZTM5ZGUyMWM4ZWQwYWE3NjI2NTkw
+    MTY1MmMyZWRkZGUwOWI4NGVkNmRkMDg1NTg5YmM1OWMxZmRmMjk=
   data.tar.gz: !binary |-
-    MmMyMWVkMTUwYjEzOWI3OGZlMzI0N2JlNmU1OWJiNjFmZTYyMDljMGE4ZTI5
-    NzU0YTUzOTE0ODFkMWE5NmE5MDlkYWI3ODVhYTQ0NmJjNDZhMjJjZWU1YTdk
-    YzQwMGI1YjBmMWYxNmE3MTI5Y2NiODU5ZmI1ZjQ4YmFmZjRmMTQ=
+    NzY5MjlkOTg0NDY4N2MyNWRiOGQ0OTIzYmE1MjRiNWQ2ZDg4YmY4YzkwM2Q5
+    M2E1MDFlMjIxOWE4NTRmNGNmYWU0ZWZhOTAyMzQ2ZGQzOWUyNjc1MTUwNDll
+    ZGQxOTg3NWNmMzgyZjU3NjM5ZGNlYWUwYTAyNWY4YTBhZjIwNzQ=

data/Gemfile.lock

@@ -1,22 +1,21 @@
 PATH
   remote: .
   specs:
-    freeform (1.0.4)
+    freeform (1.0.6)
       activemodel
       formtastic
-      nested_form (~> 0.3.2)
-      rails (~> 3.2.0)
+      rails (~> 3.2.0, >= 3.2.0)
       simple_form
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.16)
-      actionpack (= 3.2.16)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
       mail (~> 2.5.4)
-    actionpack (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -24,18 +23,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-    activesupport (3.2.16)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
@@ -47,7 +46,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.9)
+    childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -61,14 +60,13 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.25.1)
     mini_portile (0.5.2)
-    mocha (0.14.0)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    nested_form (0.3.2)
-    nokogiri (1.6.0)
+    multi_json (1.9.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     polyglot (0.3.4)
     rack (1.4.5)
@@ -78,42 +76,43 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.16)
-      actionmailer (= 3.2.16)
-      actionpack (= 3.2.16)
-      activerecord (= 3.2.16)
-      activeresource (= 3.2.16)
-      activesupport (= 3.2.16)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
       bundler (~> 1.0)
-      railties (= 3.2.16)
-    railties (3.2.16)
-      actionpack (= 3.2.16)
-      activesupport (= 3.2.16)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rubyzip (1.1.0)
-    selenium-webdriver (2.38.0)
-      childprocess (>= 0.2.5)
+    selenium-webdriver (2.40.0)
+      childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
@@ -125,13 +124,13 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     thor (0.18.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     websocket (1.0.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)

data/Rakefile

@@ -14,9 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

data/freeform.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activemodel"
   spec.add_dependency "simple_form"
   spec.add_dependency "formtastic"
-  spec.add_dependency "nested_form", "~> 0.3.2"
-  spec.add_dependency "rails", "~> 3.2.0"
+  spec.add_dependency "rails", "~> 3.2.0", ">= 3.2.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"

data/lib/freeform/form.rb

@@ -29,25 +29,6 @@ module FreeForm
       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? || marked_for_destruction?
 
@@ -83,6 +64,65 @@ module FreeForm
       end
     end
 
+    # def destroy_all_marked_for_destruction
+    #   self.class.models.each do |form_model|
+    #     model = send(form_model)
+    #     # This is for nested form models.
+    #     if model.is_a?(Array)
+    #       model.each { |m| m.destroy_all_marked_for_destruction }
+    #     end
+    #   end
+
+    #   # Destroy objects
+    #   self.class.models.each do |form_model|
+    #     model = send(form_model)
+    #     unless model.is_a?(Array)
+    #       if marked_for_destruction?
+    #         model.destroy
+    #       end
+    #     end
+    #   end
+    # end
+
+    # def save
+    #   return false unless valid? || marked_for_destruction?
+
+    #   # NEW LOGIC!! Destroy all forms from the bottom up, then save all from the top down!
+    #   destroy_all_marked_for_destruction
+
+
+    #   # Save parent form objects first
+    #   self.class.models.each do |form_model|
+    #     model = send(form_model)
+    #     # This is for nested form models.
+    #     unless model.is_a?(Array)
+    #       unless marked_for_destruction?
+    #         # puts "Saving #{model.inspect}"
+    #         model.save
+    #         # puts "Errors = #{model.errors.inspect}"
+    #       end
+    #     end
+    #   end
+
+    #   # Save then call save on nested models
+    #   self.class.models.each do |form_model|
+    #     model = send(form_model)
+    #     # This is for nested form models.
+    #     if model.is_a?(Array)
+    #       model.each { |m| m.save }
+    #     end
+    #   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
+
   private
     def initialize_child_models
       self.class.child_models.each do |c|

data/lib/freeform/version.rb

@@ -1,3 +1,3 @@
 module Freeform
-  VERSION = "1.0.6"
+  VERSION = "1.0.8"
 end

data/spec/acceptance_spec.rb

@@ -47,9 +47,9 @@ describe FreeForm::Form do
   end
 
   let(:form) do
-    f = form_class.new( :company => Company.new )
-    f.build_task
-    f
+    form_class.new( :company => Company.new ).tap do |f|
+      f.build_task
+    end
   end
 
   describe "form initialization", :initialization => true do
@@ -378,7 +378,7 @@ describe FreeForm::Form do
       end
     end
 
-    context "with invalid attributes, and marked for destruction nested model", :failing => true do
+    context "with invalid attributes, and marked for destruction nested model" do
       let(:attributes) do {
         :company_name => "dummycorp",
         :project_name => "",
@@ -418,7 +418,7 @@ describe FreeForm::Form do
         end
       end
 
-#       it "should have valid company and project after save", :failing_1 => true do
+#       it "should have valid company and project after save", :failing => true do
 #         form.save
 # #        form.tasks.first.task.destroy
 #         form.company.should be_valid
@@ -461,23 +461,27 @@ describe FreeForm::Form do
       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
+#       it "should have valid company and project after save", :failing => true do
 #         form.save
-# #        form.tasks.first.task.destroy
+# #        form.tasks.last.task.destroy
+# #        form.valid?
 #         form.company.should be_valid
 #         form.project.valid?
-#         puts "Errors = #{form.project.errors.inspect}"
+#         # 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
-     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 {