freeform 1.0.11 → 2.0.0

data/spec/form/property_spec.rb

@@ -1,239 +1,67 @@
 require 'spec_helper'
+require 'freeform/form/model'
 require 'freeform/form/property'
 
 describe FreeForm::Property do
-  describe "class methods", :class_methods => true do
-    describe "models", :models => true do
-      describe "declared model", :declared_model => true do
-        let(:form_class) do
-          Class.new(Module) do
-            include FreeForm::Property
-            declared_model :test_model_1
-            declared_model :test_model_2
-    
-            def initialize(h={})
-              h.each {|k,v| send("#{k}=",v)}
-            end  
-          end
-        end
-    
-        let(:form) do
-          form_class.new(
-            :test_model_1 => OpenStruct.new(:dummy => "yes"),
-            :test_model_2 => OpenStruct.new(:test => "clearly")
-          )
-        end
-    
-        it "sets declared models as accessor" do
-          form.test_model_1.should eq(OpenStruct.new(:dummy => "yes"))
-          form.test_model_2.should eq(OpenStruct.new(:test => "clearly"))
-        end
-    
-        it "has writable set accessors" do
-          form.test_model_1 = "Something New"
-          form.test_model_1.should eq("Something New")
-        end
-    
-        it "sets @models in class to declared models" do
-          form_class.models.should eq([:test_model_1, :test_model_2])
-        end
-      end
-    
-      describe "form model", :form_model => true do
-        let(:form_class) do
-          Class.new(Module) do
-            include FreeForm::Property
-            form_model :test_model_1
-            form_model :test_model_2
-    
-            def initialize(h={})
-              h.each {|k,v| send("#{k}=",v)}
-            end  
-          end
-        end
-    
-        let(:form) do
-          form_class.new(
-            :test_model_1 => OpenStruct.new(:dummy => "yes"),
-            :test_model_2 => OpenStruct.new(:test => "clearly")
-          )
-        end
-    
-        it "sets declared models as accessor" do
-          form.test_model_1.should eq(OpenStruct.new(:dummy => "yes"))
-          form.test_model_2.should eq(OpenStruct.new(:test => "clearly"))
-        end
-    
-        it "has writable set accessors" do
-          form.test_model_1 = "Something New"
-          form.test_model_1.should eq("Something New")
-        end
-    
-        it "sets @models in class to declared models" do
-          form_class.models.should eq([:test_model_1, :test_model_2])
-        end
-      end
-    
-      describe "declared models", :declared_models => true do
-        let(:form_class) do
-          Class.new(Module) do
-            include FreeForm::Property
-            declared_models :test_model_1, :test_model_2
-    
-            def initialize(h={})
-              h.each {|k,v| send("#{k}=",v)}
-            end  
-          end
-        end
-    
-        let(:form) do
-          form_class.new(
-            :test_model_1 => OpenStruct.new(:dummy => "yes"),
-            :test_model_2 => OpenStruct.new(:test => "clearly")
-          )
-        end
-    
-        it "sets declared models as accessor" do
-          form.test_model_1.should eq(OpenStruct.new(:dummy => "yes"))
-          form.test_model_2.should eq(OpenStruct.new(:test => "clearly"))
-        end
-    
-        it "has writable set accessors" do
-          form.test_model_1 = "Something New"
-          form.test_model_1.should eq("Something New")
-        end
-    
-        it "sets @models in class to declared models" do
-          form_class.models.should eq([:test_model_1, :test_model_2])
+  describe "class methods", :class_methods => true do    
+    describe "property", :property => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          include FreeForm::Property
+          declared_model :test_model
+          
+          property :attribute_1, :on => :test_model
+          property :attribute_2, :on => :test_model, :ignore_blank => true
+          property :attribute_3, :as => :test_attribute_3, :on => :test_model
+  
+          def initialize(h={})
+            h.each {|k,v| send("#{k}=",v)}
+          end  
         end
       end
-    
-      describe "form models", :form_models => true do
-        let(:form_class) do
-          Class.new(Module) do
-            include FreeForm::Property
-            form_models :test_model_1, :test_model_2
-    
-            def initialize(h={})
-              h.each {|k,v| send("#{k}=",v)}
-            end  
-          end
-        end
-    
-        let(:form) do
-          form_class.new(
-            :test_model_1 => OpenStruct.new(:dummy => "yes"),
-            :test_model_2 => OpenStruct.new(:test => "clearly")
-          )
-        end
-    
-        it "sets declared models as accessor" do
-          form.test_model_1.should eq(OpenStruct.new(:dummy => "yes"))
-          form.test_model_2.should eq(OpenStruct.new(:test => "clearly"))
-        end
-    
-        it "has writable set accessors" do
-          form.test_model_1 = "Something New"
-          form.test_model_1.should eq("Something New")
-        end
-    
-        it "sets @models in class to declared models" do
-          form_class.models.should eq([:test_model_1, :test_model_2])
-        end
+  
+      let(:form) do
+        form_class.new(
+          :test_model => OpenStruct.new(:attribute_1 => "yes"),
+        )
       end
+  
+      describe "delegation" do
+        it "delegates properties to models" do
+          form.attribute_1.should eq("yes")
+          form.attribute_2.should be_nil
+        end  
+  
+        it "allows properties to be written, and delegates the values" do
+          form.attribute_1 = "changed"
+          form.attribute_1.should eq("changed")
+          form.test_model.attribute_1.should eq("changed")
+        end  
 
-      describe "child models", :child_models => true do
-        let(:form_class) do
-          Class.new(Module) do
-            include FreeForm::Property
-            form_model :test_model_1
-            child_model :test_model_2 do
-              test_model_1.build_child
-            end
-    
-            def initialize(h={})
-              h.each {|k,v| send("#{k}=",v)}
-              initialize_test_model_2
-            end  
-          end
-        end
-    
-        let(:form) do
-          form_class.new(
-            :test_model_1 => OpenStruct.new(:dummy => "yes", 
-              :build_child => OpenStruct.new(:field => "child model"))
-          )
-        end
-    
-        it "sets declared models as accessor" do
-          form.test_model_1.should eq(OpenStruct.new(:dummy => "yes", :build_child => OpenStruct.new(:field => "child model")))
-          form.test_model_2.should eq(OpenStruct.new(:field => "child model"))
-        end
-    
-        it "sets @models in class to declared models" do
-          form_class.models.should eq([:test_model_1, :test_model_2])
-        end
+        it "delegates using :as" do
+          form.test_attribute_3.should be_nil
+          form.test_attribute_3 = "set_using_as"
+          form.test_attribute_3.should eq("set_using_as") 
+          form.test_model.attribute_3.should eq("set_using_as")
+        end  
       end
-    end
-    
-    describe "properties", :properties => true do
-      describe "property", :property => true do
-        let(:form_class) do
-          Class.new(Module) do
-            include FreeForm::Property
-            declared_model :test_model
-            
-            property :attribute_1, :on => :test_model
-            property :attribute_2, :on => :test_model, :ignore_blank => true
-            property :attribute_3, :as => :test_attribute_3, :on => :test_model
-    
-            def initialize(h={})
-              h.each {|k,v| send("#{k}=",v)}
-            end  
-          end
-        end
-    
-        let(:form) do
-          form_class.new(
-            :test_model => OpenStruct.new(:attribute_1 => "yes"),
+      
+      describe "property_mappings" do
+        it "sets appropriate property mappings" do
+          form_class.property_mappings.should eq(
+          { :attribute_1 => {:model => :test_model, :field => :attribute_1, :ignore_blank => false},
+            :attribute_2 => {:model => :test_model, :field => :attribute_2, :ignore_blank => true},
+            :test_attribute_3 => {:model => :test_model, :field => :attribute_3, :ignore_blank => false}
+          }
           )
-        end
-    
-        describe "delegation" do
-          it "delegates properties to models" do
-            form.attribute_1.should eq("yes")
-            form.attribute_2.should be_nil
-          end  
-    
-          it "allows properties to be written, and delegates the values" do
-            form.attribute_1 = "changed"
-            form.attribute_1.should eq("changed")
-            form.test_model.attribute_1.should eq("changed")
-          end  
-
-          it "delegates using :as" do
-            form.test_attribute_3.should be_nil
-            form.test_attribute_3 = "set_using_as"
-            form.test_attribute_3.should eq("set_using_as") 
-            form.test_model.attribute_3.should eq("set_using_as")
-          end  
-        end
-        
-        describe "property_mappings" do
-          it "sets appropriate property mappings" do
-            form_class.property_mappings.should eq(
-            { :attribute_1 => {:model => :test_model, :field => :attribute_1, :ignore_blank => false},
-              :attribute_2 => {:model => :test_model, :field => :attribute_2, :ignore_blank => true},
-              :test_attribute_3 => {:model => :test_model, :field => :attribute_3, :ignore_blank => false}
-            }
-            )
-          end  
-        end
+        end  
       end
 
       describe "allow_destroy_on_save", :allow_destroy_on_save => true do
         let(:form_class) do
           Class.new(Module) do
+            include FreeForm::Model
             include FreeForm::Property
             declared_model :test_model
             allow_destroy_on_save
@@ -302,44 +130,10 @@ describe FreeForm::Property do
   end
 
   describe "instance methods", :instance_methods => true do
-    describe "parent_form", :parent_form => true do
-      let(:form_class) do
-        Class.new(Module) do
-          include FreeForm::Property
-          declared_model :first_model
-          declared_model :second_model
-          
-          property :attribute_1, :on => :first_model
-          property :attribute_2, :on => :first_model, :ignore_blank => true
-          property :attribute_3, :on => :second_model, :ignore_blank => true
-          property :attribute_4, :on => :second_model
-  
-          def initialize(h)
-            h.each {|k,v| send("#{k}=",v)}
-          end
-        end
-      end
-  
-      let(:form) do
-        form_class.new(
-          :first_model  => OpenStruct.new(:attribute_1 => "first", :attribute_2 => "second"),
-          :second_model => OpenStruct.new(:attribute_3 => "third", :attribute_4 => "fourth"),
-        )
-      end
-      
-      it "has parent_form as nil by default" do
-        form.parent_form.should be_nil
-      end
-      
-      it "has can assign and reference parent_form" do
-        parent = Module.new
-        form.parent_form = parent
-        form.parent_form.should eq(parent)
-      end
-    end
     describe "assign_attributes", :assign_attributes => true do
       let(:form_class) do
         Class.new(Module) do
+          include FreeForm::Model
           include FreeForm::Property
           declared_model :first_model
           declared_model :second_model
@@ -394,5 +188,59 @@ describe FreeForm::Property do
         form.attribute_1.should eq(Date.new(2013, 6, 5))
       end
     end
+
+    describe "model_property_mappings", :model_property_mappings => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          include FreeForm::Property
+          declared_model :first_model
+          declared_model :second_model
+          
+          property :attribute_1, :on => :first_model
+          property :attribute_2, :on => :first_model, :ignore_blank => true
+          property :attribute_3, :on => :second_model, :ignore_blank => true
+          property :attribute_4, :on => :second_model
+  
+          def initialize(h)
+            h.each {|k,v| send("#{k}=",v)}
+          end
+        end
+      end
+  
+      let(:form) do
+        form_class.new(
+          :first_model  => OpenStruct.new(:attribute_1 => "first", :attribute_2 => "second"),
+          :second_model => OpenStruct.new(:attribute_3 => "third", :attribute_4 => "fourth"),
+        )
+      end
+      
+      it "has correct model_property_mappings hash" do
+        form.model_property_mappings.should eq(
+          {
+            :attribute_1 => {
+              :model => :first_model, 
+              :field => :attribute_1, 
+              :ignore_blank => false,
+            },
+            :attribute_2 => {
+              :model => :first_model, 
+              :field => :attribute_2, 
+              :ignore_blank => true,
+            },
+            :attribute_3 => {
+              :model => :second_model, 
+              :field => :attribute_3, 
+              :ignore_blank => true,
+            },
+            :attribute_4 => {
+              :model => :second_model, 
+              :field => :attribute_4, 
+              :ignore_blank => false,
+            },
+          }
+        )
+      end
+    end
   end
 end

data/spec/form/validation_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe FreeForm::Validation do
   let(:user) do
-    model = Class.new(Module) do
+    Class.new(Module) do
       include ActiveModel::Validations
       def self.model_name; ActiveModel::Name.new(self, nil, "user") end
 
@@ -12,11 +12,10 @@ describe FreeForm::Validation do
       def save; return valid? end
       alias_method :save!, :save
     end.new
-    model
   end
 
   let(:address) do
-    model = Class.new(Module) do
+    Class.new(Module) do
       include ActiveModel::Validations
       def self.model_name; ActiveModel::Name.new(self, nil, "address") end
 
@@ -27,155 +26,143 @@ describe FreeForm::Validation do
       def save; return valid? end
       alias_method :save!, :save
     end.new
-    model
   end
 
-  describe "validation", :validation => true do    
-    context "without model validation", :no_model_validation => true do
-      let!(:nested_class) do
-        klass = Class.new(Module) do
-          include ActiveModel::Validations
-          include FreeForm::Property
-          include FreeForm::Nested
-          include FreeForm::Validation
-          declared_model :address          
-          property :street, :on => :address
+  context "with nested form validation", :nested_form_validation => true do
+    let(:form_class) do
+      klass = Class.new(Module) do
+        include ActiveModel::Validations
+        include FreeForm::Model
+        include FreeForm::Property
+        include FreeForm::Nested
+        include FreeForm::Validation
+        validate_nested_forms
+
+        form_model :user
+        property :username, :on => :user
+        validates :username, :presence => true
+        
+        nested_form :addresses do
+          declared_model :address
+          allow_destroy_on_save
 
-          def initialize(h={})
-            h.each {|k,v| send("#{k}=",v)}
-          end  
+          property :street, :on => :address
+          validates :street, :presence => true
         end
-        # This wrapper just avoids CONST warnings
-        v, $VERBOSE = $VERBOSE, nil
-          Module.const_set("AddressForm", klass)
-        $VERBOSE = v
-        klass
-      end
-
-      let(:form_class) do
-        klass = Class.new(Module) do
-          include ActiveModel::Validations
-          include FreeForm::Property
-          include FreeForm::Nested
-          include FreeForm::Validation
-          form_model :user
-          property :username, :on => :user
-          validates :username, :presence => true
-          
-          nested_form :addresses, :class => Module::AddressForm, :default_initializer => :address_initializer
-          
-          def address_initializer
-            {:address => OpenStruct.new}
-          end
-          
-          def initialize(h={})
-            h.each {|k,v| send("#{k}=",v)}
-          end  
+        
+        def address_initializer
+          {:address => OpenStruct.new}
         end
-        # This wrapper just avoids CONST warnings
-        v, $VERBOSE = $VERBOSE, nil
-          Module.const_set("DummyForm", klass)
-        $VERBOSE = v
-        klass
-      end
-  
-      let(:form) do
-        test_form = form_class.new(:user => user)
-        test_form.build_address(:address => address)
-        test_form
+        
+        def initialize(h={})
+          h.each {|k,v| send("#{k}=",v)}
+        end  
       end
+      # This wrapper just avoids CONST warnings
+      v, $VERBOSE = $VERBOSE, nil
+        Module.const_set("DummyForm", klass)
+      $VERBOSE = v
+      klass
+    end
 
-      it "is not valid initially" do
-        form.should_not be_valid
+    let(:form) do
+      form_class.new(:user => user).tap do |f|
+        f.build_address
       end
+    end
+
+    it "is not valid initially" do
+      form.should_not be_valid
+    end
+
+    it "has error on :username" do
+      form.valid?
+      form.errors[:username].should eq(["can't be blank"])
+    end
+
+    it "does not have errors on address" do
+      form.valid?
+      form.addresses.first.errors[:street].should eq(["can't be blank"])
+    end
 
-      it "has error on :username" do
-        form.valid?
-        form.errors[:username].should eq(["can't be blank"])
+    context "with valid model, invalid nested model" do
+      before(:each) do
+        form.assign_params(:username => "bob", :addresses_attributes => { 
+          "0" =>
+            {
+              :street => nil
+            }
+          }
+        )
       end
 
-      it "does not have errors on address" do
-        form.valid?
-        form.addresses.first.errors.should be_empty
+      it "should be valid" do
+        address_form = form.addresses.first
+        form.should_not be_valid
       end
     end
+  end
 
-    context "with model validation", :model_validation => true do
-      let!(:nested_class) do
-        klass = Class.new(Module) do
-          include ActiveModel::Validations
-          include FreeForm::Property
-          include FreeForm::Nested
-          include FreeForm::Validation
+  context "with model validation", :model_validation => true do
+    let(:form_class) do
+      klass = Class.new(Module) do
+        include ActiveModel::Validations
+        include FreeForm::Model
+        include FreeForm::Property
+        include FreeForm::Nested
+        include FreeForm::Validation
+        form_model :user
+        validate_models
+        validate_nested_forms
+        property :username, :on => :user
+        property :form_property
+
+        validates :form_property, :presence => true
+        
+        nested_form :addresses do
           declared_model :address          
           validate_models
           property :street, :on => :address
-
-          def initialize(h={})
-            h.each {|k,v| send("#{k}=",v)}
-          end  
         end
-        # This wrapper just avoids CONST warnings
-        v, $VERBOSE = $VERBOSE, nil
-          Module.const_set("AddressForm", klass)
-        $VERBOSE = v
-        klass
-      end
-
-      let(:form_class) do
-        klass = Class.new(Module) do
-          include ActiveModel::Validations
-          include FreeForm::Property
-          include FreeForm::Nested
-          include FreeForm::Validation
-          form_model :user
-          validate_models
-          property :username, :on => :user
-          property :form_property
-
-          validates :form_property, :presence => true
-          
-          nested_form :addresses, :class => Module::AddressForm, :default_initializer => :address_initializer
-          
-          def address_initializer
-            {:address => OpenStruct.new}
-          end
-          
-          def initialize(h={})
-            h.each {|k,v| send("#{k}=",v)}
-          end  
+        
+        def address_initializer
+          {:address => OpenStruct.new}
         end
-        # This wrapper just avoids CONST warnings
-        v, $VERBOSE = $VERBOSE, nil
-          Module.const_set("DummyForm", klass)
-        $VERBOSE = v
-        klass
-      end
-  
-      let(:form) do
-        test_form = form_class.new( :user => user )
-        test_form.build_address( :address => address )
-        test_form
+        
+        def initialize(h={})
+          h.each {|k,v| send("#{k}=",v)}
+        end  
       end
+      # This wrapper just avoids CONST warnings
+      v, $VERBOSE = $VERBOSE, nil
+        Module.const_set("DummyForm", klass)
+      $VERBOSE = v
+      klass
+    end
 
-      it "is not valid initially" do
-        form.should_not be_valid
+    let(:form) do
+      form_class.new( :user => user ).tap do |f|
+        f.build_address( :address => address )
       end
+    end
 
-      it "has error on :username" do
-        form.valid?
-        form.errors[:username].should eq(["can't be blank"])
-      end
+    it "is not valid initially" do
+      form.should_not be_valid
+    end
 
-      it "has error on :form_property" do
-        form.valid?
-        form.errors[:form_property].should eq(["can't be blank"])
-      end
+    it "has error on :username" do
+      form.valid?
+      form.errors[:username].should eq(["can't be blank"])
+    end
 
-      it "has error on address street" do
-        form.valid?
-        form.addresses.first.errors[:street].should eq(["can't be blank"])
-      end
+    it "has error on :form_property" do
+      form.valid?
+      form.errors[:form_property].should eq(["can't be blank"])
+    end
+
+    it "has error on address street", :failing => true do
+      form.valid?
+      form.addresses.first.errors[:street].should eq(["can't be blank"])
     end
   end
 end

data/spec/spec_helper.rb

@@ -22,3 +22,9 @@ Capybara.javascript_driver = :selenium
 RSpec.configure do |config|
   config.mock_with :rspec
 end
+
+RSpec::Matchers.define :exist_in_database do
+  match do |actual|
+    actual.class.exists?(actual.id)
+  end
+end