attribute-driven 1.0.1 → 1.0.2

data/lib/attribute-driven.rb

@@ -1 +1 @@
-require 'attribute_driven'
+require File.join(File.dirname(__FILE__), 'attribute_driven')

data/lib/attribute_driven.rb

@@ -15,13 +15,21 @@
 =end
 
 module AttributeDriven
+  def self.attributes_from(args)
+    (args.last.kind_of? Hash) ? args[0..-2] : args
+  end
+  
+  def self.options_from(args)
+    (args.last.kind_of? Hash) ? args.last : {}
+  end
+  
   def self.included(klass)
     klass.extend(ClassMethods)
   end
   
   module ClassMethods
     def initializes_with(*attributes)
-      class_eval(<<-EOS, __FILE__, __LINE__)
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def initialize(params = {})
           #{attributes.inspect}.each do |attribute|
             instance_variable_set("@\#{attribute}", params[attribute])
@@ -30,10 +38,14 @@ module AttributeDriven
       EOS
     end
     
-    def equality_based_on(*attributes)
-      class_eval(<<-EOS, __FILE__, __LINE__)
+    def equality_based_on(*args)
+      attributes = AttributeDriven.attributes_from(args)
+      options = AttributeDriven.options_from(args)
+      raise "unknown option value of :class_check => #{options[:class_check].inspect}" unless [nil, :equal?, :kind_of?].include?(options[:class_check])
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def eql?(other)
           return true if equal?(other)
+          #{options[:class_check] ? "return false unless #{options[:class_check] == :equal? ? 'other.class.equal?(self.class)' : 'other.kind_of?(self.class)'}" : ""}
           #{attributes.inspect}.inject(true) do |result, attribute|
             result &&= (self.send(attribute) == other.send(attribute))
           end
@@ -48,14 +60,17 @@ module AttributeDriven
         end
         
         protected
-        attr_reader *attributes        
+        #{attributes.inspect}.each do |attribute|
+          attr_reader attribute unless instance_methods.include?(attribute)
+        end
       EOS
     end
     
-    def attributes(*attributes)
-      initializes_with *attributes
-      equality_based_on *attributes
+    def attributes(*args)
+      attributes = AttributeDriven.attributes_from(args)
       attr_reader *attributes
+      initializes_with *attributes
+      equality_based_on *args
     end
   end
 end

data/lib/attributedriven.rb

@@ -1 +1 @@
-require 'attribute_driven'
+require File.join(File.dirname(__FILE__), 'attribute_driven')

data/test/attribute_driven_test.rb

@@ -20,8 +20,8 @@ require File.join(File.dirname(__FILE__), '../lib/attribute_driven')
 class AttributeDrivenTest < Test::Unit::TestCase
   def setup
     @klass = Class.new do
-    	include AttributeDriven
-    	attributes :foo, :bar
+      include AttributeDriven
+      attributes :foo, :bar
     end
   end
 
@@ -53,6 +53,47 @@ class AttributeDrivenTest < Test::Unit::TestCase
     assert_not_equal(@klass.new(:foo => "foo1"), @klass.new(:foo => "foo2"))
   end
 
+  def test_should_allow_two_instances_to_be_equated_if_same
+    instance = @klass.new(:foo => "foo")
+    assert_equal(instance, instance)
+  end
+
+  def test_should_allow_equality_check_including_classes_based_on_equal
+    sub_klass = Class.new(@klass) do
+      include AttributeDriven
+      attributes :foo, :bar, :class_check => :equal?
+    end
+
+    another_sub_klass = Class.new(sub_klass)
+
+    assert_equal(true, sub_klass.new(:foo => "foo") == sub_klass.new(:foo => "foo"))
+    assert_equal(false, sub_klass.new(:foo => "foo") == @klass.new(:foo => "foo"))
+    assert_equal(false, sub_klass.new(:foo => "foo") == another_sub_klass.new(:foo => "foo"))
+  end
+
+  def test_should_allow_equality_check_including_classes_based_on_kind_of
+    sub_klass = Class.new(@klass) do
+      include AttributeDriven
+      attributes :foo, :bar, :class_check => :kind_of?
+    end
+
+    another_sub_klass = Class.new(sub_klass)
+
+    assert_equal(true, sub_klass.new(:foo => "foo") == sub_klass.new(:foo => "foo"))
+    assert_equal(false, sub_klass.new(:foo => "foo") == @klass.new(:foo => "foo"))
+    assert_equal(true, sub_klass.new(:foo => "foo") == another_sub_klass.new(:foo => "foo"))
+  end
+
+  def test_should_allow_equality_check_without_including_classes
+    other_klass = Class.new do
+      include AttributeDriven
+      attributes :foo, :bar
+    end
+
+    assert_equal(true, other_klass.new(:foo => "foo") == other_klass.new(:foo => "foo"))
+    assert_equal(true, other_klass.new(:foo => "foo") == @klass.new(:foo => "foo"))
+  end
+
   def test_should_return_same_hash_for_two_equal_objects
     assert_equal(@klass.new.hash, @klass.new.hash)
     assert_equal(@klass.new(:foo => "hi", :bar => "bye").hash, @klass.new(:foo => "hi", :bar => "bye").hash)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Aman King
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-12 00:00:00 +05:30
+date: 2011-02-12 00:00:00 +05:30
 default_executable: 
 dependencies: []
 
-description: AttributeDriven provides a class method to generate attribute-based equality-methods, initializer, and reader methods.
+description: AttributeDriven provides class methods to generate attribute-based equality-methods, initializer, and reader methods.
 email: amanking@gmail.com
 executables: []
 
@@ -42,6 +42,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -49,6 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -58,9 +60,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: AttributeDriven provides a class method to generate attribute-based equality-methods, initializer, and reader methods.
+summary: AttributeDriven provides class methods to generate attribute-based equality-methods, initializer, and reader methods.
 test_files: 
 - test/attribute_driven_test.rb