Changeset 8319

Timestamp:

12/06/07 00:01:11 (9 months ago)

Author:

david

Message:

Fixed that the truncation of strings longer than 50 chars should use inspect so newlines etc are escaped (closes #10385) [norbert]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/test/base_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that the truncation of strings longer than 50 chars should use inspect so newlines etc are escaped #10385 [norbert]
-
-* Fixed that habtm associations should be able to set :select as part of their definition and have that honored [DHH]

trunk/activerecord/lib/active_record/base.rb

@@ -2080 +2080 @@
-
-        if value.is_a?(String) && value.length > 50
-%("#{value[0..50]}...")
+"#{value[0..50]}...".inspect
-        elsif value.is_a?(Date) || value.is_a?(Time)
-          %("#{value.to_s(:db)}")

trunk/activerecord/test/base_test.rb

@@ -1733 +1733 @@
-  def test_attribute_for_inspect
-    t = topics(:first)
-content = %(This is some really long content, longer than 50 characters, so I can test that text is truncated correctly by the new ActiveRecord::Base#inspect method! Yay! BOOM!)
+title = "The First Topic Now Has A Title With\nNewlines And More Than 50 Characters"
-
-    assert_equal %("#{t.written_on.to_s(:db)}"), t.attribute_for_inspect(:written_on)
-is is some really long content, longer than 50 ch..."', t.attribute_for_inspect(:content
+e First Topic Now Has A Title With\nNewlines And M..."', t.attribute_for_inspect(:title
-  end
-