has_many_polymorphs 2.2 → 2.9

data/lib/has_many_polymorphs/debugging_tools.rb

@@ -31,8 +31,6 @@ Turns on Rails' default dependency logging.
 
 =end
 
-_logger_warn "debug mode enabled"
-
 class << ActiveRecord::Base
   COLLECTION_METHODS = [:belongs_to, :has_many, :has_and_belongs_to_many, :has_one, 
       :has_many_polymorphs, :acts_as_double_polymorphic_join].each do |method_name|

data/lib/has_many_polymorphs/dependencies.rb

@@ -0,0 +1,36 @@
+
+=begin rdoc
+Adds a minimal dependency injection framework so that owners of polymorphic relationships reload after their children, reinjecting the child helper methods.
+
+Overrides Dependencies#<tt>new_constants_in</tt>.
+=end
+
+module Dependencies
+    
+  mattr_accessor :injection_graph
+  self.injection_graph = Hash.new([])
+
+  # Add a dependency for this target.
+  def inject_dependency(target, *requirements)
+    target, requirements = target.to_s, requirements.map(&:to_s)    
+    injection_graph[target] = ((injection_graph[target] + requirements).uniq - [target])
+    requirements.each {|requirement| mark_for_unload requirement }
+#    _logger_debug "has_many_polymorphs: injection graph: #{injection_graph.inspect}"
+  end
+
+  # Make sure any dependent constants of the constants added by <tt>yield</tt> are reloaded.
+  def new_constants_in_with_injection(*descs, &block) # chain
+#    _logger_debug "has_many_polymorphs: NEW: autoloaded constants: #{autoloaded_constants.inspect}; #{explicitly_unloadable_constants.inspect}" if (autoloaded_constants + explicitly_unloadable_constants).any?
+    returning(new_constants_in_without_injection(*descs, &block)) do |found|
+#      _logger_debug "has_many_polymorphs: new constants: #{found.inspect}" if found.any?
+      found.each do |constant|
+        injection_graph[constant].each do |requirement| 
+          requirement.constantize
+ #          _logger_debug "has_many_polymorphs: constantized #{requirement}"
+        end
+      end    
+    end
+  end
+  alias_method_chain :new_constants_in, :injection
+   
+end

data/lib/has_many_polymorphs/rake_task_redefine_task.rb

@@ -24,12 +24,4 @@ module Rake
       end
     end
   end
-end
-
-class Object
-  def silently
-    stderr, stdout, $stderr, $stdout = $stderr, $stdout, StringIO.new, StringIO.new
-    yield
-    $stderr, $stdout = stderr, stdout
-  end
-end
+end

data/lib/has_many_polymorphs/reflection.rb

@@ -2,19 +2,18 @@ module ActiveRecord #:nodoc:
   module Reflection #:nodoc:
     
     module ClassMethods #:nodoc:
-      
-      # Update the default reflection switch so that <tt>:has_many_polymorphs</tt> types get instantiated. 
-      # It's not a composed method so we have to override the whole thing.
+  
+      # Update the default reflection switch so that <tt>:has_many_polymorphs</tt> types get instantiated. It's not a composed method so we have to override the whole thing.
       def create_reflection(macro, name, options, active_record)
         case macro
           when :has_many, :belongs_to, :has_one, :has_and_belongs_to_many
-            klass = options[:through] ? ThroughReflection : AssociationReflection
-            reflection = klass.new(macro, name, options, active_record)
+            reflection = AssociationReflection.new(macro, name, options, active_record)
           when :composed_of
             reflection = AggregateReflection.new(macro, name, options, active_record)
-          # added by has_many_polymorphs #
+        # added by has_many_polymorphs #
           when :has_many_polymorphs
             reflection = PolymorphicReflection.new(macro, name, options, active_record)
+        # end added #
         end
         write_inheritable_hash :reflections, name => reflection
         reflection
@@ -33,7 +32,7 @@ Inherits from ActiveRecord::Reflection::AssociationReflection.
 
 =end
 
-    class PolymorphicReflection < ThroughReflection
+    class PolymorphicReflection < AssociationReflection
       # Stub out the validity check. Has_many_polymorphs checks validity on macro creation, not on reflection.
       def check_validity! 
         # nothing

data/lib/has_many_polymorphs/support_methods.rb

@@ -45,13 +45,9 @@ class Hash
 
   # An implementation of select that returns a Hash.
   def _select
-    if RUBY_VERSION >= "1.9"
-      Hash[*self.select {|k, v| yield k, v }.flatten]
-    else
-      Hash[*self.select do |key, value|
-        yield key, value
-      end._flatten_once]
-    end
+    Hash[*self.select do |key, value|
+      yield key, value
+    end._flatten_once]
   end
 end
 
@@ -62,17 +58,15 @@ class Object
 
   # Logger shortcut.
   def _logger_debug s
-    s = "** has_many_polymorphs: #{s}"
     RAILS_DEFAULT_LOGGER.debug(s) if RAILS_DEFAULT_LOGGER
   end  
 
   # Logger shortcut.  
   def _logger_warn s
-    s = "** has_many_polymorphs: #{s}"
     if RAILS_DEFAULT_LOGGER
       RAILS_DEFAULT_LOGGER.warn(s) 
     else
-      $stderr.puts(s)
+      $stderr.puts("has_many_polymorphs: #{s}")
     end    
   end
   

data/test/models/aquatic/fish.rb

@@ -1,5 +1,4 @@
 class Aquatic::Fish < ActiveRecord::Base
-  # set_table_name "fish"
-  # attr_accessor :after_find_test, :after_initialize_test
+#  attr_accessor :after_find_test, :after_initialize_test
 end
 

data/test/models/aquatic/whale.rb

@@ -4,8 +4,6 @@ require 'aquatic/fish'
 require 'aquatic/pupils_whale'
 
 class Aquatic::Whale < ActiveRecord::Base
-  # set_table_name "whales"
-  
   has_many_polymorphs(:aquatic_pupils, :from => [:dogs, :"aquatic/fish"],
                       :through => "aquatic/pupils_whales") do
                         def a_method

data/test/models/eaters_foodstuff.rb

@@ -3,6 +3,8 @@ class EatersFoodstuff < ActiveRecord::Base
   belongs_to :foodstuff, :class_name => "Petfood", :foreign_key => "foodstuff_id"
   belongs_to :eater, :polymorphic => true
   
-  before_save { |record| record.some_attribute = 3 }
+  def before_save
+    self.some_attribute = 3
+  end
 end
 

data/test/models/petfood.rb

@@ -23,8 +23,7 @@ class Petfood < ActiveRecord::Base
     :ignore_duplicates => false,
     :conditions => "NULL IS NULL",
     :order => "eaters_foodstuffs.updated_at ASC",
-    :parent_order => "petfoods.the_petfood_primary_key DESC",
-    :parent_conditions => "petfoods.name IS NULL OR petfoods.name != 'Snausages'",
+    :parent_order => "the_petfood_primary_key DESC",
     :extend => [ExtensionModule, OtherExtensionModule, proc {}],
     :join_extend => proc { 
       def a_method

data/test/schema.rb

@@ -67,21 +67,6 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :protector_type, :string
     t.column :created_at, :datetime, :null => false
     t.column :updated_at, :datetime, :null => false
-  end  
-  
-  create_table :parentships, :force => true do |t|
-    t.column :parent_id, :integer
-    t.column :child_type, :string
-    t.column :kid_id, :integer 
-    t.column :created_at, :datetime, :null => false
-    t.column :updated_at, :datetime, :null => false
-  end                    
-  
-  create_table :people, :force => true do |t|
-    t.column :name, :string
-    t.column :age, :integer
-    t.column :created_at, :datetime, :null => false
-    t.column :updated_at, :datetime, :null => false
   end
 
 end

data/test/test_helper.rb

@@ -1,52 +1,31 @@
 
-$VERBOSE = nil
-require 'rubygems'
-require 'rake' # echoe relies on Rake being present but doesn't require it itself
-require 'echoe'
-require 'test/unit'
-require 'multi_rails_init'
-#require 'ruby-debug' # uncomment if needed (for Ruby >= 1.9 use require 'debug' where needed)
-
-if defined? ENV['MULTIRAILS_RAILS_VERSION']
-  ENV['RAILS_GEM_VERSION'] = ENV['MULTIRAILS_RAILS_VERSION']
+begin
+  require 'rubygems'
+  require 'ruby-debug' 
+  Debugger.start
+rescue Object
 end
 
-Echoe.silence do
-  HERE = File.expand_path(File.dirname(__FILE__))
-  $LOAD_PATH << HERE
-  # $LOAD_PATH << "#{HERE}/integration/app"
+# load the applicaiton's test helper
+begin
+  require File.dirname(__FILE__) + '/../../../../test/test_helper' 
+rescue LoadError
+  require '~/projects/miscellaneous/cookbook/test/test_helper'
 end
 
-LOG = "#{HERE}/integration/app/log/development.log"     
+WORKING_DIR = File.dirname(__FILE__)
 
-### For unit tests
+Inflector.inflections {|i| i.irregular 'fish', 'fish' }
 
-require 'integration/app/config/environment'
-require 'test_help'
+$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path = WORKING_DIR + "/fixtures")
+$LOAD_PATH.unshift(WORKING_DIR + "/models")
+$LOAD_PATH.unshift(WORKING_DIR + "/modules")
 
-ActiveSupport::Inflector.inflections {|i| i.irregular 'fish', 'fish' }
-
-$LOAD_PATH.unshift(ActiveSupport::TestCase.fixture_path = HERE + "/fixtures")
-$LOAD_PATH.unshift(HERE + "/models")
-$LOAD_PATH.unshift(HERE + "/modules")
-
-class ActiveSupport::TestCase
+class Test::Unit::TestCase
   self.use_transactional_fixtures = !(ActiveRecord::Base.connection.is_a? ActiveRecord::ConnectionAdapters::MysqlAdapter rescue false)
   self.use_instantiated_fixtures  = false
 end
 
-Echoe.silence do
-  load(HERE + "/schema.rb")
-end
-
-### For integration tests
+# test schema
+load(File.dirname(__FILE__) + "/schema.rb")
 
-def truncate
-  system("> #{LOG}")
-end
-
-def log
-  File.open(LOG, 'r') do |f|
-    f.read
-  end
-end

data/test/unit/{has_many_polymorphs_test.rb → polymorph_test.rb}

@@ -1,25 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-require 'dog'
-require 'wild_boar'
-require 'frog'
-require 'cat'
-require 'kitten'
-require 'aquatic/whale'
-require 'aquatic/fish'
-require 'aquatic/pupils_whale'
-require 'beautiful_fight_relationship' 
-
-class PolymorphTest < ActiveSupport::TestCase
-  
-  set_fixture_class :bow_wows => Dog
-  set_fixture_class :keep_your_enemies_close => BeautifulFightRelationship
-  set_fixture_class :whales => Aquatic::Whale
-  set_fixture_class :fish => Aquatic::Fish
-  set_fixture_class :little_whale_pupils => Aquatic::PupilsWhale
+class PolymorphTest < Test::Unit::TestCase
   
   fixtures :cats, :bow_wows, :frogs, :wild_boars, :eaters_foodstuffs, :petfoods,
-              :fish, :whales, :little_whale_pupils, :keep_your_enemies_close, :people   
+              :"aquatic/fish", :"aquatic/whales", :"aquatic/little_whale_pupils",
+              :keep_your_enemies_close
+  require 'beautiful_fight_relationship'  
         
   def setup
    @association_error = ActiveRecord::Associations::PolymorphicError
@@ -36,61 +22,61 @@ class PolymorphTest < ActiveSupport::TestCase
    @froggy = Frog.find(1)
 
    @join_count = EatersFoodstuff.count    
-   @kibbles_eaters_count = @kibbles.eaters.size
-   @bits_eaters_count = @bits.eaters.size
-
-   @double_join_count = BeautifulFightRelationship.count
-   @alice_enemies_count = @alice.enemies.size
-  end  
+   @l = @kibbles.eaters.size
+   @m = @bits.eaters.size
+  end
+  
+  def d
+    require 'ruby-debug'
+    Debugger.start
+    debugger
+  end
   
   def test_all_relationship_validities
     # q = []
     # ObjectSpace.each_object(Class){|c| q << c if c.ancestors.include? ActiveRecord::Base }
-    # q.each{|c| puts "#{c.name}.reflect_on_all_associations.map(&:check_validity!)"}
-    Petfood.reflect_on_all_associations.map(&:check_validity!)
-    Tabby.reflect_on_all_associations.map(&:check_validity!)
-    Kitten.reflect_on_all_associations.map(&:check_validity!)
-    Dog.reflect_on_all_associations.map(&:check_validity!)
-    Canine.reflect_on_all_associations.map(&:check_validity!)
-    Aquatic::Fish.reflect_on_all_associations.map(&:check_validity!)
-    EatersFoodstuff.reflect_on_all_associations.map(&:check_validity!)
-    WildBoar.reflect_on_all_associations.map(&:check_validity!)
-    Frog.reflect_on_all_associations.map(&:check_validity!)
-    Cat.reflect_on_all_associations.map(&:check_validity!)
-    BeautifulFightRelationship.reflect_on_all_associations.map(&:check_validity!)
-    Person.reflect_on_all_associations.map(&:check_validity!)
-    Parentship.reflect_on_all_associations.map(&:check_validity!)
-    Aquatic::Whale.reflect_on_all_associations.map(&:check_validity!)
-    Aquatic::PupilsWhale.reflect_on_all_associations.map(&:check_validity!)
+    # q.each{|c| puts "#{c.name}.reflect_on_all_associations.map &:check_validity! "}
+    Petfood.reflect_on_all_associations.map &:check_validity! 
+    Tabby.reflect_on_all_associations.map &:check_validity! 
+    Kitten.reflect_on_all_associations.map &:check_validity! 
+    Dog.reflect_on_all_associations.map &:check_validity! 
+    Aquatic::Fish.reflect_on_all_associations.map &:check_validity! 
+    EatersFoodstuff.reflect_on_all_associations.map &:check_validity! 
+    WildBoar.reflect_on_all_associations.map &:check_validity! 
+    Frog.reflect_on_all_associations.map &:check_validity! 
+    Aquatic::Whale.reflect_on_all_associations.map &:check_validity! 
+    Cat.reflect_on_all_associations.map &:check_validity! 
+    Aquatic::PupilsWhale.reflect_on_all_associations.map &:check_validity! 
+    BeautifulFightRelationship.reflect_on_all_associations.map &:check_validity! 
   end
   
   def test_assignment     
     assert @kibbles.eaters.blank?
     assert @kibbles.eaters.push(Cat.find_by_name('Chloe'))
-    assert_equal @kibbles_eaters_count += 1, @kibbles.eaters.count
+    assert_equal @l += 1, @kibbles.eaters.count
 
     @kibbles.reload
-    assert_equal @kibbles_eaters_count, @kibbles.eaters.count    
+    assert_equal @l, @kibbles.eaters.count    
   end
   
   def test_duplicate_assignment
     # try to add a duplicate item when :ignore_duplicates is false
     @kibbles.eaters.push(@alice)
-    assert @kibbles.eaters.any? {|obj| obj == @alice}
+    assert @kibbles.eaters.include?(@alice)
     @kibbles.eaters.push(@alice)
-    assert_equal @kibbles_eaters_count + 2, @kibbles.eaters.count
+    assert_equal @l + 2, @kibbles.eaters.count
     assert_equal @join_count + 2, EatersFoodstuff.count
   end
   
   def test_create_and_push
     assert @kibbles.eaters.push(@spot)  
-    assert_equal @kibbles_eaters_count += 1, @kibbles.eaters.count
+    assert_equal @l += 1, @kibbles.eaters.count
     assert @kibbles.eaters << @rover
     assert @kibbles.eaters << Kitten.create(:name => "Miranda")
-    assert_equal @kibbles_eaters_count += 2, @kibbles.eaters.length
+    assert_equal @l += 2, @kibbles.eaters.length
 
     @kibbles.reload
-    assert_equal @kibbles_eaters_count, @kibbles.eaters.length   
+    assert_equal @l, @kibbles.eaters.length   
     
     # test that ids and new flags were set appropriately
     assert_not_nil @kibbles.eaters[0].id
@@ -104,29 +90,18 @@ class PolymorphTest < ActiveSupport::TestCase
  
   def test_add_join_record
     assert_equal Kitten, @chloe.class
-    assert join = EatersFoodstuff.new(:foodstuff_id => @bits.id, :eater_id => @chloe.id, :eater_type => @chloe.class.name ) 
-    assert join.save!
-    assert join.id
+    assert @join_record = EatersFoodstuff.new(:foodstuff_id => @bits.id, :eater_id => @chloe.id, :eater_type => @chloe.class.name ) 
+    assert @join_record.save!
+    assert @join_record.id
     assert_equal @join_count + 1, EatersFoodstuff.count
 
-    #assert_equal @bits_eaters_count, @bits.eaters.size # Doesn't behave this way on latest edge anymore
-    assert_equal @bits_eaters_count + 1, @bits.eaters.count # SQL
+    # not reloaded
+    #assert_equal @m, @bits.eaters.size # Doesn't behave this way on latest edge anymore
+    assert_equal @m + 1, @bits.eaters.count # SQL
 
     # reload; is the new association there?
     assert @bits.eaters.reload
-    assert @bits.eaters.any? {|obj| obj == @chloe}
-  end
-
-  def test_build_join_record_on_association
-    assert_equal Kitten, @chloe.class
-    assert join = @chloe.eaters_foodstuffs.build(:foodstuff => @bits)
-    # assert_equal join.eater_type, @chloe.class.name # will be STI parent type
-    assert join.save!
-    assert join.id
-    assert_equal @join_count + 1, EatersFoodstuff.count
-
-    assert @bits.eaters.reload
-    assert @bits.eaters.any? {|obj| obj == @chloe}
+    assert @bits.eaters.include?(@chloe)
   end
 
 #  not supporting this, since has_many :through doesn't support it either  
@@ -134,23 +109,23 @@ class PolymorphTest < ActiveSupport::TestCase
 #    # add an unsaved item
 #    assert @bits.eaters << Kitten.new(:name => "Bridget")
 #    assert_nil Kitten.find_by_name("Bridget")
-#    assert_equal @bits_eaters_count + 1, @bits.eaters.count
+#    assert_equal @m + 1, @bits.eaters.count
 #
 #    assert @bits.save
 #    @bits.reload
-#    assert_equal @bits_eaters_count + 1, @bits.eaters.count
+#    assert_equal @m + 1, @bits.eaters.count
 #    
 #  end
   
   def test_self_reference
     assert @kibbles.eaters << @bits
-    assert_equal @kibbles_eaters_count += 1, @kibbles.eaters.count
-    assert @kibbles.eaters.any? {|obj| obj == @bits}
+    assert_equal @l += 1, @kibbles.eaters.count
+    assert @kibbles.eaters.include?(@bits)
     @kibbles.reload
     assert @kibbles.foodstuffs_of_eaters.blank?
     
     @bits.reload
-    assert @bits.foodstuffs_of_eaters.any? {|obj| obj == @kibbles}
+    assert @bits.foodstuffs_of_eaters.include?(@kibbles)
     assert_equal [@kibbles], @bits.foodstuffs_of_eaters
   end
 
@@ -158,7 +133,7 @@ class PolymorphTest < ActiveSupport::TestCase
     assert @kibbles.eaters << @chloe
     @kibbles.reload
     assert @kibbles.eaters.delete(@kibbles.eaters[0])
-    assert_equal @kibbles_eaters_count, @kibbles.eaters.count
+    assert_equal @l, @kibbles.eaters.count
   end
   
   def test_destroy
@@ -167,7 +142,7 @@ class PolymorphTest < ActiveSupport::TestCase
     assert @kibbles.eaters.length > 0
     assert @kibbles.eaters[0].destroy
     @kibbles.reload
-    assert_equal @kibbles_eaters_count, @kibbles.eaters.count
+    assert_equal @l, @kibbles.eaters.count
   end
 
   def test_clear
@@ -190,9 +165,9 @@ class PolymorphTest < ActiveSupport::TestCase
   def test_individual_collections_push
     assert_equal [@chloe], (@kibbles.eater_kittens << @chloe)
     @kibbles.reload
-    assert @kibbles.eaters.any? {|obj| obj == @chloe}
-    assert @kibbles.eater_kittens.any? {|obj| obj == @chloe}
-    assert !@kibbles.eater_dogs.any? {|obj| obj == @chloe}
+    assert @kibbles.eaters.include?(@chloe)
+    assert @kibbles.eater_kittens.include?(@chloe)
+    assert !@kibbles.eater_dogs.include?(@chloe)
   end
 
   def test_individual_collections_delete
@@ -204,7 +179,7 @@ class PolymorphTest < ActiveSupport::TestCase
     
     @kibbles.reload    
     assert @kibbles.eater_kittens.empty?
-    assert @kibbles.eater_dogs.any? {|obj| obj == @spot}
+    assert @kibbles.eater_dogs.include?(@spot)
   end
   
   def test_individual_collections_clear
@@ -217,14 +192,14 @@ class PolymorphTest < ActiveSupport::TestCase
 
     assert @kibbles.eater_kittens.empty?    
     assert_equal 2, @kibbles.eaters.size
-    assert !@kibbles.eater_kittens.any? {|obj| obj == @chloe}
-    assert !@kibbles.eaters.any? {|obj| obj == @chloe}
+    assert !@kibbles.eater_kittens.include?(@chloe)
+    assert !@kibbles.eaters.include?(@chloe)
 
     @kibbles.reload    
     assert @kibbles.eater_kittens.empty?    
     assert_equal 2, @kibbles.eaters.size
-    assert !@kibbles.eater_kittens.any? {|obj| obj == @chloe}
-    assert !@kibbles.eaters.any? {|obj| obj == @chloe}
+    assert !@kibbles.eater_kittens.include?(@chloe)
+    assert !@kibbles.eaters.include?(@chloe)
   end
   
   def test_childrens_individual_collections
@@ -234,7 +209,7 @@ class PolymorphTest < ActiveSupport::TestCase
   
   def test_self_referential_join_tables
     # check that the self-reference join tables go the right ways
-    assert_equal @kibbles_eaters_count, @kibbles.eaters_foodstuffs.count
+    assert_equal @l, @kibbles.eaters_foodstuffs.count
     assert_equal @kibbles.eaters_foodstuffs.count, @kibbles.eaters_foodstuffs_as_child.count
   end
 
@@ -283,9 +258,8 @@ class PolymorphTest < ActiveSupport::TestCase
   end
 
   def test_attributes_come_through_when_child_has_underscore_in_table_name
-    join = EatersFoodstuff.new(:foodstuff_id => @bits.id, :eater_id =>  @puma.id, :eater_type => @puma.class.name) 
-    join.save!
-    
+    @join_record = EatersFoodstuff.new(:foodstuff_id => @bits.id, :eater_id =>  @puma.id, :eater_type => @puma.class.name) 
+    @join_record.save!
     @bits.eaters.reload
 
     assert_equal "Puma", @puma.name
@@ -316,13 +290,13 @@ class PolymorphTest < ActiveSupport::TestCase
 
   def test_namespaced_polymorphic_collection
     @shamu.aquatic_pupils << @swimmy
-    assert @shamu.aquatic_pupils.any? {|obj| obj == @swimmy}
+    assert @shamu.aquatic_pupils.include?(@swimmy)
     @shamu.reload
-    assert @shamu.aquatic_pupils.any? {|obj| obj == @swimmy}
+    assert @shamu.aquatic_pupils.include?(@swimmy)
 
     @shamu.aquatic_pupils << @spot
-    assert @shamu.dogs.any? {|obj| obj == @spot}
-    assert @shamu.aquatic_pupils.any? {|obj| obj == @swimmy}
+    assert @shamu.dogs.include?(@spot)
+    assert @shamu.aquatic_pupils.include?(@swimmy)
     assert_equal @swimmy, @shamu.aquatic_fish.first
     assert_equal 10, @shamu.aquatic_fish.first.speed
   end
@@ -333,8 +307,8 @@ class PolymorphTest < ActiveSupport::TestCase
     
     @shamu.reload
     @shamu.aquatic_pupils.delete @spot
-    assert !@shamu.dogs.any? {|obj| obj == @spot}
-    assert !@shamu.aquatic_pupils.any? {|obj| obj == @spot}
+    assert !@shamu.dogs.include?(@spot)
+    assert !@shamu.aquatic_pupils.include?(@spot)
     assert_equal 1, @shamu.aquatic_pupils.length
   end
   
@@ -357,9 +331,9 @@ class PolymorphTest < ActiveSupport::TestCase
     @alice.enemies << @spot
     @alice.reload
     @spot.reload
-    assert @spot.protectors.any? {|obj| obj == @alice}
-    assert @alice.enemies.any? {|obj| obj == @spot}
-    assert !@alice.protectors.any? {|obj| obj == @alice}
+    assert @spot.protectors.include?(@alice)
+    assert @alice.enemies.include?(@spot)
+    assert !@alice.protectors.include?(@alice)
     assert_equal 1, @alice.beautiful_fight_relationships_as_protector.size
     assert_equal 0, @alice.beautiful_fight_relationships_as_enemy.size
     assert_equal 1, @alice.beautiful_fight_relationships.size
@@ -367,7 +341,7 @@ class PolymorphTest < ActiveSupport::TestCase
     # self reference
     assert_equal 1, @alice.enemies.length
     @alice.enemies.push @alice
-    assert @alice.enemies.any? {|obj| obj == @alice}
+    assert @alice.enemies.include?(@alice)
     assert_equal 2, @alice.enemies.length    
     @alice.reload
     assert_equal 2, @alice.beautiful_fight_relationships_as_protector.size
@@ -375,20 +349,6 @@ class PolymorphTest < ActiveSupport::TestCase
     assert_equal 3, @alice.beautiful_fight_relationships.size
   end
   
-  def test_double_collection_build_join_record_on_association
-    
-    join = @alice.beautiful_fight_relationships_as_protector.build(:enemy => @spot)
-    
-    assert_equal @alice.class.base_class.name, join.protector_type
-    assert_nothing_raised { join.save! }
-
-    assert join.id
-    assert_equal @double_join_count + 1, BeautifulFightRelationship.count
-
-    assert @alice.enemies.reload
-    assert @alice.enemies.any? {|obj| obj == @spot}
-  end
-  
   def test_double_dependency_injection
 #    breakpoint
   end
@@ -396,12 +356,12 @@ class PolymorphTest < ActiveSupport::TestCase
   def test_double_collection_deletion
     @alice.enemies << @spot
     @alice.reload
-    assert @alice.enemies.any? {|obj| obj == @spot}
+    assert @alice.enemies.include?(@spot)
     @alice.enemies.delete(@spot)
-    assert !@alice.enemies.any? {|obj| obj == @spot}
+    assert !@alice.enemies.include?(@spot)
     assert @alice.enemies.empty?
     @alice.reload
-    assert !@alice.enemies.any? {|obj| obj == @spot}
+    assert !@alice.enemies.include?(@spot)
     assert @alice.enemies.empty?
     assert_equal 0, @alice.beautiful_fight_relationships.size
   end
@@ -409,12 +369,12 @@ class PolymorphTest < ActiveSupport::TestCase
   def test_double_collection_deletion_from_opposite_side
     @alice.protectors << @puma
     @alice.reload
-    assert @alice.protectors.any? {|obj| obj == @puma}
+    assert @alice.protectors.include?(@puma)
     @alice.protectors.delete(@puma)
-    assert !@alice.protectors.any? {|obj| obj == @puma}
+    assert !@alice.protectors.include?(@puma)
     assert @alice.protectors.empty?
     @alice.reload
-    assert !@alice.protectors.any? {|obj| obj == @puma}
+    assert !@alice.protectors.include?(@puma)
     assert @alice.protectors.empty?
     assert_equal 0, @alice.beautiful_fight_relationships.size
   end
@@ -423,58 +383,59 @@ class PolymorphTest < ActiveSupport::TestCase
     assert @alice.dogs.empty?
     @alice.enemies << @spot
 
-    assert @alice.enemies.any? {|obj| obj == @spot}
-    assert !@alice.kittens.any? {|obj| obj == @alice}    
+    assert @alice.enemies.include?(@spot)
+    assert !@alice.kittens.include?(@alice)    
 
-    assert !@alice.dogs.any? {|obj| obj == @spot}    
+    assert !@alice.dogs.include?(@spot)    
     @alice.reload
-    assert @alice.dogs.any? {|obj| obj == @spot}    
-    assert !WildBoar.find(@alice.id).dogs.any? {|obj| obj == @spot} # make sure the parent type is checked
+    assert @alice.dogs.include?(@spot)    
+    assert !WildBoar.find(@alice.id).dogs.include?(@spot) # make sure the parent type is checked
   end
 
   def test_individual_collections_created_for_double_relationship_from_opposite_side
     assert @alice.wild_boars.empty?
     @alice.protectors << @puma
-    @alice.reload
 
-    assert @alice.protectors.any? {|obj| obj == @puma}
-    assert @alice.wild_boars.any? {|obj| obj == @puma}    
+    assert @alice.protectors.include?(@puma)
+    assert !@alice.wild_boars.include?(@puma)    
+    @alice.reload
+    assert @alice.wild_boars.include?(@puma)    
     
-    assert !Dog.find(@alice.id).wild_boars.any? {|obj| obj == @puma} # make sure the parent type is checked
+    assert !Dog.find(@alice.id).wild_boars.include?(@puma) # make sure the parent type is checked
   end
   
   def test_self_referential_individual_collections_created_for_double_relationship
     @alice.enemies << @alice
     @alice.reload
-    assert @alice.enemy_kittens.any? {|obj| obj == @alice}
-    assert @alice.protector_kittens.any? {|obj| obj == @alice}
-    assert @alice.kittens.any? {|obj| obj == @alice}
+    assert @alice.enemy_kittens.include?(@alice)
+    assert @alice.protector_kittens.include?(@alice)
+    assert @alice.kittens.include?(@alice)
     assert_equal 2, @alice.kittens.size
 
     @alice.enemies << (@chloe =  Kitten.find_by_name('Chloe'))
     @alice.reload
-    assert @alice.enemy_kittens.any? {|obj| obj == @chloe}
-    assert !@alice.protector_kittens.any? {|obj| obj == @chloe}
-    assert @alice.kittens.any? {|obj| obj == @chloe}
+    assert @alice.enemy_kittens.include?(@chloe)
+    assert !@alice.protector_kittens.include?(@chloe)
+    assert @alice.kittens.include?(@chloe)
     assert_equal 3, @alice.kittens.size    
   end
     
   def test_child_of_polymorphic_join_can_reach_parent
     @alice.enemies << @spot    
     @alice.reload
-    assert @spot.protectors.any? {|obj| obj == @alice}
+    assert @spot.protectors.include?(@alice)
   end
   
   def test_double_collection_deletion_from_child_polymorphic_join
     @alice.enemies << @spot
     @spot.protectors.delete(@alice)
-    assert !@spot.protectors.any? {|obj| obj == @alice}
+    assert !@spot.protectors.include?(@alice)
     @alice.reload
-    assert !@alice.enemies.any? {|obj| obj == @spot}
+    assert !@alice.enemies.include?(@spot)
     BeautifulFightRelationship.create(:protector_id => 2, :protector_type => "Dog", :enemy_id => @spot.id, :enemy_type => @spot.class.name)
     @alice.enemies << @spot
     @spot.protectors.delete(@alice)
-    assert !@spot.protectors.any? {|obj| obj == @alice}
+    assert !@spot.protectors.include?(@alice)
   end
 
   def test_collection_query_on_unsaved_record
@@ -485,15 +446,15 @@ class PolymorphTest < ActiveSupport::TestCase
   def test_double_individual_collections_push
     assert_equal [@chloe], (@spot.protector_kittens << @chloe)
     @spot.reload
-    assert @spot.protectors.any? {|obj| obj == @chloe}
-    assert @spot.protector_kittens.any? {|obj| obj == @chloe}
-    assert !@spot.protector_dogs.any? {|obj| obj == @chloe}
+    assert @spot.protectors.include?(@chloe)
+    assert @spot.protector_kittens.include?(@chloe)
+    assert !@spot.protector_dogs.include?(@chloe)
  
     assert_equal [@froggy], (@spot.frogs << @froggy)
     @spot.reload
-    assert @spot.enemies.any? {|obj| obj == @froggy}
-    assert @spot.frogs.any? {|obj| obj == @froggy}
-    assert !@spot.enemy_dogs.any? {|obj| obj == @froggy}
+    assert @spot.enemies.include?(@froggy)
+    assert @spot.frogs.include?(@froggy)
+    assert !@spot.enemy_dogs.include?(@froggy)
   end
 
   def test_double_individual_collections_delete
@@ -505,7 +466,7 @@ class PolymorphTest < ActiveSupport::TestCase
     
     @spot.reload    
     assert @spot.protector_kittens.empty?
-    assert @spot.wild_boars.any? {|obj| obj == @puma}
+    assert @spot.wild_boars.include?(@puma)
   end
   
   def test_double_individual_collections_clear
@@ -517,12 +478,12 @@ class PolymorphTest < ActiveSupport::TestCase
     @spot.reload    
     assert @spot.protector_kittens.empty?    
     assert_equal 1, @spot.protectors.size
-    assert !@spot.protector_kittens.any? {|obj| obj == @chloe}
-    assert !@spot.protectors.any? {|obj| obj == @chloe}
-    assert !@spot.protector_kittens.any? {|obj| obj == @alice}
-    assert !@spot.protectors.any? {|obj| obj == @alice}
-    assert @spot.protectors.any? {|obj| obj == @puma}
-    assert @spot.wild_boars.any? {|obj| obj == @puma}
+    assert !@spot.protector_kittens.include?(@chloe)
+    assert !@spot.protectors.include?(@chloe)
+    assert !@spot.protector_kittens.include?(@alice)
+    assert !@spot.protectors.include?(@alice)
+    assert @spot.protectors.include?(@puma)
+    assert @spot.wild_boars.include?(@puma)
   end 
 
   def test_single_extensions
@@ -560,16 +521,9 @@ class PolymorphTest < ActiveSupport::TestCase
       end" }
     assert_raises(@association_error) {
       eval "class SomeModel < ActiveRecord::Base
-        acts_as_double_polymorphic_join :polymorph => [:dogs, :cats], :unimorphs => [:dogs, :cats]
+       acts_as_double_polymorphic_join :polymorph => [:dogs, :cats], :unimorphs => [:dogs, :cats]
       end" }    
   end
-  
-  def test_error_message_on_namespaced_targets
-    assert_raises(@association_error) {
-      eval "class SomeModel < ActiveRecord::Base
-        has_many_polymorphs :polymorphs, :from => [:fish]
-      end" }
-  end
 
   def test_single_custom_finders
     [@kibbles, @alice, @puma, @spot, @bits].each {|record| @kibbles.eaters << record; sleep 1} # XXX yeah i know
@@ -634,38 +588,12 @@ class PolymorphTest < ActiveSupport::TestCase
     assert_equal EatersFoodstuff.name, Petfood.reflect_on_association(:eaters).class_name
   end
   
-  def test_parent_order
+  def test_parent_order_orders_parents
     @alice.foodstuffs_of_eaters << Petfood.find(:all, :order => "the_petfood_primary_key ASC")
     @alice.reload #not necessary
     assert_equal [2,1], @alice.foodstuffs_of_eaters.map(&:id)  
   end
 
-  def test_parent_conditions
-    @kibbles.eaters << @alice
-    assert_equal [@alice], @kibbles.eaters
-
-    @snausages = Petfood.create(:name => 'Snausages')
-    @snausages.eaters << @alice    
-    assert_equal [@alice], @snausages.eaters
-    
-    assert_equal [@kibbles], @alice.foodstuffs_of_eaters
-  end        
-  
-  def test_self_referential_hmp_with_conditions
-    p = Person.find(:first)
-    kid = Person.create(:name => "Tim", :age => 3)
-    p.kids << kid
-
-    kid.reload; p.reload
-
-  # assert_equal [p], kid.parents 
-  # assert Rails.has_one? Bug
-  # non-standard foreign_type key is not set properly when you are the polymorphic interface of a has_many going to a :through
-
-    assert_equal [kid], p.kids
-    assert_equal [kid], p.people
-  end
-
 #  def test_polymorphic_include
 #    @kibbles.eaters << [@kibbles, @alice, @puma, @spot, @bits]
 #    assert @kibbles.eaters.include?(@kibbles.eaters_foodstuffs.find(:all, :include => :eater).first.eater)