activerecord 1.2.0 → 1.3.0

data/test/mixin_test.rb

@@ -3,72 +3,136 @@ require 'active_record/acts/tree'
 require 'active_record/acts/list'
 require 'fixtures/mixin'
 
-
 class ListTest < Test::Unit::TestCase
   fixtures :mixins
   
-  def test_injection
-    l = ListMixin.new("parent_id"=>1)
-    assert_equal "parent_id = 1", l.scope_condition
-    assert_equal "pos", l.position_column
-
-  end
-  
   def test_reordering
     
-    assert_equal [ListMixin.find(2), ListMixin.find(3)], ListMixin.find_all("parent_id=1", "pos")
-    
-    ListMixin.find(2).move_lower
-    
-    assert_equal [ListMixin.find(3), ListMixin.find(2)], ListMixin.find_all("parent_id=1", "pos")
-    
-    ListMixin.find(2).move_higher
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_2'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")
+                  
+    @mixins['list_2'].find.move_lower
+                  
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_2'].find, 
+                  @mixins['list_4'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")                      
+                  
+    @mixins['list_2'].find.move_higher
 
-    assert_equal [ListMixin.find(2), ListMixin.find(3)], ListMixin.find_all("parent_id=1", "pos")
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_2'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")
     
-  end
+    @mixins['list_1'].find.move_to_bottom
+
+    assert_equal [@mixins['list_2'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find, 
+                  @mixins['list_1'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")
+
+    @mixins['list_1'].find.move_to_top
 
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_2'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find],
+                  ListMixin.find_all("parent_id=5", "pos")
+                  
+                  
+    @mixins['list_2'].find.move_to_bottom
+  
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find, 
+                  @mixins['list_2'].find],
+                  ListMixin.find_all("parent_id=5", "pos")                  
+
+    @mixins['list_4'].find.move_to_top
+
+    assert_equal [@mixins['list_4'].find, 
+                  @mixins['list_1'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_2'].find],
+                  ListMixin.find_all("parent_id=5", "pos")                  
+        
+  end
+  
+  def test_next_prev
+    assert_equal @list_2, @list_1.lower_item
+    assert_nil @list_1.higher_item
+    assert_equal @list_3, @list_4.higher_item
+    assert_nil @list_4.lower_item
+  end
+  
+  
+  def test_injection
+    item = ListMixin.new("parent_id"=>1)
+    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal "pos", item.position_column
+  end  
+  
   def test_insert
-    new = ListMixin.create("parent_id"=>5)
+    new = ListMixin.create("parent_id"=>20)
     assert_equal 1, new.pos
     assert new.first?
     assert new.last?
 
-    new = ListMixin.create("parent_id"=>5)
+    new = ListMixin.create("parent_id"=>20)
     assert_equal 2, new.pos
     assert !new.first?
     assert new.last?
     
-    new = ListMixin.create("parent_id"=>5)
+    new = ListMixin.create("parent_id"=>20)
     assert_equal 3, new.pos    
     assert !new.first?
     assert new.last?
     
-    new = ListMixin.create("parent_id"=>10)
+    new = ListMixin.create("parent_id"=>0)
     assert_equal 1, new.pos
     assert new.first?
     assert new.last?
   end    
   
   def test_delete_middle
-    first = ListMixin.create("parent_id"=>5)
-    assert_equal 1, first.pos
-
-    second = ListMixin.create("parent_id"=>5)
-    assert_equal 2, second.pos
-    
-    third = ListMixin.create("parent_id"=>5)
-    assert_equal 3, third.pos    
     
-    second.destroy
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_2'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")
+              
+    @mixins['list_2'].find.destroy
     
-    assert_equal 1, @mixins["first"].find.pos
-    assert_equal 2, @mixins["third"].find.pos
+    assert_equal [@mixins['list_1'].find, 
+                  @mixins['list_3'].find, 
+                  @mixins['list_4'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")
+                  
+    assert_equal 1, @mixins['list_1'].find.pos
+    assert_equal 2, @mixins['list_3'].find.pos
+    assert_equal 3, @mixins['list_4'].find.pos
+
+    @mixins['list_1'].find.destroy
+
+    assert_equal [@mixins['list_3'].find, 
+                  @mixins['list_4'].find], 
+                  ListMixin.find_all("parent_id=5", "pos")
+                  
+    assert_equal 1, @mixins['list_3'].find.pos
+    assert_equal 2, @mixins['list_4'].find.pos
     
   end  
 
   def test_with_string_based_scope
-    new = ListWithStringScopeMixin.create("parent_id"=>5)
+    new = ListWithStringScopeMixin.create("parent_id"=>500)
     assert_equal 1, new.pos
     assert new.first?
     assert new.last?
@@ -79,59 +143,93 @@ class TreeTest < Test::Unit::TestCase
   fixtures :mixins
   
   def test_has_child
-    assert_equal true, @first.has_children?
-    assert_equal false, @second.has_children?
-    assert_equal false, @third.has_children?
+    assert_equal true, @tree_1.has_children?
+    assert_equal true, @tree_2.has_children?
+    assert_equal false, @tree_3.has_children?
+    assert_equal false, @tree_4.has_children?
   end
 
   def test_children
-    assert_equal @first.children, [@second, @third]
-    assert_equal @second.children, []
+    assert_equal @tree_1.children, [@tree_2, @tree_4]
+    assert_equal @tree_2.children, [@tree_3]
+    assert_equal @tree_3.children, []
+    assert_equal @tree_4.children, []
   end
 
   def test_parent
-    assert_equal @second.parent, @first
-    assert_equal @second.parent, @third.parent
-    assert_nil @first.parent
+    assert_equal @tree_2.parent, @tree_1
+    assert_equal @tree_2.parent, @tree_4.parent
+    assert_nil @tree_1.parent
+  end
+  
+  def test_delete
+    assert_equal 4, TreeMixin.count
+    @tree_1.destroy
+    assert_equal 0, TreeMixin.count
   end
   
   def test_insert
-    @extra = @first.children.create
+    @extra = @tree_1.children.create
     
     assert @extra
     
-    assert_equal @extra.parent, @first
-    assert_equal [@second, @third, @extra], @first.children
+    assert_equal @extra.parent, @tree_1
+
+    assert_equal 3, @tree_1.children.size
+    assert @tree_1.children.include?(@extra)
+    assert @tree_1.children.include?(@tree_2)
+    assert @tree_1.children.include?(@tree_4)
   end
   
-  def test_delete
-    assert_equal 3, Mixin.count
-    @first.destroy
-    assert_equal 0, Mixin.count
-  end
+
 end
 
 class TouchTest < Test::Unit::TestCase
   fixtures :mixins
   
   def test_update
-    assert_nil @first.updated_at
-    @first.save
-    assert_not_nil @first.updated_at
+    
+    stamped = Mixin.new 
+      
+    assert_nil stamped.updated_at
+    assert_nil stamped.created_at
+    stamped.save
+    assert_not_nil stamped.updated_at
+    assert_not_nil stamped.created_at
   end  
 
   def test_create
-    @obj = Mixin.create({"parent" => @third})
+    @obj = Mixin.create
     assert_not_nil @obj.updated_at
     assert_not_nil @obj.created_at
   end  
+
+  def test_many_updates
+
+    stamped = Mixin.new 
+
+    assert_nil stamped.updated_at
+    assert_nil stamped.created_at
+    stamped.save
+    assert_not_nil stamped.created_at
+    assert_not_nil stamped.updated_at
+    
+    old_updated_at = stamped.updated_at
+
+    sleep 1
+    stamped.save    
+    assert_not_equal stamped.created_at, stamped.updated_at
+    assert_not_equal old_updated_at, stamped.updated_at
+
+  end
+
   
   def test_create_turned_off
     Mixin.record_timestamps = false
 
-    assert_nil @first.updated_at
-    @first.save
-    assert_nil @first.updated_at
+    assert_nil @tree_1.updated_at
+    @tree_1.save
+    assert_nil @tree_1.updated_at
 
     Mixin.record_timestamps = true
   end

data/test/transactions_test.rb

@@ -84,7 +84,7 @@ class TransactionTest < Test::Unit::TestCase
     end
   end
 
-  def xtest_nested_explicit_transactions
+  def test_nested_explicit_transactions
     Topic.transaction do
       Topic.transaction do
         @first.approved  = 1

data/test/validations_test.rb

@@ -125,20 +125,34 @@ class ValidationsTest < Test::Unit::TestCase
     assert developer.save
   end
 
+  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)
 
-    t = Topic.create("title" => "We should be confirmed")
+    t = Topic.create("title" => "We should be confirmed","title_confirmation" => "")
     assert !t.save
 
     t.title_confirmation = "We should be confirmed"
     assert t.save
   end
 
+  def test_terms_of_service_agreement_no_acceptance
+    Topic.validates_acceptance_of(:terms_of_service, :on => :create)
+
+    t = Topic.create("title" => "We should not be confirmed")
+    assert t.save
+  end
+
   def test_terms_of_service_agreement
     Topic.validates_acceptance_of(:terms_of_service, :on => :create)
 
-    t = Topic.create("title" => "We should be confirmed")
+    t = Topic.create("title" => "We should be confirmed","terms_of_service" => "")
     assert !t.save
     assert_equal "must be accepted", t.errors.on(:terms_of_service)
 
@@ -150,7 +164,7 @@ class ValidationsTest < Test::Unit::TestCase
   def test_eula
     Topic.validates_acceptance_of(:eula, :message => "must be abided", :on => :create)
 
-    t = Topic.create("title" => "We should be confirmed")
+    t = Topic.create("title" => "We should be confirmed","eula" => "")
     assert !t.save
     assert_equal "must be abided", t.errors.on(:eula)
 
@@ -190,6 +204,25 @@ class ValidationsTest < Test::Unit::TestCase
     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"
+    assert r1.valid?, "Saving r1"
+
+    r2 = t.replies.create "title" => "r2", "content" => "hello world"
+    assert !r2.valid?, "Saving r2 first time"
+
+    r2.content = "something else"
+    assert r2.save, "Saving r2 second time"
+
+    t2 = Topic.create("title" => "I'm unique too!")
+    r3 = t2.replies.create "title" => "r3", "content" => "hello world"
+    assert r3.valid?, "Saving r3"
+  end
+
   def test_validate_format
     Topic.validates_format_of(:title, :content, :with => /^Validation macros rule!$/, :message => "is bad data")
 
@@ -230,6 +263,14 @@ class ValidationsTest < Test::Unit::TestCase
     assert_nothing_raised(ArgumentError) { Topic.validates_inclusion_of( :title, :in => [] ) }
   end
 
+  def test_validates_inclusion_of_with_allow_nil
+    Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ), :allow_nil=>true )
+
+    assert !Topic.create("title" => "a!", "content" => "abc").valid?
+    assert !Topic.create("title" => "", "content" => "abc").valid?
+    assert Topic.create("title" => nil, "content" => "abc").valid?
+  end
+
   def test_validates_length_of_using_minimum
     Topic.validates_length_of( :title, :minimum=>5 )
     t = Topic.create("title" => "valid", "content" => "whatever")
@@ -348,4 +389,10 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "hoo 5", t.errors["title"]
   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
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2004-12-16
+  version: 1.3.0
+date: 2004-12-23
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -61,6 +61,8 @@ files:
   - lib/active_record/connection_adapters/postgresql_adapter.rb
   - lib/active_record/connection_adapters/sqlite_adapter.rb
   - lib/active_record/connection_adapters/sqlserver_adapter.rb
+  - lib/active_record/support/binding_of_caller.rb
+  - lib/active_record/support/breakpoint.rb
   - lib/active_record/support/class_attribute_accessors.rb
   - lib/active_record/support/class_inheritable_attributes.rb
   - lib/active_record/support/clean_logger.rb