freeform 1.0.11 → 2.0.0

data/spec/builder/builder_spec.rb

@@ -2,42 +2,6 @@ require "spec_helper"
 
 [FreeForm::Builder, FreeForm::SimpleBuilder, defined?(FreeForm::FormtasticBuilder) ? FreeForm::FormtasticBuilder : nil].compact.each do |builder|
   describe builder do
-    let!(:milestone_form_class) do
-      klass = Class.new(FreeForm::Form) do
-        form_input_key :milestone
-        form_models :milestone
-        allow_destroy_on_save
-
-        property :name, :on => :milestone
-      end
-      # This wrapper just avoids CONST warnings
-      v, $VERBOSE = $VERBOSE, nil
-        Module.const_set("MilestoneForm", klass)
-      $VERBOSE = v
-      klass
-    end
-
-    let!(:task_form_class) do
-      klass = Class.new(FreeForm::Form) do
-        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
-          {:milestone => Milestone.new}
-        end
-      end
-      # This wrapper just avoids CONST warnings
-      v, $VERBOSE = $VERBOSE, nil
-        Module.const_set("TaskForm", klass)
-      $VERBOSE = v
-      klass
-    end
-
     let(:form_class) do
       klass = Class.new(FreeForm::Form) do
         form_input_key :project
@@ -46,7 +10,25 @@ require "spec_helper"
 
         property :name, :on => :project
 
-        has_many :tasks, :class => Module::TaskForm, :default_initializer => :task_initializer
+        has_many :tasks do
+          form_input_key :task
+          form_models :task
+          allow_destroy_on_save
+
+          property :name, :on => :task
+
+          has_many :milestones do
+            form_input_key :milestone
+            form_models :milestone
+            allow_destroy_on_save
+
+            property :name, :on => :milestone
+          end
+
+          def milestone_initializer
+            {:milestone => Milestone.new}
+          end
+        end
 
         def task_initializer
           {:task => Task.new}
@@ -62,9 +44,9 @@ require "spec_helper"
     let(:form) { form_class.new(:project => Project.new) }
 
     let(:template) do
-      template = ActionView::Base.new
-      template.output_buffer = ""
-      template
+      ActionView::Base.new.tap do |t|
+        t.output_buffer = ""
+      end
     end
 
     context "with no options", :no_options => true do
@@ -212,4 +194,4 @@ require "spec_helper"
       end
     end
   end
-end
+end

data/spec/builder/view_helper_spec.rb

@@ -9,21 +9,6 @@ describe FreeForm::ViewHelper do
     end
   end
 
-  let!(:task_form_class) do
-    klass = Class.new(FreeForm::Form) do
-      form_input_key :task
-      form_model :task
-      allow_destroy_on_save
-        
-      property :name,    :on => :task
-    end
-    # This wrapper just avoids CONST warnings
-    v, $VERBOSE = $VERBOSE, nil
-      Module.const_set("TaskForm", klass)
-    $VERBOSE = v
-    klass
-  end
-
   let(:form_class) do
     klass = Class.new(FreeForm::Form) do
       form_input_key :project
@@ -32,7 +17,13 @@ describe FreeForm::ViewHelper do
       
       property :name, :on => :project
 
-      has_many :tasks, :class => Module::TaskForm, :default_initializer => :task_initializer
+      has_many :tasks do
+        form_input_key :task
+        form_model :task
+        allow_destroy_on_save
+          
+        property :name,    :on => :task
+      end
       
       def task_initializer
         {:task => Task.new}

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

@@ -3,9 +3,23 @@ class ProjectForm < FreeForm::Form
   form_models :project  
   property :name, :on => :project      
 
-  has_many :tasks, :class => TaskForm, :default_initializer => :task_initializer
+  has_many :tasks do
+    form_models :task
+	  property :name, :on => :task
+	  allow_destroy_on_save
+
+	  has_many :milestones do
+	    form_models :milestone
+	  	property :name, :on => :milestone  	
+	    allow_destroy_on_save  
+	  end
+
+	  def milestone_initializer
+	    { :milestone => task.milestones.build }
+	  end  	
+  end
 
   def task_initializer
-    { :task => Task.new }
+    { :task => project.tasks.build }
   end
 end

data/spec/dummy/app/models/company.rb

@@ -1,5 +1,5 @@
 class Company < ActiveRecord::Base
-  has_one :project
+  has_one :project, :as => :owner, :inverse_of => :owner
   
   validates :name, :presence => true
-end
+end

data/spec/dummy/app/models/milestone.rb

@@ -1,6 +1,6 @@
 class Milestone < ActiveRecord::Base
-  belongs_to :task
+  belongs_to :trackable, :polymorphic => true
 
-  validates :task, :presence => true
+  validates :trackable, :presence => true
   validates :name, :presence => true
-end
+end

data/spec/dummy/app/models/project.rb

@@ -1,9 +1,9 @@
 class Project < ActiveRecord::Base
-  belongs_to :company
+  belongs_to :owner, :polymorphic => true
   has_many :tasks
   has_many :assignments, :class_name => 'ProjectTask' 
   
-  validates :company, :presence => true
+  validates :owner, :presence => true
   validates :name, :presence => true
   validates :due_date, :presence => true
-end
+end

data/spec/dummy/app/models/task.rb

@@ -1,7 +1,7 @@
 class Task < ActiveRecord::Base
   belongs_to :project
-  has_many :milestones
+  has_many :milestones, :as => :trackable, :inverse_of => :trackable
   
   validates :project, :presence => true
   validates :start_date, :presence => true
-end
+end

data/spec/dummy/db/migrate/20110710143903_initial_tables.rb

@@ -5,25 +5,25 @@ class InitialTables < ActiveRecord::Migration
     end
 
     create_table :projects do |t|
-      t.integer :company_id
+      t.references :owner, :polymorphic => true, :null => false
       t.string :name
       t.date :due_date
     end
 
     create_table :tasks do |t|
-      t.integer :project_id
+      t.references :project, :null => false
       t.string :name
       t.date :start_date
       t.date :end_date
     end
 
     create_table :milestones do |t|
-      t.integer :task_id
+      t.references :trackable, :polymorphic => true, :null => false
       t.string :name
     end
 
     create_table :project_tasks do |t|
-      t.integer :project_id
+      t.references :project, :null => false
       t.string :name
     end
   end
@@ -35,4 +35,4 @@ class InitialTables < ActiveRecord::Migration
     drop_table :milestones
     drop_table :project_tasks
   end
-end
+end

data/spec/dummy/db/schema.rb

@@ -18,23 +18,25 @@ ActiveRecord::Schema.define(:version => 20110710143903) do
   end
 
   create_table "milestones", :force => true do |t|
-    t.integer "task_id"
+    t.integer "trackable_id",   :null => false
+    t.string  "trackable_type", :null => false
     t.string  "name"
   end
 
   create_table "project_tasks", :force => true do |t|
-    t.integer "project_id"
+    t.integer "project_id", :null => false
     t.string  "name"
   end
 
   create_table "projects", :force => true do |t|
-    t.integer "company_id"
+    t.integer "owner_id",   :null => false
+    t.string  "owner_type", :null => false
     t.string  "name"
     t.date    "due_date"
   end
 
   create_table "tasks", :force => true do |t|
-    t.integer "project_id"
+    t.integer "project_id", :null => false
     t.string  "name"
     t.date    "start_date"
     t.date    "end_date"

data/spec/form/date_params_filter_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'freeform/form/date_params_filter'
+
+describe FreeForm::DateParamsFilter do
+  describe "#call", :call => true do
+    let(:params) 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
+
+    subject { described_class.new.call(params) }
+
+    it "should have filtered all date params into Date objects" do
+      subject.should eq(
+        {
+          :company_name => "dummycorp",
+          :project_name => "railsapp",
+          "due_date" => Date.new(2014, 10, 30),
+          :tasks_attributes => {
+            "0" => {
+              :name => "task_1",
+              "start_date" => Date.new(2012, 1, 2),
+            },
+            "1" => {
+              :name => "task_2",
+              "end_date" => Date.new(2011, 12, 1),
+            },
+          },
+        }
+      )
+    end
+  end
+end

data/spec/form/form_input_key_spec.rb

@@ -2,18 +2,16 @@ require 'spec_helper'
 require 'freeform/form/form_input_key'
 
 describe FreeForm::FormInputKey do
-  describe "form input key", :form_input_key => true do
-    let(:form_class) do
-      Class.new(Module) do
-        include FreeForm::FormInputKey
-        form_input_key :test_key
-        
-        attr_accessor :my_accessor
-      end
+  let(:form_class) do
+    Class.new(Module) do
+      include FreeForm::FormInputKey
+      form_input_key :test_key
+      
+      attr_accessor :my_accessor
     end
+  end
 
-    it "sets form_input_key" do
-      form_class.model_name.should eq("TestKey")
-    end
+  it "sets form_input_key" do
+    form_class.model_name.should eq("TestKey")
   end
 end

data/spec/form/model_spec.rb

@@ -0,0 +1,244 @@
+require 'spec_helper'
+require 'freeform/form/model'
+
+describe FreeForm::Model do
+  describe "class methods", :class_methods => true do
+    describe "declared model", :declared_model => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          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::Model
+          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::Model
+          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])
+      end
+    end
+  
+    describe "form models", :form_models => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          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
+    end
+
+    describe "child models", :child_models => true do
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          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
+    end
+  end
+
+  describe "instance methods", :instance_methods => true do
+    describe "models", :models => true do
+      let(:model_1) { OpenStruct.new(:name => "first") }
+      let(:model_2) { OpenStruct.new(:name => "second") }
+      let(:address_1) { OpenStruct.new(:name => "main st.") }
+      let(:address_2) { OpenStruct.new(:name => "oak ave.") }
+
+      let(:form_class) do
+        Class.new(Module) do
+          include FreeForm::Model
+          include FreeForm::Nested
+          declared_model :first_model
+          declared_model :second_model
+          
+          has_many :addresses do
+            declared_model :address
+          end
+  
+          def initialize(h)
+            h.each {|k,v| send("#{k}=",v)}
+          end
+
+          def address_initializer
+            { :address => OpenStruct.new }
+          end
+        end
+      end
+  
+      let(:form) do
+        form_class.new(:first_model  => model_1, :second_model => model_2)
+      end
+
+      context "without nested models" do
+        it "returns array of models " do
+          form.models.should eq([model_1, model_2])
+        end
+      end
+
+      context "without nested models" do
+        before(:each) do
+          form.build_address(:address => address_1)
+          form.build_address(:address => address_2)
+        end
+
+        it "returns array of models" do
+          form.models.should be_a(Array)
+        end
+
+        it "has model_1 as its first model" do
+          form.models[0].should eq(model_1)
+        end
+
+        it "has model_2 as its second model" do
+          form.models[1].should eq(model_2)
+        end
+
+        it "has nested model form for address_1 as its third model" do
+          form.models[2].address.should eq(address_1)
+        end
+
+        it "has nested model form for address_2 as its fourth model" do
+          form.models[3].address.should eq(address_2)
+        end
+      end
+    end
+  end
+end