identifies_as 1.0.5 → 1.0.6

data/CHANGELOG.rdoc

@@ -8,3 +8,4 @@ Initial release.
 Renamed :no_longer_identifying_as! and :instances_no_longer_identify_as! to :stop_identifying_as! and :stop_instances_identifying_as!
 Added support for subclassing and module inclusion.
 Added Module-level support for :<, :>, :<=, :>=, :<==>.
+Updates for support to stop identification when an ancestor identifies (either actually or by way of IdentifiesAs).

data/lib/identifies_as/IdentifiesAs/ClassInstance.rb

@@ -49,7 +49,7 @@ module ::IdentifiesAs::ClassInstance
   # @return [Object] Self.
   def stop_instances_identifying_as!( *objects )
     
-    return ::IdentifiesAs.object_stop_instances_identifying_as!( self, *objects )    
+    return ::IdentifiesAs.stop_object_instances_identifying_as!( self, *objects )    
     
   end
   

data/lib/identifies_as/IdentifiesAs/ObjectInstance.rb

@@ -50,7 +50,7 @@ module ::IdentifiesAs::ObjectInstance
   # @return [Object] Self.
   def stop_identifying_as!( *objects )
     
-    return ::IdentifiesAs.object_stop_identifying_as!( self, *objects )    
+    return ::IdentifiesAs.stop_object_identifying_as!( self, *objects )    
     
   end
 

data/lib/identifies_as/IdentifiesAs.rb

@@ -9,6 +9,9 @@ module ::IdentifiesAs
   @identities = { }
   @instance_identities = { }
   
+  @do_not_identify_as = { }
+  @instances_do_not_identify_as = { }
+  
   ################################
   #  self.object_identifies_as!  #
   ################################
@@ -26,6 +29,12 @@ module ::IdentifiesAs
       identifies_as_hash[ this_object ] = true
     end
     
+    if do_not_identify_as_hash = @do_not_identify_as[ object_id ]
+      objects.each do |this_object|
+        do_not_identify_as_hash.delete( this_object )
+      end
+    end
+    
     return identifies_as_hash
     
   end
@@ -45,6 +54,12 @@ module ::IdentifiesAs
       identifies_as_hash[ this_object ] = true
     end
     
+    if do_not_identify_as_hash = @instances_do_not_identify_as[ object_class ]
+      objects.each do |this_object|
+        do_not_identify_as_hash.delete( object_class )
+      end
+    end
+    
     return identifies_as_hash
     
   end
@@ -57,10 +72,15 @@ module ::IdentifiesAs
 
     object_identifies = object_instance_identifies_as?( object, other_object_type )
 
-    unless object_identifies
+    # If we got nil that means we were told to stop looking.
+    unless object_identifies or object_identifies.nil?
       object_identifies = object_instances_identify_as?( object.class, other_object_type )
     end
     
+    if object_identifies.nil?
+      object_identifies = false
+    end
+    
     return object_identifies
     
   end
@@ -87,8 +107,14 @@ module ::IdentifiesAs
     end
 
     object_ancestor_chain.each do |this_ancestor|
-  
-      if identifies_as_hash = @identities[ this_ancestor.__id__ ]
+
+      this_ancestor_id = this_ancestor.__id__
+
+      if do_not_identify_as_hash = @do_not_identify_as[ this_ancestor_id ] and
+         do_not_identify_as_hash.has_key?( other_object_type )
+        object_identifies = nil
+        break
+      elsif identifies_as_hash = @identities[ this_ancestor_id ]
         break if object_identifies = identifies_as_hash.has_key?( other_object_type )
       end
   
@@ -105,11 +131,15 @@ module ::IdentifiesAs
   def self.object_instances_identify_as?( object_class, other_object_type )
 
     object_identifies = false
-    
     object_class.ancestors.each do |this_ancestor|
-      if identifies_as_hash = @instance_identities[ this_ancestor ]
+      if do_not_identify_as_hash = @instances_do_not_identify_as[ this_ancestor ] and
+         do_not_identify_as_hash.has_key?( other_object_type )
+          object_identifies = nil
+          break
+      elsif identifies_as_hash = @instance_identities[ this_ancestor ]
         object_identifies = identifies_as_hash.has_key?( other_object_type )
       end
+
     end
     
     return object_identifies
@@ -157,26 +187,37 @@ module ::IdentifiesAs
   end
 
   ######################################
-  #  self.object_stop_identifying_as!  #
+  #  self.stop_object_identifying_as!  #
   ######################################
   
-  def self.object_stop_identifying_as!( object, *objects )
+  def self.stop_object_identifying_as!( object, *objects )
+
+    object_id = object.__id__
 
-    if identifies_as_hash = @identities[ object.__id__ ]
+    if identifies_as_hash = @identities[ object_id ]
       objects.each do |this_object|
         identifies_as_hash.delete( this_object )
       end
     end
+
+    unless do_not_identify_as_hash = @do_not_identify_as[ object_id ]
+      do_not_identify_as_hash = { }
+      @do_not_identify_as[ object_id ] = do_not_identify_as_hash
+    end
+
+    objects.each do |this_object|
+      do_not_identify_as_hash[ this_object ] = true
+    end
     
     return identifies_as_hash
 
   end
 
   ################################################
-  #  self.object_stop_instances_identifying_as!  #
+  #  self.stop_object_instances_identifying_as!  #
   ################################################
   
-  def self.object_stop_instances_identifying_as!( object_class, *objects )
+  def self.stop_object_instances_identifying_as!( object_class, *objects )
 
     if identifies_as_hash = @instance_identities[ object_class ]
       object_identifies = identifies_as_hash.has_key?( object_class )
@@ -184,7 +225,16 @@ module ::IdentifiesAs
         object_identifies.delete( this_object )
       end
     end
-    
+
+    unless do_not_identify_as_hash = @instances_do_not_identify_as[ object_class ]
+      do_not_identify_as_hash = { }
+      @instances_do_not_identify_as[ object_class ] = do_not_identify_as_hash
+    end
+
+    objects.each do |this_object|
+      do_not_identify_as_hash[ this_object ] = true
+    end
+
     return identifies_as_hash
 
   end

data/spec/IdentifiesAs_spec.rb

@@ -87,15 +87,15 @@ describe ::IdentifiesAs do
     ( AlsoNotAnArray <=> AlsoNotAnArray ).should == 0
     ( AlsoNotAnArray <=> Unrelated ).should == nil
     
-    instance = NotAnArray.new
-    instance.identifies_as?( Array ).should == true
-    instance.is_a?( Array ).should == true
-    ( Array === instance ).should == true
+    not_an_array_instance = NotAnArray.new
+    not_an_array_instance.identifies_as?( Array ).should == true
+    not_an_array_instance.is_a?( Array ).should == true
+    ( Array === not_an_array_instance ).should == true
 
-    instance = AlsoNotAnArray.new
-    instance.identifies_as?( Array ).should == true
-    instance.is_a?( Array ).should == true
-    ( Array === instance ).should == true
+    also_not_an_array_instance = AlsoNotAnArray.new
+    also_not_an_array_instance.identifies_as?( Array ).should == true
+    also_not_an_array_instance.is_a?( Array ).should == true
+    ( Array === also_not_an_array_instance ).should == true
 
     module IncludersActLikeArray
       include IdentifiesAs
@@ -106,6 +106,12 @@ describe ::IdentifiesAs do
       include IncludersActLikeArray
     end
 
+    another_non_array_instance = AnotherNonArray.new
+    another_non_array_instance.identifies_as?( Array ).should == true
+    another_non_array_instance.is_a?( Array ).should == true
+    ( Array === another_non_array_instance ).should == true
+    
+
     module IncludersAlsoActLikeArray
       include IncludersActLikeArray
     end
@@ -114,10 +120,20 @@ describe ::IdentifiesAs do
       include IncludersAlsoActLikeArray
     end
     
-    instance = AnotherNonArray.new
-    instance.identifies_as?( Array ).should == true
-    instance.is_a?( Array ).should == true
-    ( Array === instance ).should == true
+    and_another_non_array_instance = AndAnotherNonArray.new
+    and_another_non_array_instance.identifies_as?( Array ).should == true
+    and_another_non_array_instance.is_a?( Array ).should == true
+    ( Array === and_another_non_array_instance ).should == true
+    
+    AndAnotherNonArray.stop_instances_identifying_as!( Array )
+    and_another_non_array_instance.identifies_as?( Array ).should == false
+    and_another_non_array_instance.is_a?( Array ).should == false
+    ( Array === and_another_non_array_instance ).should == false
+
+    AnotherNonArray.stop_instances_identifying_as!( Array )
+    another_non_array_instance.identifies_as?( Array ).should == false
+    another_non_array_instance.is_a?( Array ).should == false
+    ( Array === another_non_array_instance ).should == false
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identifies_as
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors: