Ticket #3196: multiple_associations_for_forms.patch

actionpack/lib/action_view/helpers/form_helper.rb

@@ -212 +212 @@
-        @object_name, @method_name = object_name.to_s, method_name.to_s
-        @template_object, @local_binding = template_object, local_binding
-        @object = object
-
-
+
+
+
+
+
+
+
+
+
+
-        end
-      end
-
@@ -236 +244 @@
-        options["value"]    = tag_value
-        options["checked"]  = "checked" if value.to_s == tag_value.to_s
-        pretty_tag_value    = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        add_default_name_and_id(options)
-        tag("input", options)
-      end
@@ -300 +319 @@
-      end
-      
-      def object
+        #puts "@object_name: #@object_name"
-        @object || @template_object.instance_variable_get("@#{@object_name}")
-      end
-
-      def value
-        unless object.nil?
-
+
+
+
-        end
-      end
-
@@ -323 +345 @@
-            options["name"] ||= tag_name_with_index(options["index"])
-            options["id"]   ||= tag_id_with_index(options["index"])
-            options.delete("index")
-
-(@auto_index)
-(@auto_index)
+es
+
+
-          else
-            options["name"] ||= tag_name
-            options["id"]   ||= tag_id
@@ -336 +358 @@
-          "#{@object_name}[#{@method_name}]"
-        end
-
-
-
+
+
+
+
+
+
+
+
+
+
-        end
-
-        def tag_id
-          "#{@object_name}_#{@method_name}"
-        end
-
-
-
+
+
+
+
+
+
+
-        end
-    end
-

actionpack/test/template/form_helper_test.rb

@@ -14 +14 @@
-      alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
-      alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
-    end
+    Comment = Struct.new("Comment", :title, :author_name, :body, :secret, :written_on, :cost)
+    Comment.class_eval do
+      alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
+      alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
+      alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+    end
-  end
-
-  def setup
@@ -29 +35 @@
-    @post.secret      = 1
-    @post.written_on  = Date.new(2004, 6, 15)
-
+    @comment = Comment.new
+    def @comment.errors() Class.new{ def on(field) field == "author_name" end }.new end
+
+    def @comment.id; 456; end
+    def @comment.id_before_type_cast; 456; end
+
+    @comment.title       = "Goodbye World"
+    @comment.author_name = ""
+    @comment.body        = "And here comes another hill..."
+    @comment.secret      = 1
+    @comment.written_on  = Date.new(1980, 6, 5)
+
-    @controller = Class.new do
-      def url_for(options, *parameters_for_method_reference)
-        "http://www.example.com"
@@ -176 +194 @@
-
-  def test_auto_index
-    pid = @post.id
+    cid = @comment.id
-    assert_dom_equal(
-      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
-    )
-    assert_dom_equal(
+      "<input id=\"post_#{pid}_comment_#{cid}_title\" name=\"post[#{pid}][comment][#{cid}][title]\" size=\"30\" type=\"text\" value=\"Goodbye World\" />", text_field("post[]comment[]","title")
+    )
+    assert_dom_equal(
-      "<textarea cols=\"40\" id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\" rows=\"20\">Back to the hill and over it again!</textarea>",
-      text_area("post[]", "body")
-    )
-    assert_dom_equal(
+      "<textarea cols=\"40\" id=\"post_#{pid}_comment_#{cid}_body\" name=\"post[#{pid}][comment][#{cid}][body]\" rows=\"20\">And here comes another hill...</textarea>",
+      text_area("post[]comment[]", "body")
+    )
+    assert_dom_equal(
-      "<input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" />",
-      check_box("post[]", "secret")
-    )
+    assert_dom_equal(
+      "<input checked=\"checked\" id=\"post_#{pid}_comment_#{cid}_secret\" name=\"post[#{pid}][comment][#{cid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][comment][#{cid}][secret]\" type=\"hidden\" value=\"0\" />",
+      check_box("post[]comment[]", "secret")
+    )
-   assert_dom_equal(
-"<input checked=\"checked\" id=\"post_#{pid}_title_hello_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Hello World\" />",
-      radio_button("post[]", "title", "Hello World")
-    )
+   assert_dom_equal(
+"<input checked=\"checked\" id=\"post_#{pid}_comment_#{cid}_title_goodbye_world\" name=\"post[#{pid}][comment][#{cid}][title]\" type=\"radio\" value=\"Goodbye World\" />",
+      radio_button("post[]comment[]", "title", "Goodbye World")
+    )
-    assert_dom_equal("<input id=\"post_#{pid}_title_goodbye_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Goodbye World\" />",
-      radio_button("post[]", "title", "Goodbye World")
-    )
+    assert_dom_equal("<input id=\"post_#{pid}_comment_#{cid}_title_so_long_world\" name=\"post[#{pid}][comment][#{cid}][title]\" type=\"radio\" value=\"So Long World\" />",
+      radio_button("post[]comment[]", "title", "So Long World")
+    )
-  end
-
-  def test_form_for

activerecord/lib/active_record/base.rb

@@ -243 +243 @@
-    # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+.
-    cattr_accessor :logger
-
+    def self.load_hash(_h, key_in=nil)
+      if key_in == nil
+        key_in = self.to_s
+      end
+      h = _h.clone
+      if 0 == h.keys[0].to_i
+        h = Hash.new
+        h["1"] = _h
+      end
+      a = Array.new
+      h.each do |k, v|
+        c = eval("#{Inflector.camelize(key_in)}")
+        id = nil
+        pk = c.primary_key
+        id = v[pk]
+        if id
+          r = c.find(id)
+        else
+          r = c.new
+        end
+        a << r
+        v.each do |k2, v2|
+          if v2.is_a?(Hash)
+            m = Inflector.pluralize(k2)
+            children = self.load_hash(v2, k2)
+            if !children.is_a?(Array)
+              ch = Array.new
+              ch << children
+              children = ch
+            end
+            if false
+              childClass = children[0].class
+              children.each do |c|
+                if !origChildren.include?(c)
+                  origChildren << children
+                end
+              end
+            end
+            origChildren = r.send("#{m}")
+            children.each do |c|
+              if !c.id
+                origChildren.push(c)
+              end
+            end
+          else
+            if k2 != pk
+              r.send("#{k2}=", v2)
+            end
+          end
+        end
+        r.save if id
+      end
+      if a.length == 0
+        return nil
+      else
+        return a
+      end
+    end
+
+    # Returns the connection currently associated with the class. This can
+    # also be used to "borrow" the connection to do database work unrelated
+    # to any of the specific Active Records.
+    def self.connection
+      retrieve_connection
+    end
+
+    # Returns the connection currently associated with the class. This can
+    # also be used to "borrow" the connection to do database work that isn't
+    # easily done without going straight to SQL.
+    def connection
+      self.class.connection
+    end
+
-    def self.inherited(child) #:nodoc:
-      @@subclasses[self] ||= []
-      @@subclasses[self] << child

activerecord/test/load_hash_test.rb

@@ +1 @@
+require 'abstract_unit'
+require 'fixtures/Developer'
+require 'fixtures/Project'
+require 'logger'
+
+class LoadHashTest < Test::Unit::TestCase
+  fixtures :developers, :projects
+  
+  cattr_accessor :logger
+
+  def setup
+    @david_before = Developer.find(1)
+    @active_record_before = Project.find(1)
+    @count_projects_before = @david_before.projects.length
+    @count_developers_before = Developer.count()
+    @h1 = { "1" => 
+            { "id" => "1",
+              "name" => "update dev",
+              "project" =>
+                { "2" =>
+                  { "id" => "1",
+                    "name" => "cocoon",
+                    "type" => ""},
+                  "3" =>
+                  { "name" => "myfaces",
+                    "type" => "" }
+                }
+            },
+            "4" =>
+            { "name" => "new dev",
+              "project" =>
+                { "5" =>
+                  { "name" => "struts",
+                    "type" => "" },
+                  "6" =>
+                  { "name" => "tomcat",
+                    "type" => "" }
+                }
+            }
+          }
+    @h2 = { "name" => "new dev",
+            "project" =>
+              { "2" =>
+                { "name" => "daddy",
+                  "type" => ""},
+                "3" =>
+                { "name" => "baby",
+                  "type" => "" }
+              }
+          }
+    @devs1 = Developer.load_hash(@h1)
+    @dev1 = Developer.load_hash(@h2)
+  end
+
+  def test_project_update
+    @devs1.each do |d|
+      d.projects.each do |p|
+        p.save
+      end
+    end
+    active_record_after = Project.find(1)
+    assert_not_equal(@active_record_before.name, active_record_after.name)
+  end
+
+  def test_correct_classes
+    assert_kind_of(Array, @devs1)
+    assert_kind_of(Array, @dev1)
+    @devs1.each do |d|
+      assert_kind_of(Developer, d)
+      d.projects.each do |p|
+        assert_kind_of(Project, p)
+      end
+    end
+  end
+
+  def test_dev_update
+    @devs1.each do |d|
+      d.save
+    end
+    david_after = Developer.find(1)
+    assert_not_equal(@david_before.name, david_after.name)
+    assert_equal(@count_projects_before + 1, david_after.projects.length)
+    developers_after = Developer.count()
+    assert_not_equal(@count_developers_before, developers_after)
+  end
+
+  def test_dev_insert
+  end
+
+end
+
+LoadHashTest.logger = ActiveRecord::Base.logger