Changeset 7693

Timestamp:

09/30/07 07:09:44 (9 months ago)

Author:

rick

Message:

Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 [dcmanges]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (5 diffs)
• trunk/activerecord/test/associations_test.rb (modified) (1 diff)
• trunk/activerecord/test/base_test.rb (modified) (4 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.14.2 - 1.15.3]
+
+* Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 [dcmanges]
+
+  class Comment < ActiveRecord::Base
+    # Automatically sets Article#comments_count as readonly.
+    belongs_to :article, :counter_cache => :comments_count
+  end
+
+  class Article < ActiveRecord::Base
+    attr_readonly :approved_comments_count
+  end
-
-* Make size for has_many :through use counter cache if it exists.  Closes #9734 [xaviershay]

trunk/activerecord/lib/active_record/associations.rb

@@ -842 +842 @@
-            "before_destroy '#{reflection.name}.class.decrement_counter(\"#{cache_column}\", #{reflection.primary_key_name})" +
-            " unless #{reflection.name}.nil?'"
-
+
+
+
+
+
-        end
-      end

trunk/activerecord/lib/active_record/base.rb

@@ -637 +637 @@
-      end
-
+       # Attributes listed as readonly can be set for a new record, but will be ignored in database updates afterwards.
+       def attr_readonly(*attributes)
+         write_inheritable_array("attr_readonly", attributes - (readonly_attributes || []))
+       end
+
+       # Returns an array of all the attributes that have been specified as readonly.
+       def readonly_attributes
+         read_inheritable_attribute("attr_readonly")
+       end
-
-      # If you have an attribute that needs to be saved to the database as an object, and retrieved as the same object, 
@@ -1954 +1963 @@
-        connection.update(
-          "UPDATE #{self.class.table_name} " +
-
+, false
-          "WHERE #{connection.quote_column_name(self.class.primary_key)} = #{quote_value(id)}",
-          "#{self.class.name} Update"
@@ -2009 +2018 @@
-        end
-      end
+      
+      # Removes attributes which have been marked as readonly.
+      def remove_readonly_attributes(attributes)
+        unless self.class.readonly_attributes.nil?
+          attributes.delete_if { |key, value| self.class.readonly_attributes.include?(key.gsub(/\(.+/,"").intern) }
+        else
+          attributes
+        end
+      end
-
-      # The primary key and inheritance column can never be set by mass-assignment for security reasons.
@@ -2019 +2037 @@
-      # Returns copy of the attributes hash where all the values have been safely quoted for use in
-      # an SQL statement.
-
-
+, include_readonly_attributes = true
+quoted = 
-          if column = column_for_attribute(name)
-            quoted[name] = quote_value(value, column) unless !include_primary_key && column.primary
@@ -2026 +2044 @@
-          quoted
-        end
+        include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)
-      end
-

trunk/activerecord/test/associations_test.rb

@@ -1176 +1176 @@
-    assert_equal 1, Topic.find(topic.id)[:replies_count]
-  end
+  
+  def test_belongs_to_counter_after_save
+    topic = Topic.create("title" => "monday night")
+    topic.replies.create("title" => "re: monday night", "content" => "football")
+    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
+
+    topic.save
+    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
+  end
+
+  def test_belongs_to_counter_after_update_attributes
+    topic = Topic.create("title" => "37s")
+    topic.replies.create("title" => "re: 37s", "content" => "rails")
+    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
+
+    topic.update_attributes("title" => "37signals")
+    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
+  end
-
-  def test_assignment_before_parent_saved

trunk/activerecord/test/base_test.rb

@@ -46 +46 @@
-class TightDescendant < TightPerson
-  attr_accessible :phone_number
+end
+
+class ReadonlyTitlePost < Post
+  attr_readonly :title
-end
-
@@ -841 +845 @@
-    assert_equal [ :name, :address, :phone_number  ], TightDescendant.accessible_attributes
-  end
+  
+  def test_readonly_attributes
+    assert_equal [ :title ], ReadonlyTitlePost.readonly_attributes
+    
+    post = ReadonlyTitlePost.create(:title => "cannot change this", :body => "changeable")
+    post.reload
+    assert_equal "cannot change this", post.title
+    
+    post.update_attributes(:title => "try to change", :body => "changed")
+    post.reload
+    assert_equal "cannot change this", post.title
+    assert_equal "changed", post.body
+  end
-
-  def test_multiparameter_attributes_on_date
@@ -1223 +1240 @@
-
-  def test_increment_attribute
-1, topics(:first).replies_coun
-topics(:first).increment! :replies_coun
-2, topics(:first, :reload).replies_count
-
-topics(:first).increment(:replies_count).increment!(:replies_coun
-4, topics(:first, :reload).replies_coun
+50, accounts(:signals37).credit_limi
+accounts(:signals37).increment! :credit_limi
+51, accounts(:signals37, :reload).credit_limit    
+
+accounts(:signals37).increment(:credit_limit).increment!(:credit_limi
+53, accounts(:signals37, :reload).credit_limi
-  end
-  
@@ -1238 +1255 @@
-  
-  def test_decrement_attribute
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  end
-