Changeset 3654

Timestamp:

02/25/06 23:54:57 (3 years ago)

Author:

david

Message:

Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes (closes #3699) [Masao Mutoh]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/validations.rb (modified) (1 diff)
• trunk/activerecord/test/connections/native_mysql/connection.rb (modified) (1 diff)
• trunk/activerecord/test/validations_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 [Masao Mutoh]
-
-* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [lars@pind.com]

trunk/activerecord/lib/active_record/validations.rb

@@ -440 +440 @@
-
-        case option
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            end
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-      end

trunk/activerecord/test/connections/native_mysql/connection.rb

@@ -11 +11 @@
-  :adapter  => "mysql",
-  :username => "rails",
+  :encoding => "utf8",
-  :database => db1
-)

trunk/activerecord/test/validations_test.rb

@@ -615 +615 @@
-  end
-
+  def kcode_scope(kcode)
+    orig_kcode = $KCODE
+    $KCODE = kcode
+    begin
+      yield
+    ensure
+      $KCODE = orig_kcode
+    end
+  end
+
+  def test_validates_length_of_using_minimum_utf8
+    kcode_scope('UTF8') do
+      Topic.validates_length_of :title, :minimum => 5
+
+      t = Topic.create("title" => "䞀二䞉四五", "content" => "whatever")
+      assert t.valid?
+
+      t.title = "䞀二䞉四"
+      assert !t.valid?
+      assert t.errors.on(:title)
+      assert_equal "is too short (min is 5 characters)", t.errors["title"]
+    end
+  end
+
+  def test_validates_length_of_using_maximum_utf8
+    kcode_scope('UTF8') do
+      Topic.validates_length_of :title, :maximum => 5
+
+      t = Topic.create("title" => "䞀二䞉四五", "content" => "whatever")
+      assert t.valid?
+      
+      t.title = "䞀二34五å
+­"
+      assert !t.valid?
+      assert t.errors.on(:title)
+      assert_equal "is too long (max is 5 characters)", t.errors["title"]
+    end
+  end
+
+  def test_validates_length_of_using_within_utf8
+    kcode_scope('UTF8') do
+      Topic.validates_length_of(:title, :content, :within => 3..5)
+
+      t = Topic.new("title" => "䞀二", "content" => "12䞉四五å
+­äžƒ")
+      assert !t.valid?
+      assert_equal "is too short (min is 3 characters)", t.errors.on(:title)
+      assert_equal "is too long (max is 5 characters)", t.errors.on(:content)
+      t.title = "䞀二䞉"
+      t.content  = "12侉"
+      assert t.valid?
+    end
+  end
+
+  def test_optionally_validates_length_of_using_within_utf8
+    kcode_scope('UTF8') do
+      Topic.validates_length_of :title, :content, :within => 3..5, :allow_nil => true
+
+      t = Topic.create('title' => '䞀二䞉', 'content' => '䞀二䞉四五')
+      assert t.valid?
+
+      t.title = nil
+      assert t.valid?
+    end
+  end
+
+  def test_optionally_validates_length_of_using_within_on_create_utf8
+    kcode_scope('UTF8') do
+      Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_long => "長すぎたす: %d"
+
+      t = Topic.create("title" => "䞀二䞉四五å
+­äžƒå
+«ä¹åA", "content" => "whatever")
+      assert !t.save
+      assert t.errors.on(:title)
+      assert_equal "長すぎたす: 10", t.errors[:title]
+      
+      t.title = "䞀二䞉四五å
+­äžƒå
+«ä¹"
+      assert t.save
+      
+      t.title = "䞀二3"
+      assert t.save
+      
+      t.content = "䞀二䞉四五å
+­äžƒå
+«ä¹å"
+      assert t.save
+      
+      t.content = t.title = "䞀二䞉四五å
+­"
+      assert t.save
+    end
+  end
+
+  def test_optionally_validates_length_of_using_within_on_update_utf8
+    kcode_scope('UTF8') do    
+      Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => "短すぎたす: %d"
+
+      t = Topic.create("title" => "䞀二䞉4", "content" => "whatever")
+      assert !t.save
+      assert t.errors.on(:title)
+      
+      t.title = "1二䞉4"
+      assert !t.save
+      assert t.errors.on(:title)
+      assert_equal "短すぎたす: 5", t.errors[:title]
+      
+      t.title = "valid"
+      t.content = "䞀二䞉四五å
+­äžƒå
+«ä¹åA"
+      assert !t.save
+      assert t.errors.on(:content)
+      
+      t.content = "䞀二345"
+      assert t.save
+    end
+  end
+
+  def test_validates_length_of_using_is_utf8
+    kcode_scope('UTF8') do
+      Topic.validates_length_of :title, :is => 5
+
+      t = Topic.create("title" => "䞀二345", "content" => "whatever")
+      assert t.valid?
+
+      t.title = "䞀二345å
+­"
+      assert !t.valid?
+      assert t.errors.on(:title)
+      assert_equal "is the wrong length (should be 5 characters)", t.errors["title"]
+    end
+  end
+
+  def test_validates_size_of_association_utf8
+    kcode_scope('UTF8') do
+      assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
+      t = Topic.new('title' => 'あいうえお', 'content' => 'かきくけこ')
+      assert !t.save
+      assert t.errors.on(:replies)
+      t.replies.create('title' => 'あいうえお', 'content' => 'かきくけこ')
+      assert t.valid?
+    end
+  end
+
-  def test_validates_associated_many
-    Topic.validates_associated( :replies )