activerecord 1.6.0 → 1.7.0

data/test/fixtures/db_definitions/postgresql.sql

@@ -144,4 +144,5 @@ CREATE TABLE binaries (
 CREATE TABLE computers (
   id serial,
   developer integer NOT NULL
-);
+);
+

data/test/fixtures/db_definitions/postgresql2.drop.sql

@@ -0,0 +1,2 @@
+DROP TABLE courses;
+

data/test/fixtures/db_definitions/postgresql2.sql

@@ -1,4 +1,5 @@
 CREATE TABLE courses (
   id serial,
   name text
-);
+);
+

data/test/fixtures/db_definitions/sqlite.drop.sql

@@ -0,0 +1,18 @@
+DROP TABLE accounts;
+DROP TABLE companies;
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE projects;
+DROP TABLE developers_projects;
+DROP TABLE customers;
+DROP TABLE movies;
+DROP TABLE subscribers;
+DROP TABLE booleantests;
+DROP TABLE auto_id_tests;
+DROP TABLE entrants;
+DROP TABLE colnametests;
+DROP TABLE mixins;
+DROP TABLE people;
+DROP TABLE binaries;
+DROP TABLE computers;
+

data/test/fixtures/db_definitions/sqlite.sql

@@ -113,4 +113,5 @@ CREATE TABLE 'binaries' (
 CREATE TABLE 'computers' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'developer' INTEGER NOT NULL
-);
+);
+

data/test/fixtures/db_definitions/sqlite2.drop.sql

@@ -0,0 +1,2 @@
+DROP TABLE courses;
+

data/test/fixtures/db_definitions/sqlite2.sql

@@ -2,3 +2,4 @@ CREATE TABLE 'courses' (
  'id' INTEGER NOT NULL PRIMARY KEY,
  'name' VARCHAR(255) NOT NULL
 );
+

data/test/fixtures/db_definitions/sqlserver.drop.sql

@@ -0,0 +1,18 @@
+DROP TABLE accounts;
+DROP TABLE companies;
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE projects;
+DROP TABLE developers_projects;
+DROP TABLE customers;
+DROP TABLE movies;
+DROP TABLE subscribers;
+DROP TABLE booleantests;
+DROP TABLE auto_id_tests;
+DROP TABLE entrants;
+DROP TABLE colnametests;
+DROP TABLE mixins;
+DROP TABLE people;
+DROP TABLE binaries;
+DROP TABLE computers;
+

data/test/fixtures/db_definitions/sqlserver.sql

@@ -127,3 +127,4 @@ CREATE TABLE computers (
   developer int NOT NULL,
   PRIMARY KEY (id)
 );
+

data/test/fixtures/db_definitions/sqlserver2.drop.sql

@@ -0,0 +1,2 @@
+DROP TABLE courses;
+

data/test/fixtures/db_definitions/sqlserver2.sql

@@ -2,3 +2,4 @@ CREATE TABLE courses (
  id int NOT NULL PRIMARY KEY,
  name varchar(255) NOT NULL
 );
+

data/test/fixtures/topics.yml

@@ -3,9 +3,9 @@ first:
   title: The First Topic
   author_name: David
   author_email_address: david@loudthinking.com
-  written_on: 2003-07-16 15:28:00
-  bonus_time: '12:13:14'
+  written_on: 2003-07-16t15:28:00.00+01:00
   last_read: 2004-04-15
+  bonus_time: 2005-01-30t15:28:00.00+01:00
   content: Have a nice day
   approved: 0
   replies_count: 0
@@ -14,7 +14,7 @@ second:
   id: 2
   title: The Second Topic's of the day
   author_name: Mary
-  written_on: 2003-07-15 15:28:00
+  written_on: 2003-07-15t15:28:00.00+01:00
   content: Have a nice day
   approved: 1
   replies_count: 2

data/test/lifecycle_test.rb

@@ -1,4 +1,3 @@
-# require File.dirname(__FILE__) + '/../dev-utils/eval_debugger'
 require 'abstract_unit'
 require 'fixtures/topic'
 require 'fixtures/developer'

data/test/modules_test.rb

@@ -1,5 +1,4 @@
 require 'abstract_unit'
-# require File.dirname(__FILE__) + '/../dev-utils/eval_debugger'
 require 'fixtures/company_in_module'
 
 class ModulesTest < Test::Unit::TestCase

data/test/reflection_test.rb

@@ -1,4 +1,3 @@
-#require File.dirname(__FILE__) + '/../dev-utils/eval_debugger'
 require 'abstract_unit'
 require 'fixtures/topic'
 require 'fixtures/customer'

data/test/validations_test.rb

@@ -6,9 +6,10 @@ require 'fixtures/developer'
 class ValidationsTest < Test::Unit::TestCase
   fixtures :topics, :developers
 
-  def teardown
-    Topic.write_inheritable_attribute("validate", [])
-    Topic.write_inheritable_attribute("validate_on_create", [])
+  def setup
+    Topic.write_inheritable_attribute(:validate, nil)
+    Topic.write_inheritable_attribute(:validate_on_create, nil)
+    Topic.write_inheritable_attribute(:validate_on_update, nil)
   end
 
   def test_single_field_validation
@@ -19,7 +20,7 @@ class ValidationsTest < Test::Unit::TestCase
     r.content = "Messa content!"
     assert r.save, "A reply with content should be saveable"
   end
-  
+
   def test_single_attr_validation_and_error_msg
     r = Reply.new
     r.title = "There's no content!"
@@ -41,7 +42,7 @@ class ValidationsTest < Test::Unit::TestCase
 
     assert_equal 2, r.errors.count
   end
-  
+
   def test_error_on_create
     r = Reply.new
     r.title = "Wrong Create"
@@ -50,57 +51,55 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "is Wrong Create", r.errors.on("title"), "A reply with a bad content should contain an error"
   end
 
-  
   def test_error_on_update
     r = Reply.new
     r.title = "Bad"
     r.content = "Good"
-
     assert r.save, "First save should be successful"
-    
+
     r.title = "Wrong Update"
     assert !r.save, "Second save should fail"
-    
+
     assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
     assert_equal "is Wrong Update", r.errors.on("title"), "A reply with a bad content should contain an error"
   end
-  
+
   def test_single_error_per_attr_iteration
     r = Reply.new
     r.save
-    
+
     errors = []
     r.errors.each { |attr, msg| errors << [attr, msg] }
-    
+
     assert errors.include?(["title", "Empty"])
     assert errors.include?(["content", "Empty"])
   end
-  
+
   def test_multiple_errors_per_attr_iteration_with_full_error_composition
     r = Reply.new
     r.title   = "Wrong Create"
     r.content = "Mismatch"
     r.save
-    
+
     errors = []
     r.errors.each_full { |error| errors << error }
-    
+
     assert_equal "Title is Wrong Create", errors[0]
     assert_equal "Title is Content Mismatch", errors[1]
     assert_equal 2, r.errors.count
   end
-  
+
   def test_errors_on_base
     r = Reply.new
     r.content = "Mismatch"
     r.save
     r.errors.add_to_base "Reply is not dignifying"
-    
+
     errors = []
     r.errors.each_full { |error| errors << error }
-    
+
     assert_equal "Reply is not dignifying", r.errors.on_base
-    
+
     assert errors.include?("Title Empty")
     assert errors.include?("Reply is not dignifying")
     assert_equal 2, r.errors.count
@@ -111,12 +110,30 @@ class ValidationsTest < Test::Unit::TestCase
     assert !reply.save
     assert reply.save(false)
   end
-  
+
+  def test_validates_each
+    perform = true
+    hits = 0
+    Topic.validates_each(:title, :content, [:title, :content]) do |record, attr|
+      if perform
+        record.errors.add attr, 'gotcha'
+        hits += 1
+      end
+    end
+    t = Topic.new("title" => "valid", "content" => "whatever")
+    assert !t.save
+    assert_equal 4, hits
+    assert_equal %w(gotcha gotcha), t.errors.on(:title)
+    assert_equal %w(gotcha gotcha), t.errors.on(:content)
+  ensure
+    perform = false
+  end
+
   def test_errors_on_boundary_breaking
     developer = Developer.new("name" => "xs")
     assert !developer.save
     assert_equal "is too short (min is 3 characters)", developer.errors.on("name")
-    
+
     developer.name = "All too very long for this boundary, it really is"
     assert !developer.save
     assert_equal "is too long (max is 20 characters)", developer.errors.on("name")
@@ -127,11 +144,11 @@ class ValidationsTest < Test::Unit::TestCase
 
   def test_title_confirmation_no_confirm
     Topic.validates_confirmation_of(:title)
-    
+
     t = Topic.create("title" => "We should not be confirmed")
     assert t.save
   end
-  
+
   def test_title_confirmation
     Topic.validates_confirmation_of(:title)
 
@@ -171,7 +188,7 @@ class ValidationsTest < Test::Unit::TestCase
     t.eula = "1"
     assert t.save
   end
-  
+
   def test_validate_presences
     Topic.validates_presence_of(:title, :content)
 
@@ -179,16 +196,16 @@ class ValidationsTest < Test::Unit::TestCase
     assert !t.save
     assert_equal "can't be empty", t.errors.on(:title)
     assert_equal "can't be empty", t.errors.on(:content)
-    
+
     t.title = "something"
     t.content  = "another"
-    
+
     assert t.save
   end
-  
+
   def test_validate_uniqueness
     Topic.validates_uniqueness_of(:title)
-    
+
     t = Topic.new("title" => "I'm unique!")
     assert t.save, "Should save t as unique"
 
@@ -199,14 +216,14 @@ class ValidationsTest < Test::Unit::TestCase
     assert !t2.valid?, "Shouldn't be valid"
     assert !t2.save, "Shouldn't save t2 as unique"
     assert_equal "has already been taken", t2.errors.on(:title)
-    
+
     t2.title = "Now Im really also unique"
     assert t2.save, "Should now save t2 as unique"
   end
 
   def test_validate_uniqueness_with_scope
     Reply.validates_uniqueness_of(:content, :scope => "parent_id")
-    
+
     t = Topic.create("title" => "I'm unique!")
 
     r1 = t.replies.create "title" => "r1", "content" => "hello world"
@@ -246,8 +263,7 @@ class ValidationsTest < Test::Unit::TestCase
     assert !Topic.create("title" => "a!", "content" => "abc").valid?
     assert !Topic.create("title" => "a b", "content" => "abc").valid?
     assert !Topic.create("title" => nil, "content" => "def").valid?
-    assert !Topic.create("title" => %w(a b c), "content" => "def").valid?
-    
+
     t = Topic.create("title" => "a", "content" => "I know you are but what am I?")
     assert t.valid?
     t.title = "uhoh"
@@ -272,32 +288,61 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_length_of_using_minimum
-    Topic.validates_length_of( :title, :minimum=>5 )
+    Topic.validates_length_of :title, :minimum => 5
+
     t = Topic.create("title" => "valid", "content" => "whatever")
     assert t.valid?
+
     t.title = "not"
     assert !t.valid?
     assert t.errors.on(:title)
     assert_equal "is too short (min is 5 characters)", t.errors["title"]
+
     t.title = ""
     assert !t.valid?
     assert t.errors.on(:title)
+    assert_equal "is too short (min is 5 characters)", t.errors["title"]
+
     t.title = nil
     assert !t.valid?
-    assert_equal "is too short (min is 5 characters)", t.errors["title"]
     assert t.errors.on(:title)
+    assert_equal "is too short (min is 5 characters)", t.errors["title"]
+  end
+
+  def test_optionally_validates_length_of_using_minimum
+    Topic.validates_length_of :title, :minimum => 5, :allow_nil => true
+
+    t = Topic.create("title" => "valid", "content" => "whatever")
+    assert t.valid?
+
+    t.title = nil
+    assert t.valid?
   end
-  
+
   def test_validates_length_of_using_maximum
-    Topic.validates_length_of( :title, :maximum=>5 )
+    Topic.validates_length_of :title, :maximum => 5
+
     t = Topic.create("title" => "valid", "content" => "whatever")
     assert t.valid?
+
     t.title = "notvalid"
     assert !t.valid?
     assert t.errors.on(:title)
     assert_equal "is too long (max is 5 characters)", t.errors["title"]
+
     t.title = ""
     assert t.valid?
+
+    t.title = nil
+    assert !t.valid?
+  end
+
+  def test_optionally_validates_length_of_using_maximum
+    Topic.validates_length_of :title, :maximum => 5, :allow_nil => true
+
+    t = Topic.create("title" => "valid", "content" => "whatever")
+    assert t.valid?
+
     t.title = nil
     assert t.valid?
   end
@@ -307,29 +352,75 @@ class ValidationsTest < Test::Unit::TestCase
 
     t = Topic.create("title" => "a!", "content" => "I'm ooooooooh so very long")
     assert !t.save
+
     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 = "abe"
     t.content  = "mad"
-
     assert t.save
   end
 
+  def test_optionally_validates_length_of_using_within
+    Topic.validates_length_of :title, :content, :within => 3..5, :allow_nil => true
+
+    t = Topic.create('title' => 'abc', 'content' => 'abcd')
+    assert t.valid?
+
+    t.title = nil
+    assert t.valid?
+  end
+
   def test_validates_length_of_using_is
-    Topic.validates_length_of( :title, :is=>5 )
+    Topic.validates_length_of :title, :is => 5
+
     t = Topic.create("title" => "valid", "content" => "whatever")
     assert t.valid?
+
     t.title = "notvalid"
     assert !t.valid?
     assert t.errors.on(:title)
     assert_equal "is the wrong length (should be 5 characters)", t.errors["title"]
+
     t.title = ""
     assert !t.valid?
+
     t.title = nil
     assert !t.valid?
   end
 
+  def test_optionally_validates_length_of_using_is
+    Topic.validates_length_of :title, :is => 5, :allow_nil => true
+
+    t = Topic.create("title" => "valid", "content" => "whatever")
+    assert t.valid?
+
+    t.title = nil
+    assert t.valid?
+  end
+
+  def test_validates_length_of_using_bignum
+    bigmin = 2 ** 30
+    bigmax = 2 ** 32
+    bigrange = bigmin...bigmax
+    assert_nothing_raised do
+      Topic.validates_length_of :title, :is => bigmin + 5
+      Topic.validates_length_of :title, :within => bigrange
+      Topic.validates_length_of :title, :in => bigrange
+      Topic.validates_length_of :title, :minimum => bigmin
+      Topic.validates_length_of :title, :maximum => bigmax
+    end
+  end
+
+  def test_validates_size_of_association
+    assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
+    t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
+    assert !t.save
+    assert t.errors.on(:replies)
+    t.replies.create('title' => 'areply', 'content' => 'whateveragain')
+    assert t.valid?
+  end
+
   def test_validates_length_of_nasty_params
     assert_raise(ArgumentError) { Topic.validates_length_of(:title, :minimum=>6, :maximum=>9) }
     assert_raise(ArgumentError) { Topic.validates_length_of(:title, :within=>6, :maximum=>9) }
@@ -372,7 +463,7 @@ class ValidationsTest < Test::Unit::TestCase
     assert t.errors.on(:title)
     assert_equal "hoo 5", t.errors["title"]
   end
-  
+
   def test_validates_length_of_custom_errors_for_is_with_message
     Topic.validates_length_of( :title, :is=>5, :message=>"boo %d" )
     t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
@@ -392,10 +483,12 @@ class ValidationsTest < Test::Unit::TestCase
   def test_validates_associated_many
     Topic.validates_associated( :replies )
     t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
-    t.replies << [r = Reply.create("title" => "A reply"), Reply.create("title" => "Another reply", "content" => "with content!")]
+    t.replies << [r = Reply.create("title" => "A reply"), r2 = Reply.create("title" => "Another reply")]
     assert !t.valid?
     assert t.errors.on(:replies)
-    r.content = "non-empty"
+    assert_equal 1, r.errors.count  # make sure all associated objects have been validated
+    assert_equal 1, r2.errors.count
+    r.content = r2.content = "non-empty"
     assert t.valid?
   end
 
@@ -410,10 +503,105 @@ class ValidationsTest < Test::Unit::TestCase
     assert r.valid?
   end
 
+  def test_validate_block
+    Topic.validate { |topic| topic.errors.add("title", "will never be valid") }
+    t = Topic.create("title" => "Title", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "will never be valid", t.errors["title"]
+  end
+
+  def test_invalid_validator
+    Topic.validate 3
+    assert_raise(ActiveRecord::ActiveRecordError) { t = Topic.create }
+  end
+
   def test_throw_away_typing
     d = Developer.create "name" => "David", "salary" => "100,000"
     assert !d.valid?
     assert_equal 100, d.salary
     assert_equal "100,000", d.salary_before_type_cast
   end
+
+  def test_validates_acceptance_of_with_custom_error_using_quotes
+    Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.salary = "0"
+    assert !d.valid?
+    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_confirmation_of_with_custom_error_using_quotes
+    Developer.validates_confirmation_of :name, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "John"
+    d.name_confirmation = "Johnny"
+    assert !d.valid?
+    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_format_of_with_custom_error_using_quotes
+    Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "John 32"
+    assert !d.valid?
+    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_inclusion_of_with_custom_error_using_quotes
+    Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.salary = "90,000"
+    assert !d.valid?
+    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_length_of_with_custom_too_long_using_quotes
+    Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Jeffrey"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_length_of_with_custom_too_short_using_quotes
+    Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Joe"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_length_of_with_custom_message_using_quotes
+    Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Joe"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_presence_of_with_custom_message_using_quotes
+    Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Joe"
+    assert !d.valid?
+    assert_equal d.errors.on(:non_existent), "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_uniqueness_of_with_custom_message_using_quotes
+    Developer.validates_uniqueness_of :name, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "David"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_associated_with_custom_message_using_quotes
+    Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
+    Topic.validates_presence_of :content
+    r = Reply.create("title" => "A reply", "content" => "with content!")
+    r.topic = Topic.create("title" => "uhohuhoh")
+    assert !r.valid?
+    assert_equal r.errors.on(:topic).first, "This string contains 'single' and \"double\" quotes"
+  end
 end