Changeset 7826

Timestamp:

10/10/07 19:11:50 (2 years ago)

Author:

xal

Message:

find_and_(initialize|create)_by methods can now properly initialize protected attributes

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (4 diffs)
• trunk/activerecord/test/finder_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/computer.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* find_and_(initialize|create)_by methods can now properly initialize protected attributes [Tobias Luetke]
-
-* belongs_to infers the foreign key from the association name instead of from the class name.  [Jeremy Kemper]

trunk/activerecord/lib/active_record/base.rb

@@ -1270 +1270 @@
-                end
-              end
-
+, __FILE__, __LINE__
-            send(method_id, *arguments)
-          elsif match = /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/.match(method_id.to_s)
@@ -1285 +1285 @@
-                  find_attributes = attributes = construct_attributes_from_arguments([:#{attribute_names.join(',:')}], args)
-                end
-
+                
-                options = { :conditions => find_attributes }
-                set_readonly_option!(options)
-
-
+
+
+
+
+
+
+
+
-              end
-
+, __FILE__, __LINE__
-            send(method_id, *arguments)
-          else
@@ -1842 +1849 @@
-      # from this form of mass-assignment by using the +attr_protected+ macro. Or you can alternatively
-      # specify which attributes *can* be accessed in with the +attr_accessible+ macro. Then all the
-
-
+ 
+, guard_protected_attributes = true
-        return if new_attributes.nil?
-        attributes = new_attributes.dup
@@ -1849 +1856 @@
-
-        multi_parameter_attributes = []
-
+
+
+
-          k.include?("(") ? multi_parameter_attributes << [ k, v ] : send(k + "=", v)
-        end

trunk/activerecord/test/finder_test.rb

@@ -470 +470 @@
-    assert sig38.new_record?
-  end
+  
+  def test_find_or_initialize_from_one_attribute_should_set_attribute_even_when_protected
+    c = Company.find_or_initialize_by_name_and_rating("Fortune 1000", 1000)
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert c.new_record?    
+  end
+
+  def test_find_or_create_from_one_attribute_should_set_attribute_even_when_protected
+    c = Company.find_or_create_by_name_and_rating("Fortune 1000", 1000)
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert !c.new_record?    
+  end
-
-  def test_dynamic_find_or_initialize_from_one_attribute_caches_method

trunk/activerecord/test/fixtures/computer.rb

@@ -2 +2 @@
-  belongs_to :developer, :foreign_key=>'developer'
-end
+