acts_as_comparable 1.1 → 1.2

data/ChangeLog

@@ -1,3 +1,13 @@
+2007-06-30  zdennis  <zdennis@elijah.local>
+
+	* Renamed MockModel to DummyModel in test_helper.rb
+
+	* Added/Updated tests for acts_as_comparable with different options
+
+	* Removed tests for the now private method comparables_attributes_for
+
+	* Made comparable_attributes_for a private method
+
 2007-04-20  zdennis  <zdennis@elijah.local>
 
 	* Made script/plugin installation friendly

data/README

@@ -13,6 +13,10 @@ Testing acts_as_comparable relies on:
  * Mocha 0.4.0 or higher (tested with 0.4.0)
  * Ruby 1.8.4, 1.8.5 or 1.8.6
  
+DOCS
+----
+http://www.continuousthining.com/tags/acts_as_comparable 
+ 
 SVN
 ----
 Public anonymous read svn:

data/lib/acts_as_comparable/acts_as_comparable.rb

@@ -53,17 +53,18 @@ module ActiveRecord::Acts::Comparable
     # * :attrs_map - a hash of field to field mappings as symbols which define how fields should be compared  
     def acts_as_comparable( options = {} )
       #pullin in necessary methods
-      cattr_accessor :comparable_attributes, :comparable_options
+      cattr_accessor :comparable_options
       include ActiveRecord::Acts::Comparable::InstanceMethods
       
       #setup options
       self.comparable_options = options
-      self.comparable_attributes = comparable_options_to_attributes_hash options
     end
   
     private
     
-    def comparable_options_to_attributes_hash( options )
+    def comparable_options_to_attributes_hash( options )      
+      options ||= {}
+      
       #setup attributes
       attrs = {}
       
@@ -156,12 +157,14 @@ module ActiveRecord::Acts::Comparable
       diffs.symbolize_keys
     end
     
+  private
+    
     # Returns an hash of comparable attribute mappings given the passed in options.
     #
     # == Arguments
     # * options - a hash of options. All options for ActiveRecord::Acts::Comparable::ClassMethods.acts_as_comparable apply.
     def comparable_attributes_for( options )
-      attrs = options ? self.class.send( :comparable_options_to_attributes_hash, options ) : self.class.comparable_attributes
+      self.class.send( :comparable_options_to_attributes_hash, options || self.comparable_options )
     end
   end
   

data/test/acts_as_comparable_test.rb

@@ -2,29 +2,33 @@ require File.join( File.dirname( __FILE__ ), "test_helper")
 
 class ActsAsComparableTest < Test::Unit::TestCase
   
+  def setup
+    DummyModel.send :acts_as_comparable
+  end
+  
   def test_models_are_different_when_both_records_are_new
-    model1 = MockModel.new :name=>"dog"
-    model2 = MockModel.new :name=>"cat"
+    model1 = DummyModel.new :name=>"dog"
+    model2 = DummyModel.new :name=>"cat"
     
     assert model1.different?(model2), "models should have been different!"
     assert !model1.same?(model2), "models shouldn't have been the same!"
   end
   
   def test_models_are_different_when_one_records_is_new
-    model1 = MockModel.new :name=>"dog"
+    model1 = DummyModel.new :name=>"dog"
     model1.instance_variable_set "@new_record", false
     
-    model2 = MockModel.new :name=>"cat"
+    model2 = DummyModel.new :name=>"cat"
     
     assert model1.different?(model2), "models should have been different!"
     assert !model1.same?(model2), "models shouldn't have been the same!"
   end
   
   def test_models_are_different_when_neither_record_is_new
-    model1 = MockModel.new :name=>"dog"
+    model1 = DummyModel.new :name=>"dog"
     model1.instance_variable_set "@new_record", false
     
-    model2 = MockModel.new :name=>"cat"
+    model2 = DummyModel.new :name=>"cat"
     model2.instance_variable_set "@new_record", false
 
     assert model1.different?(model2), "models should have been different!"
@@ -32,28 +36,28 @@ class ActsAsComparableTest < Test::Unit::TestCase
   end
   
   def test_models_are_not_different_when_both_records_are_new 
-    model1 = MockModel.new :name=>"cat"
-    model2 = MockModel.new :name=>"cat"
+    model1 = DummyModel.new :name=>"cat"
+    model2 = DummyModel.new :name=>"cat"
     
     assert model1.same?(model2), "models should have been the same!"
     assert !model1.different?(model2), "models shouldn't have been different!"
   end
   
   def test_models_are_not_different_when_one_record_is_new 
-    model1 = MockModel.new :name=>"cat"
+    model1 = DummyModel.new :name=>"cat"
     model1.instance_variable_set "@new_record", false    
     
-    model2 = MockModel.new :name=>"cat"
+    model2 = DummyModel.new :name=>"cat"
     
     assert model1.same?(model2), "models should have been the same!"
     assert !model1.different?(model2), "models shouldn't have been different!"
   end
   
   def test_models_are_not_different_when_neither_record_is_new 
-    model1 = MockModel.new :name=>"cat"
+    model1 = DummyModel.new :name=>"cat"
     model1.instance_variable_set "@new_record", false
     
-    model2 = MockModel.new :name=>"cat"
+    model2 = DummyModel.new :name=>"cat"
     model2.instance_variable_set "@new_record", false
 
     assert model1.same?(model2), "models should have been the same!"
@@ -61,20 +65,20 @@ class ActsAsComparableTest < Test::Unit::TestCase
   end
     
   def test_differences_with_new_records
-    model1 = MockModel.new :id=>nil, :name=>"dog", :value=>"Tiny"
-    model2 = MockModel.new :id=>nil, :name=>"cat", :value=>"Norm"
+    model1 = DummyModel.new :id=>nil, :name=>"dog", :value=>"Tiny"
+    model2 = DummyModel.new :id=>nil, :name=>"cat", :value=>"Norm"
     model1.instance_variable_set "@new_record", false
     
     differences = model1.differences(model2)
 
     assert differences[:name] == [ "dog", "cat" ], "Name was expected to be different!"
     assert differences[:value] == [ "Tiny", "Norm" ], "Value was expected to be different!"
-    assert 2 == differences.size, "Wrong number of differences!"
+    assert_equal 2, differences.size, "Wrong number of differences!"
   end
   
   def test_differences_with_one_new_record
-    model1 = MockModel.new :id=>nil, :name=>"dog", :value=>"Tiny"
-    model2 = MockModel.new :id=>5, :name=>"cat", :value=>"Norm"
+    model1 = DummyModel.new :id=>nil, :name=>"dog", :value=>"Tiny"
+    model2 = DummyModel.new :id=>5, :name=>"cat", :value=>"Norm"
     model2.instance_variable_set "@new_record", false
     
     differences = model1.differences(model2)
@@ -82,14 +86,14 @@ class ActsAsComparableTest < Test::Unit::TestCase
     assert differences[:id] == [ nil, 5 ], "ID was expected to be different!"
     assert differences[:name] == [ "dog", "cat" ], "Name was expected to be different!"
     assert differences[:value] == [ "Tiny", "Norm" ], "Value was expected to be different!"
-    assert 3 == differences.size, "Wrong number of differences!"
+    assert_equal 3, differences.size, "Wrong number of differences!"
   end
   
   def test_differences_with_existing_records
-    model1 = MockModel.new :id=>1, :name=>"dog", :value=>"Tiny"
+    model1 = DummyModel.new :id=>1, :name=>"dog", :value=>"Tiny"
     model1.instance_variable_set "@new_record", false
 
-    model2 = MockModel.new :id=>5, :name=>"cat", :value=>"Norm"
+    model2 = DummyModel.new :id=>5, :name=>"cat", :value=>"Norm"
     model1.instance_variable_set "@new_record", false
 
     differences = model1.differences(model2)
@@ -97,40 +101,37 @@ class ActsAsComparableTest < Test::Unit::TestCase
     assert differences[:id] == [ 1, 5 ], "ID was expected to be different!"
     assert differences[:name] == [ "dog", "cat" ], "Name was expected to be different!"
     assert differences[:value] == [ "Tiny", "Norm" ], "Value was expected to be different!"
-    assert 3 == differences.size, "Wrong number of differences!"
+    assert_equal 3, differences.size, "Wrong number of differences!"
   end
   
-  def test_comparable_attributes_for_without_options
-    comparable_attributes = MockModel.new.comparable_attributes_for( {} )
-    expected_comparable_attributes = { :id=>:id, :name=>:name, :value=>:value }
+  def test_differences_when_using_only_option
+    DummyModel.send :acts_as_comparable, :only=>[:name]
+    
+    model1 = DummyModel.new :id=>1, :name=>"dog", :value=>"Tiny"
+    model1.instance_variable_set "@new_record", false
 
-    assert expected_comparable_attributes == comparable_attributes, "Expected attributes were not comparable!"
-  end
-  
-  def test_comparable_attributes_for_with_only_option
-    comparable_attributes = MockModel.new.comparable_attributes_for( 
-      :only=>[:value] 
-    )
-    expected_comparable_attributes = { :value=>:value }
+    model2 = DummyModel.new :id=>5, :name=>"cat", :value=>"Norm"
+    model1.instance_variable_set "@new_record", false
 
-    assert expected_comparable_attributes == comparable_attributes, "Expected attributes were not comparable!"
-  end
-  
-  def test_comparable_attributes_for_with_except_option
-    comparable_attributes = MockModel.new.comparable_attributes_for( 
-      :except=>[:value] 
-    )
-    expected_comparable_attributes = { :id=>:id, :name=>:name }
+    differences = model1.differences(model2)
 
-    assert expected_comparable_attributes == comparable_attributes, "Expected attributes were not comparable!"
+    assert differences[:name] == [ "dog", "cat" ], "Name was expected to be different!"
+    assert_equal 1, differences.size, "Wrong number of differences!"
   end
   
-  def test_comparable_attributes_for_with_attrs_map_option
-    comparable_attributes = MockModel.new.comparable_attributes_for( 
-      :attrs_map=> {:name=>:value, :value=>:id} 
-    )
-    expected_comparable_attributes = { :id=>:id, :name=>:value, :value=>:id }
-    assert expected_comparable_attributes == comparable_attributes, "Expected attributes were not comparable!"
-  end
+  def test_differences_when_using_except_option
+    DummyModel.send :acts_as_comparable, :except=>[:id, :value]
+    
+    model1 = DummyModel.new :id=>1, :name=>"dog", :value=>"Tiny"
+    model1.instance_variable_set "@new_record", false
+
+    model2 = DummyModel.new :id=>5, :name=>"cat", :value=>"Norm"
+    model1.instance_variable_set "@new_record", false
+
+    differences = model1.differences(model2)
+
+    assert differences[:name] == [ "dog", "cat" ], "Name was expected to be different!"
+    assert_equal 1, differences.size, "Wrong number of differences!"
+  end 
   
 end

data/test/test_helper.rb

@@ -13,7 +13,7 @@ require 'mocha'
 
 ###### SETUP a partially mocked out Model for testing #######
 
-class MockModel < ActiveRecord::Base
+class DummyModel < ActiveRecord::Base
   class << self 
     def column_names
       %w[ id name value ]

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: acts_as_comparable
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 date: 2007-04-20 00:00:00 -04:00
 summary: Adds ActiveRecord model comparison functionality.
 require_paths: