freeform 1.0.9 → 1.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzFkODg3MmFjOTEyMDYzYjE2NTRjODA2Y2Q1MTVjZmU1YTVkNzhkNg==
+    YjA0MmU0YThkYWRkNjhmZjc4N2Y2NmUyOTE3MWE4MWZjZTVkZDc0NA==
   data.tar.gz: !binary |-
-    OWEyOTFjNzY4NmM0MDYyYWI2YWVhMDdiOWM0MDQ4ZDkwMmVkOGRmNA==
+    ZTRmMGY1Yjc4YzkxNDUwNWEwNTZlNjVmYWNlODdhM2M2M2I0NTA3MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjljYmJhODY0NTQ4ODQ1YTA0ZWY1MGNjMDQyMDkyMjcyZGZjODljOGNjY2Rl
-    MWE2NjVmMDhjYjMyMmY5OTI0ZGU1ZWNkMmVlODk2MzhkNGVhNTkxZGI3YTQ3
-    NGU2ZDUxMGU3YTcyMzU2MjQyNzdmMTM0MjczY2E1YzU2YjY0ZDY=
+    NTM4ZjNlYmM5MGYyNjQ0OGYyN2VhZTIxNmY2Y2Y0Y2IyNzY0ODI2MTQ2NTQy
+    MWIyZjMxNjRmODc4ZGE4NTIyYTBhOTM2NGNkNTFmNmQ5ZWM5OGFlOTNiMTI5
+    MTg0YTRkYTI1YzhkN2UzOTY2OTE0M2RkZTAwMzMyZjg0ZmFhYWM=
   data.tar.gz: !binary |-
-    YTc1NDMzYzE1MzJiN2E2ZTUwNTgwYzFhZWVhZjUzMzEzNzNmY2EwYTMzNjQx
-    NWZiZjM5ODYxYmQxYWE5NTNhYjRlZTU4ZTc2MmQ3N2MyOGMwMzUyNWRlYzFi
-    YzA5MGY2NDQzMDk1NGI0ZDc4YWY3ODU5ZWZjMGZhZTVkOTkxMzI=
+    NTgzODg1NTFjM2YyNzVkNmRlMjYzZjAzODhlY2VmYmQ3Y2FiZDJmNGRhZmJk
+    NzEyMWIwMDFjNzUxZjMyMDY5ZjMzZDkwY2MxZDE0MTQyYTk2OTBhOTU4ZDkx
+    N2E2ZTkzZWZhNWJhNDliYmU2YzhhMzYyMDdmMDA2MTFjMzUyMWM=

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    freeform (1.0.6)
+    freeform (1.0.9)
       activemodel
       formtastic
-      rails (~> 3.2.0, >= 3.2.0)
+      rails (>= 3.2.0)
       simple_form
 
 GEM
@@ -46,7 +46,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.5.1)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -65,14 +65,14 @@ GEM
     mini_portile (0.5.2)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     polyglot (0.3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -110,8 +110,8 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubyzip (1.1.0)
-    selenium-webdriver (2.40.0)
+    rubyzip (1.1.2)
+    selenium-webdriver (2.41.0)
       childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
@@ -125,7 +125,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.9)
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot

data/lib/freeform/form.rb

@@ -32,16 +32,7 @@ module FreeForm
     def save
       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)
-        # This is for nested models.
-        if model.is_a?(Array)
-          model.each { |m| m.save }
-        end
-      end
-
-      # After nested models are handled, save or destroy myself.
+      # Save or destroy myself.
       self.class.models.each do |form_model|
         model = send(form_model)
         # This is for form models.
@@ -53,6 +44,15 @@ module FreeForm
           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
+      end
     end
 
     def save!
@@ -64,65 +64,6 @@ 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.9"
+  VERSION = "1.0.11"
 end