Redo FormDefinition relationship with other parts.

Author: kaspth

lib/active_form/base.rb

@@ -44,7 +44,7 @@ def association(name, options = {}, &block)
         define_method(name) { instance_variable_get("@#{name}").models }
         define_method("#{name}_attributes=") {}
 
-        forms << FormDefinition.new(name, block, options)
+        forms << [name, options, block]
       end
 
       def forms
@@ -60,11 +60,10 @@ def model_class
     private
 
     def populate_forms
-      self.class.forms.each do |definition|
-        definition.parent = model
-        definition.to_form.tap do |nested_form|
-          forms << nested_form
-          instance_variable_set("@#{definition.assoc_name}", nested_form)
+      self.class.forms.each do |(name, options, block)|
+        FormDefinition.new(name, block, options).build_for(model).tap do |form|
+          forms << form
+          instance_variable_set("@#{name}", form)
         end
       end
     end

lib/active_form/form.rb

@@ -5,10 +5,13 @@ class Form < AbstractForm
     delegate :id, :_destroy, :persisted?, to: :model
     attr_reader :association_name, :parent, :model, :proc
 
-    def initialize(assoc_name, parent, proc, model=nil)
+    def initialize(assoc_name, parent, proc, options = {})
       @association_name = assoc_name
       @parent = parent
+
+      model = options unless options.is_a?(Hash)
       @model = model || build_model
+
       @forms = []
       instance_eval(&proc) if proc
       enable_autosave
@@ -22,11 +25,9 @@ def association(name, options = {}, &block)
       define_singleton_method(name) { instance_variable_get("@#{name}").models }
       define_singleton_method("#{name}_attributes=") {}
 
-      definition = FormDefinition.new(name, block, options)
-      definition.parent = @model
-      definition.to_form.tap do |nested_form|
-        forms << nested_form
-        instance_variable_set("@#{name}", nested_form)
+      FormDefinition.new(name, block, options).build_for(@model).tap do |form|
+        forms << form
+        instance_variable_set("@#{name}", form)
       end
     end
 

lib/active_form/form_definition.rb

@@ -1,29 +1,19 @@
 module ActiveForm
   class FormDefinition
-    attr_accessor :assoc_name, :proc, :parent, :records
+    attr_reader :assoc_name
 
-    def initialize(assoc_name, block, options={})
+    def initialize(assoc_name, block, options)
       @assoc_name = assoc_name
-      @proc = block
-      @records = options[:records]
+      @block = block
+      @options = options
     end
 
-    def to_form
-      macro = association_reflection.macro
-
-      case macro
-      when :has_one, :belongs_to
-        Form.new(assoc_name, parent, proc)
-      when :has_many
-        CollectionForm.new(assoc_name, parent, proc, {records: records})
-      end
-    end
-
-    private
-
-    def association_reflection
-      parent.class.reflect_on_association(@assoc_name)
+    def build_for(model)
+      if model.class.reflect_on_association(@assoc_name).macro == :has_many
+        CollectionForm
+      else
+        Form
+      end.new(@assoc_name, model, @block, @options)
     end
   end
-
-end
+end

test/forms/nested_model_form_test.rb

@@ -20,12 +20,6 @@ def setup
     assert_respond_to UserWithEmailFormFixture, :forms
   end
 
-  test "forms list contains form definitions" do
-    email_definition = UserWithEmailFormFixture.forms.first
-
-    assert_equal :email, email_definition.assoc_name
-  end
-
   test "contains getter for email sub-form" do
     assert_respond_to @form, :email
     assert_instance_of ActiveForm::Form, @form.email

test/forms/nested_models_form_test.rb

@@ -13,16 +13,9 @@ def setup
   end
 
   test "declares both sub-forms" do
-    assert_equal 2, UserWithEmailAndProfileFormFixture.forms.size
     assert_equal 2, @form.forms.size
   end
 
-  test "forms list contains profile sub-form definition" do
-    profile_definition = UserWithEmailAndProfileFormFixture.forms.last
-
-    assert_equal :profile, profile_definition.assoc_name
-  end
-
   test "profile sub-form contains association name and parent" do
     assert_equal :profile, @profile_form.association_name
     assert_equal @user, @profile_form.parent

test/forms/project_form_test.rb

@@ -27,20 +27,6 @@ def setup
     assert_respond_to ProjectFormFixture, :association
   end
 
-  test "forms list contains sub-form definitions" do
-    assert_equal 4, ProjectFormFixture.forms.size
-
-    tasks_definition = ProjectFormFixture.forms[0]
-    contributors_definition = ProjectFormFixture.forms[1]
-    project_tags_definition = ProjectFormFixture.forms[2]
-    owner_definition = ProjectFormFixture.forms[3]
-
-    assert_equal :tasks, tasks_definition.assoc_name
-    assert_equal :contributors, contributors_definition.assoc_name
-    assert_equal :project_tags, project_tags_definition.assoc_name
-    assert_equal :owner, owner_definition.assoc_name
-  end
-
   test "project form provides getter method for tasks sub-form" do
     assert_instance_of ActiveForm::CollectionForm, @tasks_form
   end