Ticket #6896: attr_readonly.diff

test/associations_test.rb

@@ -1126 +1126 @@
-    assert_equal 0, Topic.find(t1.id).replies.size
-    assert_equal 0, Topic.find(t2.id).replies.size
-  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
-    client = Client.find(:first)
-    apple = Firm.new("name" => "Apple")

test/base_test.rb

@@ -47 +47 @@
-  attr_accessible :phone_number
-end
-
+class ReadonlyTitlePost < Post
+  attr_readonly :title
+end
+
-class Booleantest < ActiveRecord::Base; end
-
-class Task < ActiveRecord::Base
@@ -767 +771 @@
-    assert_nil TightDescendant.protected_attributes
-    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
-    attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "6", "last_read(3i)" => "24" }
@@ -1136 +1153 @@
-  end
-
-  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
-  
-  def test_increment_nil_attribute
@@ -1151 +1168 @@
-  end
-  
-  def test_decrement_attribute
-
-
-
-
-
+
-
-
-
+
+
+
+
+
-  end
-  
-  def test_toggle_attribute

lib/active_record/associations.rb

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

lib/active_record/base.rb

@@ -569 +569 @@
-        read_inheritable_attribute("attr_accessible")
-      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
+
-      # Specifies that the attribute by the name of +attr_name+ should be serialized before saving to the database and unserialized
-      # after loading from the database. The serialization is done through YAML. If +class_name+ is specified, the serialized
-      # object must be of that class on retrieval or +SerializationTypeMismatch+ will be raised.
@@ -1783 +1792 @@
-      def update
-        connection.update(
-          "UPDATE #{self.class.table_name} " +
-
+, false
-          "WHERE #{self.class.primary_key} = #{quote_value(id)}",
-          "#{self.class.name} Update"
-        )
@@ -1995 +2004 @@
-          attributes.reject { |key, value| self.class.protected_attributes.include?(key.gsub(/\(.+/,"").intern) || attributes_protected_by_default.include?(key.gsub(/\(.+/, "")) }
-        end
-      end
+      
+      # Removes attributes which have been marked as readonly.
+      def remove_readonly_attributes(attributes)
+        unless self.class.readonly_attributes.nil?
+          attributes.reject { |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.
-      def attributes_protected_by_default
@@ -2005 +2023 @@
-
-      # 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
-          end
-          quoted
-        end
+        include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)
-      end
-
-      # Quote strings appropriately for SQL statements.