identifies_as 1.0.7 → 1.0.8

data/CHANGELOG.rdoc

@@ -10,3 +10,7 @@ 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).
 Fix for Module (now Module includes IdentifiesAs::ClassInstance).
+
+== 6/13/2012
+
+Fix for ClassInstance - now defined directly in Module since it seems Module methods are defined in the class not in a module interface, which means we can't insert methods before and call super.

data/lib/identifies_as.rb

@@ -1,30 +1,247 @@
 
-require 'module-cluster'
-
 module ::IdentifiesAs
 end
 
-basepath = 'identifies_as/IdentifiesAs'
+# source file requires
+require_relative './requires.rb'
+
+module ::IdentifiesAs
 
-files = [
+  @identities = { }
+  @instance_identities = { }
   
-  'ActuallyIsA',
+  @do_not_identify_as = { }
+  @instances_do_not_identify_as = { }
   
-  'ClassInstance',
-  'ObjectInstance'
+  ################################
+  #  self.object_identifies_as!  #
+  ################################
   
-]
+  def self.object_identifies_as!( object, *objects )
 
-files.each do |this_file|
-  require_relative( File.join( basepath, this_file ) + '.rb' )
-end
+    object_id = object.__id__
+          
+    unless identifies_as_hash = @identities[ object_id ]
+      identifies_as_hash = { }
+      @identities[ object_id ] = identifies_as_hash
+    end
+    
+    objects.each do |this_object|
+      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
 
-require_relative( basepath + '.rb' )
+  ########################################
+  #  self.object_instances_identify_as!  #
+  ########################################
+  
+  def self.object_instances_identify_as!( object_class, *objects )
 
-class ::Object
-  include ::IdentifiesAs
+    unless identifies_as_hash = @instance_identities[ object_class ]
+      identifies_as_hash = { }
+      @instance_identities[ object_class ] = identifies_as_hash
+    end
+    
+    objects.each do |this_object|
+      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
+
+  ################################
+  #  self.object_identifies_as?  #
+  ################################
+
+  def self.object_identifies_as?( object, other_object_type )
+
+    object_identifies = object_instance_identifies_as?( object, other_object_type )
+
+    # 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
+
+  #########################################
+  #  self.object_instance_identifies_as?  #
+  #########################################
+
+  def self.object_instance_identifies_as?( object, other_object_type )
+    
+    object_identifies = false
+    
+    object_ancestor_chain = nil
+  
+    if object.actually_is_a?( ::Module )
+      object_ancestor_chain = object.ancestors.dup
+    else
+      object_ancestor_chain = [ object ]
+      if object.actually_is_a?( ::Symbol ) or object.actually_is_a?( ::Fixnum )
+        object_ancestor_chain.concat( object.class.ancestors )
+      else
+        object_ancestor_chain.concat( class << object ; ancestors ; end )
+      end
+    end
+
+    object_ancestor_chain.each do |this_ancestor|
+
+      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
+  
+    end
+    
+    return object_identifies
+    
+  end
+
+  ########################################
+  #  self.object_instances_identify_as?  #
+  ########################################
+
+  def self.object_instances_identify_as?( object_class, other_object_type )
+
+    object_identifies = false
+    object_class.ancestors.each do |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
+    
+  end
+
+  ############################
+  #  self.object_identities  #
+  ############################
+  
+  def self.object_identities( object )
+    
+    return object_identities_hash( object ).keys
+    
+  end
+
+  #####################################
+  #  self.object_instance_identities  #
+  #####################################
+  
+  def self.object_instance_identities( object_class )
+    
+    return object_instance_identities_hash( object_class ).keys
+    
+  end
+
+  #################################
+  #  self.object_identities_hash  #
+  #################################
+  
+  def self.object_identities_hash( object )
+    
+    return @identities[ object.__id__ ]
+    
+  end
+
+  ##########################################
+  #  self.object_instance_identities_hash  #
+  ##########################################
+  
+  def self.object_instance_identities_hash( object_class )
+    
+    return @instance_identities[ object_class ]
+    
+  end
+
+  ######################################
+  #  self.stop_object_identifying_as!  #
+  ######################################
+  
+  def self.stop_object_identifying_as!( object, *objects )
+
+    object_id = 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.stop_object_instances_identifying_as!  #
+  ################################################
+  
+  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 )
+      objects.each do |this_object|
+        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
+      
 end
 
-class ::Module
-  include ::IdentifiesAs::ClassInstance
+class ::Object
+  include ::IdentifiesAs
 end

data/lib/identifies_as/{IdentifiesAs/ObjectInstance.rb → object_instance.rb}

@@ -61,7 +61,7 @@ module ::IdentifiesAs::ObjectInstance
   def is_a?( object )
     
     is_type = false
-    
+
     if identifies_as?( object )    
       is_type = true
     else

data/lib/{identifies_as/IdentifiesAs/ClassInstance.rb → module.rb}

@@ -1,5 +1,5 @@
 
-module ::IdentifiesAs::ClassInstance
+class ::Module
 
   ############################
   #  instances_identify_as!  #
@@ -57,14 +57,16 @@ module ::IdentifiesAs::ClassInstance
   #  ===  #
   #########
   
+  alias_method :case_compare, :===
+  
   def ===( object )
     
     is_equal = false
     
-    if ::IdentifiesAs.object_identifies_as?( object, self )
+    if ::IdentifiesAs.respond_to?( :object_identifies_as? ) and ::IdentifiesAs.object_identifies_as?( object, self )
       is_equal = true
     else
-      is_equal = super
+      is_equal = case_compare( object )
     end
 
     return is_equal
@@ -75,9 +77,11 @@ module ::IdentifiesAs::ClassInstance
   #  <  #
   #######
 
+  alias_method :less_than, :<
+
   def <( object )
     
-    is_less_than = super
+    is_less_than = less_than( object )
     
     if is_less_than.nil?
       # a class is < another class if it has the other class as one of its ancestors
@@ -94,9 +98,11 @@ module ::IdentifiesAs::ClassInstance
   #  >  #
   #######
 
+  alias_method :greater_than, :>
+
   def >( object )
 
-    is_greater_than = super
+    is_greater_than = greater_than( object )
     
     if is_greater_than.nil?
       # a class is > another class if the other class has it as one of its ancestors
@@ -118,9 +124,11 @@ module ::IdentifiesAs::ClassInstance
   #  <=  #
   ########
 
+  alias_method :less_than_or_equal_to, :<=
+
   def <=( object )
     
-    is_less_than_or_equal_to = super
+    is_less_than_or_equal_to = less_than_or_equal_to( object )
     
     if is_less_than_or_equal_to.nil?
       # a class is < another class if it has the other class as one of its ancestors
@@ -137,9 +145,11 @@ module ::IdentifiesAs::ClassInstance
   #  >=  #
   ########
 
+  alias_method :greater_than_or_equal_to, :>=
+
   def >=( object )
 
-    is_greater_than_or_equal_to = super
+    is_greater_than_or_equal_to = greater_than_or_equal_to( object )
     
     if is_greater_than_or_equal_to.nil?
       # a class is < another class if it has the other class as one of its ancestors
@@ -161,6 +171,8 @@ module ::IdentifiesAs::ClassInstance
   #  <=>  #
   #########
 
+  alias_method :compare, :<=>
+
   def <=>( object )
     
     less_than_equal_to_greater_than = nil

data/lib/requires.rb

@@ -0,0 +1,25 @@
+
+require 'module-cluster'
+
+module ::IdentifiesAs
+end
+
+basepath = ''
+
+files = [
+  
+  'module',
+  
+  'identifies_as/actually_is_a',
+  
+  'identifies_as/object_instance'
+  
+]
+
+files.each do |this_file|
+  require_relative( File.join( this_file ) + '.rb' )
+end
+
+class ::Object
+  include ::IdentifiesAs::ObjectInstance
+end

data/spec/{IdentifiesAs_spec.rb → identifies_as_spec.rb}

@@ -18,7 +18,6 @@ describe ::IdentifiesAs do
   it 'lets an object pretend it is another object' do
     
     instance = Object.new
-    instance.extend( IdentifiesAs )
     
     instance.identifies_as!( Array )
     instance.identifies_as?( Array ).should == true
@@ -50,12 +49,15 @@ describe ::IdentifiesAs do
 
     class SomeOtherClass
     end
+    
+    module SomeModule
+    end
 
     class NotAnArray
-      include IdentifiesAs
       identifies_as!( Array )
       instances_identify_as!( Array )
       identifies_as!( SomeOtherClass )
+      instances_identify_as!( SomeModule )
     end
     class AlsoNotAnArray < NotAnArray
     end
@@ -91,11 +93,17 @@ describe ::IdentifiesAs do
     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
+    not_an_array_instance.identifies_as?( SomeModule ).should == true
+    not_an_array_instance.is_a?( SomeModule ).should == true
+    ( SomeModule === not_an_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
+    ( SomeModule === also_not_an_array_instance ).should == true
+    also_not_an_array_instance.identifies_as?( SomeModule ).should == true
+    also_not_an_array_instance.is_a?( SomeModule ).should == true
 
     module IncludersActLikeArray
       include IdentifiesAs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identifies_as
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: module-cluster
@@ -36,14 +36,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/identifies_as/IdentifiesAs/ActuallyIsA.rb
-- lib/identifies_as/IdentifiesAs/ClassInstance.rb
-- lib/identifies_as/IdentifiesAs/ObjectInstance.rb
-- lib/identifies_as/IdentifiesAs.rb
+- lib/identifies_as/actually_is_a.rb
+- lib/identifies_as/object_instance.rb
 - lib/identifies_as.rb
-- spec/IdentifiesAs_spec.rb
+- lib/module.rb
+- lib/namespaces.rb
+- lib/requires.rb
+- spec/identifies_as_spec.rb
 - README.md
-- README.rdoc
 - CHANGELOG.rdoc
 homepage: http://rubygems.org/gems/identifies_as
 licenses: []

data/README.rdoc

@@ -1,89 +0,0 @@
-== Identifies As
-
-http://rubygems.org/gems/identifies_as
-
-== Summary
-
-Identities are interfaces. Sometimes it makes more sense to test an identity than a method- but then you don't want to limit flexibility.
-
-So why not let objects that claim to implement your interface identify as your object?
-
-IdentifiesAs permits objects to identify as if they are other types of objects.
-
-== Description
-
-Provides IdentifiesAs, which offers :identifies_as!, :instances_identify_as!, :identifies_as?, :instances_identify_as?, :stop_identifying_as!, :stop_instances_identifying_as, :identities, :instance_identities, and overrides :is_a? and :===.
-
-== Install
-
-* sudo gem install identifies_as
-
-== Usage
-
-* Example One:
-
-	class SomeOtherClass
-	end
-
-	class NotAnArray
-	  include IdentifiesAs
-	  instances_identify_as!( Array )
-	  identifies_as!( SomeOtherClass )
-	end
-
-	NotAnArray.is_a?( SomeOtherClass )
-	# => true
-
-	instance = NotAnArray.new
-
-	instance.identifies_as?( Array )
-	# => true
-
-	instance.is_a?( Array )
-	# => true
-
-	Array === instance
-	# => true
-
-* Example Two:
-
-	instance = Object.new
-
-	instance.extend( IdentifiesAs )
-
-	instance.identifies_as!( Array )
-
-	instance.identifies_as?( Array )
-	# => true
-
-	instance.is_a?( Array )
-	# => true
-
-	Array === instance
-	# => true
-
-
-== License
-
-  (The MIT License)
-
-  Copyright (c) Asher
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  'Software'), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/identifies_as/IdentifiesAs.rb

@@ -1,242 +0,0 @@
-
-module ::IdentifiesAs
-  
-  extend ::ModuleCluster::Define::Cluster
-  
-  include self::ObjectInstance
-  include_also_extends( self::ClassInstance )
-
-  @identities = { }
-  @instance_identities = { }
-  
-  @do_not_identify_as = { }
-  @instances_do_not_identify_as = { }
-  
-  ################################
-  #  self.object_identifies_as!  #
-  ################################
-  
-  def self.object_identifies_as!( object, *objects )
-
-    object_id = object.__id__
-          
-    unless identifies_as_hash = @identities[ object_id ]
-      identifies_as_hash = { }
-      @identities[ object_id ] = identifies_as_hash
-    end
-    
-    objects.each do |this_object|
-      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
-
-  ########################################
-  #  self.object_instances_identify_as!  #
-  ########################################
-  
-  def self.object_instances_identify_as!( object_class, *objects )
-
-    unless identifies_as_hash = @instance_identities[ object_class ]
-      identifies_as_hash = { }
-      @instance_identities[ object_class ] = identifies_as_hash
-    end
-    
-    objects.each do |this_object|
-      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
-
-  ################################
-  #  self.object_identifies_as?  #
-  ################################
-
-  def self.object_identifies_as?( object, other_object_type )
-
-    object_identifies = object_instance_identifies_as?( object, other_object_type )
-
-    # 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
-
-  #########################################
-  #  self.object_instance_identifies_as?  #
-  #########################################
-
-  def self.object_instance_identifies_as?( object, other_object_type )
-    
-    object_identifies = false
-    
-    object_ancestor_chain = nil
-  
-    if object.actually_is_a?( ::Module )
-      object_ancestor_chain = object.ancestors.dup
-    else
-      object_ancestor_chain = [ object ]
-      if object.actually_is_a?( ::Symbol ) or object.actually_is_a?( ::Fixnum )
-        object_ancestor_chain.concat( object.class.ancestors )
-      else
-        object_ancestor_chain.concat( class << object ; ancestors ; end )
-      end
-    end
-
-    object_ancestor_chain.each do |this_ancestor|
-
-      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
-  
-    end
-    
-    return object_identifies
-    
-  end
-
-  ########################################
-  #  self.object_instances_identify_as?  #
-  ########################################
-
-  def self.object_instances_identify_as?( object_class, other_object_type )
-
-    object_identifies = false
-    object_class.ancestors.each do |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
-    
-  end
-
-  ############################
-  #  self.object_identities  #
-  ############################
-  
-  def self.object_identities( object )
-    
-    return object_identities_hash( object ).keys
-    
-  end
-
-  #####################################
-  #  self.object_instance_identities  #
-  #####################################
-  
-  def self.object_instance_identities( object_class )
-    
-    return object_instance_identities_hash( object_class ).keys
-    
-  end
-
-  #################################
-  #  self.object_identities_hash  #
-  #################################
-  
-  def self.object_identities_hash( object )
-    
-    return @identities[ object.__id__ ]
-    
-  end
-
-  ##########################################
-  #  self.object_instance_identities_hash  #
-  ##########################################
-  
-  def self.object_instance_identities_hash( object_class )
-    
-    return @instance_identities[ object_class ]
-    
-  end
-
-  ######################################
-  #  self.stop_object_identifying_as!  #
-  ######################################
-  
-  def self.stop_object_identifying_as!( object, *objects )
-
-    object_id = 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.stop_object_instances_identifying_as!  #
-  ################################################
-  
-  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 )
-      objects.each do |this_object|
-        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
-      
-end