has_many_polymorphs 2.2 → 2.9

data/has_many_polymorphs.gemspec

@@ -1,36 +1,43 @@
-# -*- encoding: utf-8 -*-
+
+# Gem::Specification for Has_many_polymorphs-2.9
+# Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{has_many_polymorphs}
-  s.version = "2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [""]
-  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-11-18}
-  s.description = %q{An ActiveRecord plugin for self-referential and double-sided polymorphic associations.}
+  s.version = "2.9"
+  s.date = %q{2007-08-13}
+  s.summary = %q{An ActiveRecord plugin for self-referential and double-sided polymorphic associations.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "generators/tagging/templates/migration.rb", "generators/tagging/templates/tag.rb", "generators/tagging/templates/tagging.rb", "generators/tagging/templates/tagging_extensions.rb", "lib/has_many_polymorphs/association.rb", "lib/has_many_polymorphs/autoload.rb", "lib/has_many_polymorphs/class_methods.rb", "lib/has_many_polymorphs/configuration.rb", "lib/has_many_polymorphs/reflection.rb", "LICENSE", "README", "test/integration/app/doc/README_FOR_APP", "test/integration/app/README", "TODO"]
-  s.files = ["CHANGELOG", "examples/hmph.rb", "generators/tagging/tagging_generator.rb", "generators/tagging/templates/migration.rb", "generators/tagging/templates/tag.rb", "generators/tagging/templates/tag_test.rb", "generators/tagging/templates/tagging.rb", "generators/tagging/templates/tagging_extensions.rb", "generators/tagging/templates/tagging_test.rb", "generators/tagging/templates/taggings.yml", "generators/tagging/templates/tags.yml", "init.rb", "lib/has_many_polymorphs/association.rb", "lib/has_many_polymorphs/autoload.rb", "lib/has_many_polymorphs/base.rb", "lib/has_many_polymorphs/class_methods.rb", "lib/has_many_polymorphs/configuration.rb", "lib/has_many_polymorphs/debugging_tools.rb", "lib/has_many_polymorphs/rake_task_redefine_task.rb", "lib/has_many_polymorphs/reflection.rb", "lib/has_many_polymorphs/support_methods.rb", "lib/has_many_polymorphs.rb", "LICENSE", "Manifest", "Rakefile", "README", "test/fixtures/bow_wows.yml", "test/fixtures/cats.yml", "test/fixtures/eaters_foodstuffs.yml", "test/fixtures/fish.yml", "test/fixtures/frogs.yml", "test/fixtures/keep_your_enemies_close.yml", "test/fixtures/little_whale_pupils.yml", "test/fixtures/people.yml", "test/fixtures/petfoods.yml", "test/fixtures/whales.yml", "test/fixtures/wild_boars.yml", "test/generator/tagging_generator_test.rb", "test/integration/app/app/controllers/application.rb", "test/integration/app/app/controllers/bones_controller.rb", "test/integration/app/app/helpers/addresses_helper.rb", "test/integration/app/app/helpers/application_helper.rb", "test/integration/app/app/helpers/bones_helper.rb", "test/integration/app/app/helpers/sellers_helper.rb", "test/integration/app/app/helpers/states_helper.rb", "test/integration/app/app/helpers/users_helper.rb", "test/integration/app/app/models/bone.rb", "test/integration/app/app/models/double_sti_parent.rb", "test/integration/app/app/models/double_sti_parent_relationship.rb", "test/integration/app/app/models/organic_substance.rb", "test/integration/app/app/models/single_sti_parent.rb", "test/integration/app/app/models/single_sti_parent_relationship.rb", "test/integration/app/app/models/stick.rb", "test/integration/app/app/models/stone.rb", "test/integration/app/app/views/addresses/edit.html.erb", "test/integration/app/app/views/addresses/index.html.erb", "test/integration/app/app/views/addresses/new.html.erb", "test/integration/app/app/views/addresses/show.html.erb", "test/integration/app/app/views/bones/index.rhtml", "test/integration/app/app/views/layouts/addresses.html.erb", "test/integration/app/app/views/layouts/sellers.html.erb", "test/integration/app/app/views/layouts/states.html.erb", "test/integration/app/app/views/layouts/users.html.erb", "test/integration/app/app/views/sellers/edit.html.erb", "test/integration/app/app/views/sellers/index.html.erb", "test/integration/app/app/views/sellers/new.html.erb", "test/integration/app/app/views/sellers/show.html.erb", "test/integration/app/app/views/states/edit.html.erb", "test/integration/app/app/views/states/index.html.erb", "test/integration/app/app/views/states/new.html.erb", "test/integration/app/app/views/states/show.html.erb", "test/integration/app/app/views/users/edit.html.erb", "test/integration/app/app/views/users/index.html.erb", "test/integration/app/app/views/users/new.html.erb", "test/integration/app/app/views/users/show.html.erb", "test/integration/app/config/boot.rb", "test/integration/app/config/database.yml", "test/integration/app/config/environment.rb", "test/integration/app/config/environment.rb.canonical", "test/integration/app/config/environments/development.rb", "test/integration/app/config/environments/production.rb", "test/integration/app/config/environments/test.rb", "test/integration/app/config/locomotive.yml", "test/integration/app/config/routes.rb", "test/integration/app/config/ultrasphinx/default.base", "test/integration/app/config/ultrasphinx/development.conf.canonical", "test/integration/app/db/migrate/001_create_sticks.rb", "test/integration/app/db/migrate/002_create_stones.rb", "test/integration/app/db/migrate/003_create_organic_substances.rb", "test/integration/app/db/migrate/004_create_bones.rb", "test/integration/app/db/migrate/005_create_single_sti_parents.rb", "test/integration/app/db/migrate/006_create_double_sti_parents.rb", "test/integration/app/db/migrate/007_create_single_sti_parent_relationships.rb", "test/integration/app/db/migrate/008_create_double_sti_parent_relationships.rb", "test/integration/app/db/migrate/009_create_library_model.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/generators/commenting_generator_test.rb", "test/integration/app/lib/library_model.rb", "test/integration/app/public/404.html", "test/integration/app/public/500.html", "test/integration/app/public/dispatch.cgi", "test/integration/app/public/dispatch.fcgi", "test/integration/app/public/dispatch.rb", "test/integration/app/public/favicon.ico", "test/integration/app/public/images/rails.png", "test/integration/app/public/index.html", "test/integration/app/public/javascripts/application.js", "test/integration/app/public/javascripts/controls.js", "test/integration/app/public/javascripts/dragdrop.js", "test/integration/app/public/javascripts/effects.js", "test/integration/app/public/javascripts/prototype.js", "test/integration/app/public/robots.txt", "test/integration/app/public/stylesheets/scaffold.css", "test/integration/app/Rakefile", "test/integration/app/README", "test/integration/app/script/about", "test/integration/app/script/breakpointer", "test/integration/app/script/console", "test/integration/app/script/destroy", "test/integration/app/script/generate", "test/integration/app/script/performance/benchmarker", "test/integration/app/script/performance/profiler", "test/integration/app/script/plugin", "test/integration/app/script/process/inspector", "test/integration/app/script/process/reaper", "test/integration/app/script/process/spawner", "test/integration/app/script/runner", "test/integration/app/script/server", "test/integration/app/test/fixtures/double_sti_parent_relationships.yml", "test/integration/app/test/fixtures/double_sti_parents.yml", "test/integration/app/test/fixtures/organic_substances.yml", "test/integration/app/test/fixtures/single_sti_parent_relationships.yml", "test/integration/app/test/fixtures/single_sti_parents.yml", "test/integration/app/test/fixtures/sticks.yml", "test/integration/app/test/fixtures/stones.yml", "test/integration/app/test/functional/addresses_controller_test.rb", "test/integration/app/test/functional/bones_controller_test.rb", "test/integration/app/test/functional/sellers_controller_test.rb", "test/integration/app/test/functional/states_controller_test.rb", "test/integration/app/test/functional/users_controller_test.rb", "test/integration/app/test/test_helper.rb", "test/integration/app/test/unit/bone_test.rb", "test/integration/app/test/unit/double_sti_parent_relationship_test.rb", "test/integration/app/test/unit/double_sti_parent_test.rb", "test/integration/app/test/unit/organic_substance_test.rb", "test/integration/app/test/unit/single_sti_parent_relationship_test.rb", "test/integration/app/test/unit/single_sti_parent_test.rb", "test/integration/app/test/unit/stick_test.rb", "test/integration/app/test/unit/stone_test.rb", "test/integration/server_test.rb", "test/models/aquatic/fish.rb", "test/models/aquatic/pupils_whale.rb", "test/models/aquatic/whale.rb", "test/models/beautiful_fight_relationship.rb", "test/models/canine.rb", "test/models/cat.rb", "test/models/dog.rb", "test/models/eaters_foodstuff.rb", "test/models/frog.rb", "test/models/kitten.rb", "test/models/parentship.rb", "test/models/person.rb", "test/models/petfood.rb", "test/models/tabby.rb", "test/models/wild_boar.rb", "test/modules/extension_module.rb", "test/modules/other_extension_module.rb", "test/patches/symlinked_plugins_1.2.6.diff", "test/schema.rb", "test/setup.rb", "test/test_helper.rb", "test/unit/has_many_polymorphs_test.rb", "TODO", "has_many_polymorphs.gemspec"]
-  s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/has_many_polymorphs/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Has_many_polymorphs", "--main", "README"]
-  s.require_paths = ["lib"]
+  s.homepage = %q{http://blog.evanweaver.com/pages/code#polymorphs}
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.5}
-  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
-  s.summary = %q{An ActiveRecord plugin for self-referential and double-sided polymorphic associations.}
-  s.test_files = ["test/generator/tagging_generator_test.rb", "test/integration/server_test.rb", "test/unit/has_many_polymorphs_test.rb"]
+  s.description = %q{An ActiveRecord plugin for self-referential and double-sided polymorphic associations.}
+  s.has_rdoc = true
+  s.authors = [""]
+  s.files = ["test/unit/polymorph_test.rb", "test/test_helper.rb", "test/schema.rb", "test/modules/other_extension_module.rb", "test/modules/extension_module.rb", "test/models/wild_boar.rb", "test/models/tabby.rb", "test/models/petfood.rb", "test/models/kitten.rb", "test/models/frog.rb", "test/models/eaters_foodstuff.rb", "test/models/dog.rb", "test/models/cat.rb", "test/models/canine.rb", "test/models/beautiful_fight_relationship.rb", "test/models/aquatic/whale.rb", "test/models/aquatic/pupils_whale.rb", "test/models/aquatic/fish.rb", "test/fixtures/wild_boars.yml", "test/fixtures/petfoods.yml", "test/fixtures/keep_your_enemies_close.yml", "test/fixtures/frogs.yml", "test/fixtures/eaters_foodstuffs.yml", "test/fixtures/cats.yml", "test/fixtures/bow_wows.yml", "test/fixtures/aquatic/whales.yml", "test/fixtures/aquatic/little_whale_pupils.yml", "test/fixtures/aquatic/fish.yml", "lib/has_many_polymorphs.rb", "lib/has_many_polymorphs/support_methods.rb", "lib/has_many_polymorphs/reflection.rb", "lib/has_many_polymorphs/rake_task_redefine_task.rb", "lib/has_many_polymorphs/dependencies.rb", "lib/has_many_polymorphs/debugging_tools.rb", "lib/has_many_polymorphs/class_methods.rb", "lib/has_many_polymorphs/base.rb", "lib/has_many_polymorphs/autoload.rb", "lib/has_many_polymorphs/association.rb", "init.rb", "generators/tagging/templates/tags.yml", "generators/tagging/templates/taggings.yml", "generators/tagging/templates/tagging_test.rb", "generators/tagging/templates/tagging_extensions.rb", "generators/tagging/templates/tagging.rb", "generators/tagging/templates/tag_test.rb", "generators/tagging/templates/tag.rb", "generators/tagging/templates/migration.rb", "generators/tagging/tagging_generator.rb", "TODO", "README", "LICENSE", "CHANGELOG", "has_many_polymorphs.gemspec"]
+  s.test_files = ["test/test_helper.rb"]
+  s.add_dependency(%q<activerecord>, ["> 0.0.0"])
+end
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-  end
-end
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# 
+# require 'rubygems'
+# gem 'echoe', '>=2.2'
+# require 'echoe'
+# require 'lib/has_many_polymorphs/rake_task_redefine_task'
+# 
+# Echoe.new("has_many_polymorphs") do |p|  
+#   p.project = "fauna"
+#   p.summary = "An ActiveRecord plugin for self-referential and double-sided polymorphic associations."
+#   p.url = "http://blog.evanweaver.com/pages/code#polymorphs"  
+#   p.docs_host = "blog.evanweaver.com:~/www/snax/public/files/doc/"  
+#   p.dependencies = ["activerecord"]
+#   p.rdoc_pattern = /polymorphs\/association|polymorphs\/class_methods|polymorphs\/reflection|README|CHANGELOG|TODO|LICENSE|templates\/migration\.rb|templates\/tag\.rb|templates\/tagging\.rb|templates\/tagging_extensions\.rb/    
+# end
+# 
+# desc 'Run the test suite.'
+# Rake::Task.redefine_task("test") do
+#    puts "Warning! Tests must be run with the plugin installed in a functioning Rails\nenvironment."
+#    system "ruby -Ibin:lib:test test/unit/polymorph_test.rb #{ENV['METHOD'] ? "--name=#{ENV['METHOD']}" : ""}"
+# end

data/lib/has_many_polymorphs.rb

@@ -1,8 +1,6 @@
 
 require 'active_record'
 
-RAILS_DEFAULT_LOGGER = nil unless defined? RAILS_DEFAULT_LOGGER
-
 require 'has_many_polymorphs/reflection'
 require 'has_many_polymorphs/association'
 require 'has_many_polymorphs/class_methods'
@@ -14,14 +12,15 @@ class ActiveRecord::Base
   extend ActiveRecord::Associations::PolymorphicClassMethods 
 end
 
-if ENV['HMP_DEBUG'] || ENV['RAILS_ENV'] =~ /development|test/ && ENV['USER'] == 'eweaver'
+if ENV['HMP_DEBUG'] or (ENV['RAILS_ENV'] =~ /development|test/ and ENV['USER'] == 'eweaver')
+  _logger_warn "has_many_polymorphs: debug mode enabled"
   require 'has_many_polymorphs/debugging_tools' 
 end
 
 if defined? Rails and RAILS_ENV and RAILS_ROOT
-  _logger_warn "rails environment detected"
-  require 'has_many_polymorphs/configuration'
+  _logger_warn "has_many_polymorphs: Rails environment detected"
+  require 'has_many_polymorphs/dependencies'
   require 'has_many_polymorphs/autoload'
 end
 
-_logger_debug "loaded ok"
+_logger_debug "has_many_polymorphs: loaded ok"

data/lib/has_many_polymorphs/association.rb

@@ -88,19 +88,18 @@ module ActiveRecord #:nodoc:
       def construct_quoted_owner_attributes(*args) #:nodoc:
         # no access to returning() here? why not?
         type_key = @reflection.options[:foreign_type_key]
-        h = {@reflection.primary_key_name => @owner.id}
-        h[type_key] = @owner.class.base_class.name if type_key
-        h
+        {@reflection.primary_key_name => @owner.id,
+          type_key=> (@owner.class.base_class.name if type_key)}
       end
 
       def construct_from #:nodoc:
         # build the FROM part of the query, in this case, the polymorphic join table
-        @reflection.klass.quoted_table_name
+        @reflection.klass.table_name
       end
 
       def construct_owner #:nodoc:
         # the table name for the owner object's class
-        @owner.class.quoted_table_name
+        @owner.class.table_name
       end
       
       def construct_owner_key #:nodoc:
@@ -115,10 +114,10 @@ module ActiveRecord #:nodoc:
 
       def construct_joins(custom_joins = nil) #:nodoc:
         # build the string of default joins
-        "JOIN #{construct_owner} AS polymorphic_parent ON #{construct_from}.#{@reflection.options[:foreign_key]} = polymorphic_parent.#{construct_owner_key} " + 
+        "JOIN #{construct_owner} polymorphic_parent ON #{construct_from}.#{@reflection.options[:foreign_key]} = polymorphic_parent.#{construct_owner_key} " + 
         @reflection.options[:from].map do |plural|
           klass = plural._as_class
-          "LEFT JOIN #{klass.quoted_table_name} ON #{construct_from}.#{@reflection.options[:polymorphic_key]} = #{klass.quoted_table_name}.#{klass.primary_key} AND #{construct_from}.#{@reflection.options[:polymorphic_type_key]} = #{@reflection.klass.quote_value(klass.base_class.name)}"
+          "LEFT JOIN #{klass.table_name} ON #{construct_from}.#{@reflection.options[:polymorphic_key]} = #{klass.table_name}.#{klass.primary_key} AND #{construct_from}.#{@reflection.options[:polymorphic_type_key]} = #{@reflection.klass.quote_value(klass.base_class.name)}"
         end.uniq.join(" ") + " #{custom_joins}"
       end
 
@@ -154,7 +153,7 @@ module ActiveRecord #:nodoc:
         raise PolymorphicMethodNotSupportedError, "You can't associate new records."
       end      
 
-    end   
-        
+    end
+    
   end
 end

data/lib/has_many_polymorphs/autoload.rb

@@ -1,69 +1,33 @@
-require 'initializer' unless defined? ::Rails::Initializer 
-require 'action_controller/dispatcher' unless defined? ::ActionController::Dispatcher
 
-module HasManyPolymorphs
+require 'initializer'
 
-=begin rdoc    
+class Rails::Initializer
+
+=begin rdoc
 Searches for models that use <tt>has_many_polymorphs</tt> or <tt>acts_as_double_polymorphic_join</tt> and makes sure that they get loaded during app initialization. This ensures that helper methods are injected into the target classes. 
 
-Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_polymorphs_options. For example, if you need an application extension to be required before has_many_polymorphs loads your models, add an <tt>after_initialize</tt> block in <tt>config/environment.rb</tt> that appends to the <tt>'requirements'</tt> key:
-  Rails::Initializer.run do |config|     
-    # your other configuration here
-    
-    config.after_initialize do
-      config.has_many_polymorphs_options['requirements'] << 'lib/my_extension'
-    end    
-  end
-  
+Overrides Rails::Initializer#after_initialize.
 =end
 
-  DEFAULT_OPTIONS = {
-    :file_pattern => "#{RAILS_ROOT}/app/models/**/*.rb",
-    :file_exclusions => ['svn', 'CVS', 'bzr'],
-    :methods => ['has_many_polymorphs', 'acts_as_double_polymorphic_join'],
-    :requirements => []}
-  
-  mattr_accessor :options
-  @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)      
-
-  # Dispatcher callback to load polymorphic relationships from the top down.
-  def self.autoload
-
-    _logger_debug "autoload hook invoked"
-    
-    options[:requirements].each do |requirement|
-      _logger_warn "forcing requirement load of #{requirement}"
-      require requirement
-    end
+  def after_initialize_with_autoload
+    after_initialize_without_autoload
   
-    Dir.glob(options[:file_pattern]).each do |filename|
-      next if filename =~ /#{options[:file_exclusions].join("|")}/
+    _logger_debug "has_many_polymorphs: autoload hook invoked"
+    Dir["#{RAILS_ROOT}/app/models/**/*.rb"].each do |filename|
+      next if filename =~ /svn|CVS|bzr/
       open filename do |file|
-        if file.grep(/#{options[:methods].join("|")}/).any?
+        if file.grep(/has_many_polymorphs|acts_as_double_polymorphic_join/).any?
           begin
-            model = File.basename(filename)[0..-4].camelize
-            _logger_warn "preloading parent model #{model}"
+            model = File.basename(filename)[0..-4].classify
+            _logger_warn "has_many_polymorphs: preloading parent model #{model}"
             model.constantize
           rescue Object => e
-            _logger_warn "#{model} could not be preloaded: #{e.inspect}"
+            _logger_warn "has_many_polymorphs: WARNING; possibly critical error preloading #{model}: #{e.inspect}"
           end
         end
       end
     end
   end  
-    
-end
-
-class Rails::Initializer #:nodoc:
-  # Make sure it gets loaded in the console, tests, and migrations
-  def after_initialize_with_autoload 
-    after_initialize_without_autoload
-    HasManyPolymorphs.autoload
-  end
-  alias_method_chain :after_initialize, :autoload 
-end
-
-ActionController::Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
-  # Make sure it gets loaded in the app
-  HasManyPolymorphs.autoload
+  
+  alias_method_chain :after_initialize, :autoload
 end

data/lib/has_many_polymorphs/base.rb

@@ -5,7 +5,7 @@ module ActiveRecord
     class << self
     
       # Interprets a polymorphic row from a unified SELECT, returning the appropriate ActiveRecord instance. Overrides ActiveRecord::Base.instantiate_without_callbacks.
-      def instantiate_with_polymorphic_checks(record)
+      def instantiate_without_callbacks_with_polymorphic_checks(record)
         if record['polymorphic_parent_class']
           reflection = record['polymorphic_parent_class'].constantize.reflect_on_association(record['polymorphic_association_id'].to_sym)
 #          _logger_debug "Instantiating a polymorphic row for #{record['polymorphic_parent_class']}.reflect_on_association(:#{record['polymorphic_association_id']})"
@@ -37,23 +37,13 @@ module ActiveRecord
           # allocate and assign values
           returning(klass.allocate) do |obj|
             obj.instance_variable_set("@attributes", record)
-            obj.instance_variable_set("@attributes_cache", Hash.new)
-            
-            if obj.respond_to_without_attributes?(:after_find)
-              obj.send(:callback, :after_find)
-            end
-            
-            if obj.respond_to_without_attributes?(:after_initialize)
-              obj.send(:callback, :after_initialize)
-            end
-            
           end
         else                       
-          instantiate_without_polymorphic_checks(record)
+          instantiate_without_callbacks_without_polymorphic_checks(record)
         end
       end
       
-      alias_method_chain :instantiate, :polymorphic_checks 
+      alias_method_chain :instantiate_without_callbacks, :polymorphic_checks 
     end
     
   end

data/lib/has_many_polymorphs/class_methods.rb

@@ -12,17 +12,14 @@ STI association targets must enumerated and named. For example, if Dog and Cat b
 
 Namespaced models follow the Rails <tt>underscore</tt> convention. ZooAnimal::Lion becomes <tt>:'zoo_animal/lion'</tt>.
 
-You do not need to set up any other associations other than for either the regular method or the double. The join associations and all individual and reverse associations are generated for you. However, a join model and table are required. 
-
-There is a tentative report that you can make the parent model be its own join model, but this is untested.
+You do not need to set up any other associations other than for either the regular method or the double. The join associations and all individual and reverse associations are generated for you. However, a join class and table is required. There are tentative reports that it works without it if you make the parent class join to the targets <tt>:through</tt> itself, but this is untested.
 
 =end
 
    module PolymorphicClassMethods
    
-     RESERVED_DOUBLES_KEYS = [:conditions, :order, :limit, :offset, :extend, :skip_duplicates, 
-                                   :join_extend, :dependent, :rename_individual_collections,
-                                   :namespace] #:nodoc:
+     RESERVED_KEYS = [:conditions, :order, :limit, :offset, :extend, :skip_duplicates, 
+                                   :join_extend, :dependent, :rename_individual_collections] #:nodoc:
  
 =begin rdoc
 
@@ -55,22 +52,41 @@ These options are passed through to targets on both sides of the association. If
 <tt>:order</tt>:: A string for the SQL <tt>ORDER BY</tt> clause.
 <tt>:limit</tt>:: An integer. Affects the polymorphic and individual associations.
 <tt>:offset</tt>:: An integer. Only affects the polymorphic association.
-<tt>:namespace</tt>:: A symbol. Prepended to all the models in the <tt>:from</tt> and <tt>:through</tt> keys. This is especially useful for Camping, which namespaces models by default.
-
+  
 =end
 
-      def acts_as_double_polymorphic_join options={}, &extension      
+      def acts_as_double_polymorphic_join options={}, &extension     
         
-        collections, options = extract_double_collections(options)
+        collections = options._select {|k,v| v.is_a? Array and k.to_s !~ /(#{RESERVED_KEYS.map(&:to_s).join('|')})$/}      
+        raise PolymorphicError, "Couldn't understand options in acts_as_double_polymorphic_join. Valid parameters are your two class collections, and then #{RESERVED_KEYS.inspect[1..-2]}, with optionally your collection names prepended and joined with an underscore." unless collections.size == 2
         
-        # handle the block
-        options[:extend] = (if options[:extend]
-          Array(options[:extend]) + [extension]
-        else 
-          extension
-        end) if extension 
-        
-        collection_option_keys = make_general_option_keys_specific!(options, collections)
+        options = options._select {|k,v| !collections[k]}
+        options[:extend] = (options[:extend] ? Array(options[:extend]) + [extension] : extension) if extension # inline the block
+          
+        collection_option_keys = Hash[*collections.keys.map do |key|
+          [key, RESERVED_KEYS.map{|option| "#{key}_#{option}".to_sym}] 
+        end._flatten_once]    
+      
+        collections.keys.each do |collection|      
+          options.each do |key, value|
+            next if collection_option_keys.values.flatten.include? key
+            # shift the general options to the individual sides
+            collection_value = options[collection_key = "#{collection}_#{key}".to_sym]
+            case key
+              when :conditions
+                collection_value, value = sanitize_sql(collection_value), sanitize_sql(value)
+                options[collection_key] = (collection_value ? "(#{collection_value}) AND (#{value})" : value)
+              when :order
+                options[collection_key] = (collection_value ? "#{collection_value}, #{value}" : value)
+              when :extend, :join_extend
+                options[collection_key] = Array(collection_value) + Array(value)
+              when :limit, :offset, :dependent, :rename_individual_collections
+                options[collection_key] ||= value
+              else
+                raise PolymorphicError, "Unknown option key #{key.inspect}."
+            end     
+          end
+        end
   
         join_name = self.name.tableize.to_sym
         collections.each do |association_id, children|
@@ -81,7 +97,7 @@ These options are passed through to targets on both sides of the association. If
           rescue NoMethodError
             raise PolymorphicError, "Couldn't find 'belongs_to' association for :#{parent_hash_key._singularize} in #{self.name}." unless parent_foreign_key
           end
-
+  
           parents = collections[parent_hash_key]
           conflicts = (children & parents) # set intersection          
           parents.each do |plural_parent_name| 
@@ -89,31 +105,19 @@ These options are passed through to targets on both sides of the association. If
             parent_class = plural_parent_name._as_class
             singular_reverse_association_id = parent_hash_key._singularize 
               
-            internal_options = {
-              :is_double => true,
-              :from => children, 
-              :as => singular_reverse_association_id,
-              :through => join_name.to_sym, 
-              :foreign_key => parent_foreign_key, 
-              :foreign_type_key => parent_foreign_key.to_s.sub(/_id$/, '_type'),
-              :singular_reverse_association_id => singular_reverse_association_id,
-              :conflicts => conflicts
-            }
-            
-            general_options = Hash[*options._select do |key, value|
-              collection_option_keys[association_id].include? key and !value.nil?
-            end.map do |key, value|
-              [key.to_s[association_id.to_s.length+1..-1].to_sym, value]
-            end._flatten_once] # rename side-specific options to general names
-            
-            general_options.each do |key, value|
-              # avoid clobbering keys that appear in both option sets
-              if internal_options[key]
-                general_options[key] = Array(value) + Array(internal_options[key])
-              end
-            end
-
-            parent_class.send(:has_many_polymorphs, association_id, internal_options.merge(general_options))
+            parent_class.send(:has_many_polymorphs, 
+              association_id, {:is_double => true,
+                                  :from => children, 
+                                  :as => singular_reverse_association_id,
+                                  :through => join_name.to_sym, 
+                                  :foreign_key => parent_foreign_key, 
+                                  :foreign_type_key => parent_foreign_key.to_s.sub(/_id$/, '_type'),
+                                  :singular_reverse_association_id => singular_reverse_association_id,
+                                  :conflicts => conflicts}.merge(Hash[*options._select do |key, value|
+                                    collection_option_keys[association_id].include? key and !value.nil?
+                                  end.map do |key, value|
+                                    [key.to_s[association_id.to_s.length+1..-1].to_sym, value]
+                                  end._flatten_once])) # rename side-specific options to general names
   
             if conflicts.include? plural_parent_name 
               # unify the alternate sides of the conflicting children
@@ -124,7 +128,7 @@ These options are passed through to targets on both sides of the association. If
                       self.send("#{association_id._singularize}_#{method_name}")).freeze
                   end
                 end     
-              end            
+              end
               
               # unify the join model... join model is always renamed for doubles, unlike child associations
               unless parent_class.instance_methods.include?(join_name)
@@ -142,54 +146,6 @@ These options are passed through to targets on both sides of the association. If
           end
         end
       end
-      
-      private
-      
-      def extract_double_collections(options)
-        collections = options._select do |key, value| 
-          value.is_a? Array and key.to_s !~ /(#{RESERVED_DOUBLES_KEYS.map(&:to_s).join('|')})$/
-        end
-        
-        raise PolymorphicError, "Couldn't understand options in acts_as_double_polymorphic_join. Valid parameters are your two class collections, and then #{RESERVED_DOUBLES_KEYS.inspect[1..-2]}, with optionally your collection names prepended and joined with an underscore." unless collections.size == 2
-        
-        options = options._select do |key, value| 
-          !collections[key]
-        end
-        
-        [collections, options]
-      end
-      
-      def make_general_option_keys_specific!(options, collections)
-        collection_option_keys = Hash[*collections.keys.map do |key|
-          [key, RESERVED_DOUBLES_KEYS.map{|option| "#{key}_#{option}".to_sym}] 
-        end._flatten_once]    
-      
-        collections.keys.each do |collection|      
-          options.each do |key, value|
-            next if collection_option_keys.values.flatten.include? key
-            # shift the general options to the individual sides
-            collection_key = "#{collection}_#{key}".to_sym
-            collection_value = options[collection_key]
-            case key
-              when :conditions
-                collection_value, value = sanitize_sql(collection_value), sanitize_sql(value)
-                options[collection_key] = (collection_value ? "(#{collection_value}) AND (#{value})" : value)
-              when :order
-                options[collection_key] = (collection_value ? "#{collection_value}, #{value}" : value)
-              when :extend, :join_extend
-                options[collection_key] = Array(collection_value) + Array(value)
-              else
-                options[collection_key] ||= value
-            end     
-          end
-        end
-        
-        collection_option_keys
-      end
-      
-      
-      
-      public
 
 =begin rdoc
 
@@ -201,45 +157,36 @@ This method createds a single-sided polymorphic relationship.
 
 The only required parameter, aside from the association name, is <tt>:from</tt>. 
 
-The method generates a number of associations aside from the polymorphic one. In this example Petfood also gets <tt>dogs</tt>, <tt>cats</tt>, and <tt>birds</tt>, and Dog, Cat, and Bird get <tt>petfoods</tt>. (The reverse association to the parents is always plural.)
+The method generates a number of associations aside from the polymorphic one. In this example Petfood also gets <tt>dogs</tt>, <tt>cats</tt>, and <tt>birds</tt>, and Dog, Cat, and Bird get <tt>petfoods</tt>. (The reverse association to the parent is always plural.)
 
 == Available options
 
-<tt>:from</tt>:: An array of symbols representing the target models. Required.
+<tt>:from</tt>:: An array of symbols representing the target classes. Required.
 <tt>:as</tt>:: A symbol for the parent's interface in the join--what the parent 'acts as'.
 <tt>:through</tt>:: A symbol representing the class of the join model. Follows Rails defaults if not supplied (the parent and the association names, alphabetized, concatenated with an underscore, and singularized).
+<tt>:foreign_key</tt>:: The column name for the parent's id in the join. 
+<tt>:foreign_type_key</tt>:: The column name for the parent's class in the join, if the parent itself is polymorphic. Rarely needed.
+<tt>:polymorphic_key</tt>:: The column name for the child's id in the join.
+<tt>:polymorphic_type_key</tt>:: The column name for the child's class in the join.
 <tt>:dependent</tt>:: Accepts <tt>:destroy</tt>, <tt>:nullify</tt>, <tt>:delete_all</tt>. Controls how the join record gets treated on any associate delete (whether from the polymorph or from an individual collection); defaults to <tt>:destroy</tt>.
 <tt>:skip_duplicates</tt>:: If <tt>true</tt>, will check to avoid pushing already associated records (but also triggering a database load). Defaults to <tt>true</tt>.
 <tt>:rename_individual_collections</tt>:: If <tt>true</tt>, all individual collections are prepended with the polymorph name, and the children's parent collection is appended with "_of_#{association_name}"</tt>. For example, <tt>zoos</tt> becomes <tt>zoos_of_animals</tt>. This is to help avoid method name collisions in crowded classes.
 <tt>:extend</tt>:: One or an array of mixed modules and procs, which are applied to the polymorphic association (usually to define custom methods).
 <tt>:join_extend</tt>:: One or an array of mixed modules and procs, which are applied to the join association.
-<tt>:parent_extend</tt>:: One or an array of mixed modules and procs, which are applied to the target models' association to the parents.
+<tt>:parent_extend</tt>:: One or an array of mixed modules and procs, which are applied to the target classes' association to the parent.
 <tt>:conditions</tt>:: An array or string of conditions for the SQL <tt>WHERE</tt> clause. 
-<tt>:parent_conditions</tt>:: An array or string of conditions which are applied to the target models' association to the parents.
 <tt>:order</tt>:: A string for the SQL <tt>ORDER BY</tt> clause.
-<tt>:parent_order</tt>:: A string for the SQL <tt>ORDER BY</tt> which is applied to the target models' association to the parents.
 <tt>:group</tt>:: An array or string of conditions for the SQL <tt>GROUP BY</tt> clause. Affects the polymorphic and individual associations.
 <tt>:limit</tt>:: An integer. Affects the polymorphic and individual associations.
 <tt>:offset</tt>:: An integer. Only affects the polymorphic association.
-<tt>:namespace</tt>:: A symbol. Prepended to all the models in the <tt>:from</tt> and <tt>:through</tt> keys. This is especially useful for Camping, which namespaces models by default.
 <tt>:uniq</tt>:: If <tt>true</tt>, the records returned are passed through a pure-Ruby <tt>uniq</tt> before they are returned. Rarely needed.
-<tt>:foreign_key</tt>:: The column name for the parent's id in the join. 
-<tt>:foreign_type_key</tt>:: The column name for the parent's class name in the join, if the parent itself is polymorphic. Rarely needed--if you're thinking about using this, you almost certainly want to use <tt>acts_as_double_polymorphic_join()</tt> instead.
-<tt>:polymorphic_key</tt>:: The column name for the child's id in the join.
-<tt>:polymorphic_type_key</tt>:: The column name for the child's class name in the join.
 
 If you pass a block, it gets converted to a Proc and added to <tt>:extend</tt>. 
 
-== On condition nullification
-
-When you request an individual association, non-applicable but fully-qualified fields in the polymorphic association's <tt>:conditions</tt>, <tt>:order</tt>, and <tt>:group</tt> options get changed to <tt>NULL</tt>. For example, if you set <tt>:conditions => "dogs.name != 'Spot'"</tt>, when you request <tt>.cats</tt>, the conditions string is changed to <tt>NULL != 'Spot'</tt>. 
-
-Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQL's 3-value logic. Instead, you need to use the <tt>:conditions</tt> string <tt>"dogs.name IS NULL OR dogs.name != 'Spot'"</tt> to get the behavior you probably expect for negative matches.
-
 =end
 
       def has_many_polymorphs (association_id, options = {}, &extension)
-        _logger_debug "associating #{self}.#{association_id}"
+        _logger_debug "has_many_polymorphs: associating #{self}.#{association_id}"
         reflection = create_has_many_polymorphs_reflection(association_id, options, &extension)
         # puts "Created reflection #{reflection.inspect}"
         # configure_dependency_for_has_many(reflection)
@@ -272,8 +219,6 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
           :select, # applies to the polymorphic relationship
           :conditions, # applies to the polymorphic relationship, the children, and the join
   #        :include,
-          :parent_conditions,
-          :parent_order,
           :order, # applies to the polymorphic relationship, the children, and the join
           :group, # only applies to the polymorphic relationship and the children
           :limit, # only applies to the polymorphic relationship and the children
@@ -283,7 +228,6 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
           :parent_limit,
           :parent_offset,
   #        :source,
-          :namespace,
           :uniq, # XXX untested, only applies to the polymorphic relationship
   #        :finder_sql,
   #        :counter_sql,
@@ -298,13 +242,13 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         raise PolymorphicError, ":from option must be an array" unless options[:from].is_a? Array            
         options[:from].each{|plural| verify_pluralization_of(plural)}
   
-        options[:as] ||= self.name.demodulize.underscore.to_sym
+        options[:as] ||= self.name.demodulize.downcase.to_sym
         options[:conflicts] = Array(options[:conflicts])      
         options[:foreign_key] ||= "#{options[:as]}_id"
         
         options[:association_foreign_key] = 
           options[:polymorphic_key] ||= "#{association_id._singularize}_id"
-        options[:polymorphic_type_key] ||= "#{association_id._singularize}_type"
+        options[:polymorphic_type_key] ||= "#{association_id._singularize}_type"      
         
         if options.has_key? :ignore_duplicates
           _logger_warn "DEPRECATION WARNING: please use :skip_duplicates instead of :ignore_duplicates"
@@ -314,20 +258,9 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         options[:dependent] = :destroy unless options.has_key? :dependent
         options[:conditions] = sanitize_sql(options[:conditions])
         
-        # options[:finder_sql] ||= "(options[:polymorphic_key]
-        
-        options[:through] ||= build_join_table_symbol(association_id, (options[:as]._pluralize or self.table_name))
-        
-        # set up namespaces if we have a namespace key
-        # XXX needs test coverage
-        if options[:namespace]
-          namespace = options[:namespace].to_s.chomp("/") + "/"
-          options[:from].map! do |child|
-            "#{namespace}#{child}".to_sym
-          end
-          options[:through] = "#{namespace}#{options[:through]}".to_sym
-        end
-        
+  #      options[:finder_sql] ||= "(options[:polymorphic_key]
+  
+        options[:through] ||= build_join_table_symbol((options[:as]._pluralize or self.table_name), association_id)
         options[:join_class_name] ||= options[:through]._classify      
         options[:table_aliases] ||= build_table_aliases([options[:through]] + options[:from])
         options[:select] ||= build_select(association_id, options[:table_aliases]) 
@@ -340,7 +273,11 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         options[:parent_extend] = spiked_create_extension_module(association_id, Array(options[:parent_extend]), "Parent") 
         
         # create the reflection object      
-        returning(create_reflection(:has_many_polymorphs, association_id, options, self)) do |reflection|          
+        returning(create_reflection(:has_many_polymorphs, association_id, options, self)) do |reflection|
+          if defined? Dependencies and RAILS_ENV == "development"                    
+            inject_dependencies(association_id, reflection) if Dependencies.mechanism == :load
+          end
+          
           # set up the other related associations      
           create_join_association(association_id, reflection)
           create_has_many_through_associations_for_parent_to_children(association_id, reflection)
@@ -357,17 +294,9 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         # for the targets
         returning({}) do |aliases|
           from.map(&:to_s).sort.map(&:to_sym).each_with_index do |plural, t_index|
-            begin
-              table = plural._as_class.table_name
-            rescue NameError => e
-              raise PolymorphicError, "Could not find a valid class for #{plural.inspect} (tried #{plural.to_s._classify}). If it's namespaced, be sure to specify it as :\"module/#{plural}\" instead."
-            end
-            begin
-              plural._as_class.columns.map(&:name).each_with_index do |field, f_index|
-                aliases["#{table}.#{field}"] = "t#{t_index}_r#{f_index}"
-              end
-            rescue ActiveRecord::StatementInvalid => e
-              _logger_warn "Looks like your table doesn't exist for #{plural.to_s._classify}.\nError #{e}\nSkipping..."
+            table = plural._as_class.table_name
+            plural._as_class.columns.map(&:name).each_with_index do |field, f_index|
+              aliases["#{table}.#{field}"] = "t#{t_index}_r#{f_index}"
             end
           end
         end
@@ -381,37 +310,43 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
           "#{table} AS #{_alias}"
         end.sort).join(", ")
       end
-       
+  
+      # model caching         
+      def inject_dependencies(association_id, reflection)
+        _logger_debug "has_many_polymorphs: injecting dependencies"
+        requirements = [self, reflection.klass].map{|klass| [klass, klass.base_class]}.flatten.uniq
+        (all_classes_for(association_id, reflection) - requirements).each do |target_klass|
+          Dependencies.inject_dependency(target_klass, *requirements)        
+        end
+      end
+     
       # method sub-builders
    
       def create_join_association(association_id, reflection)
   
-        options = {
-          :foreign_key => reflection.options[:foreign_key], 
+        options = {:foreign_key => reflection.options[:foreign_key], 
           :dependent => reflection.options[:dependent], 
           :class_name => reflection.klass.name, 
-          :extend => reflection.options[:join_extend]
-          # :limit => reflection.options[:limit],
-          # :offset => reflection.options[:offset],
-          # :order => devolve(association_id, reflection, reflection.options[:order], reflection.klass, true),
-          # :conditions => devolve(association_id, reflection, reflection.options[:conditions], reflection.klass, true)
-          }
+          :extend => reflection.options[:join_extend],
+  #        :limit => reflection.options[:limit],
+  #        :offset => reflection.options[:offset],
+          :order => devolve(association_id, reflection, reflection.options[:order], reflection.klass),
+          :conditions => devolve(association_id, reflection, reflection.options[:conditions], reflection.klass)
+          }        
           
         if reflection.options[:foreign_type_key]         
-          type_check = "#{reflection.options[:join_class_name].constantize.quoted_table_name}.#{reflection.options[:foreign_type_key]} = #{quote_value(self.base_class.name)}"
+          type_check = "#{reflection.options[:foreign_type_key]} = #{quote_value(self.base_class.name)}"
           conjunction = options[:conditions] ? " AND " : nil
           options[:conditions] = "#{options[:conditions]}#{conjunction}#{type_check}"
-          options[:as] = reflection.options[:as]
         end
-        
-        has_many(reflection.options[:through], options)
-        
+  
+        has_many(reflection.options[:through], options)      
         inject_before_save_into_join_table(association_id, reflection)          
       end
       
       def inject_before_save_into_join_table(association_id, reflection)
         sti_hook = "sti_class_rewrite"
-        rewrite_procedure = %[self.send(:#{reflection.options[:polymorphic_type_key]}=, self.#{reflection.options[:polymorphic_type_key]}.constantize.base_class.name)]
+        rewrite_procedure = %[self.send(:#{association_id._singularize}_type=, self.#{association_id._singularize}_type.constantize.base_class.name)]
         
         # XXX should be abstracted?
         reflection.klass.class_eval %[          
@@ -452,34 +387,27 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
               through = "#{reflection.options[:through]}#{'_as_child' if parent == self}".to_sym
               has_many(through,
                 :as => association_id._singularize, 
-#                :source => association_id._singularize, 
-#                :source_type => reflection.options[:polymorphic_type_key], 
                 :class_name => reflection.klass.name,
                 :dependent => reflection.options[:dependent], 
                 :extend => reflection.options[:join_extend],
   #              :limit => reflection.options[:limit],
   #              :offset => reflection.options[:offset],
-                :order => devolve(association_id, reflection, reflection.options[:parent_order], reflection.klass),
-                :conditions => devolve(association_id, reflection, reflection.options[:parent_conditions], reflection.klass)
+                :order => devolve(association_id, reflection, reflection.options[:order], reflection.klass),
+                :conditions => devolve(association_id, reflection, reflection.options[:conditions], reflection.klass)
                 )
   
-              # the association to the target's parents
+              # the association to the collection parents
               association = "#{reflection.options[:as]._pluralize}#{"_of_#{association_id}" if reflection.options[:rename_individual_collections]}".to_sym                        
               has_many(association, 
                 :through => through, 
                 :class_name => parent.name,
                 :source => reflection.options[:as], 
-                :foreign_key => reflection.options[:foreign_key],
+                :foreign_key => reflection.options[:foreign_key] ,
                 :extend => reflection.options[:parent_extend],
-                :conditions => reflection.options[:parent_conditions],
                 :order => reflection.options[:parent_order],
                 :offset => reflection.options[:parent_offset],
                 :limit => reflection.options[:parent_limit],
                 :group => reflection.options[:parent_group])
-                
-#                debugger if association == :parents
-#                
-#                nil
                       
             end                    
           end
@@ -524,8 +452,8 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         end
       end
   
-      # some support methods
-            
+      # some support methods    
+      
       def child_pluralization_map(association_id, reflection)
         Hash[*reflection.options[:from].map do |plural|
           [plural,  plural._singularize]
@@ -542,8 +470,8 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         s.to_s.gsub('/', '_').to_sym
       end
               
-      def build_join_table_symbol(association_id, name)
-        [name.to_s, association_id.to_s].sort.join("_").to_sym
+      def build_join_table_symbol(a, b)
+        [a.to_s, b.to_s].sort.join("_").to_sym
       end
       
       def all_classes_for(association_id, reflection)
@@ -552,25 +480,18 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         klasses.uniq
       end
       
-      def devolve(association_id, reflection, string, klass, remove_inappropriate_clauses = false) 
-        # XXX remove_inappropriate_clauses is not implemented; we'll wait until someone actually needs it
+      def devolve(association_id, reflection, string, klass)
         return unless string
-        string = string.dup
-        # _logger_debug "devolving #{string} for #{klass}"
-        inappropriate_classes = (all_classes_for(association_id, reflection) - # the join class must always be preserved
-          [klass, klass.base_class, reflection.klass, reflection.klass.base_class])
-        inappropriate_classes.map do |klass|
+        (all_classes_for(association_id, reflection) - # the join class must always be preserved
+          [klass, klass.base_class, reflection.klass, reflection.klass.base_class]).map do |klass|
           klass.columns.map do |column| 
             [klass.table_name, column.name]
           end.map do |table, column|
             ["#{table}.#{column}", "`#{table}`.#{column}", "#{table}.`#{column}`", "`#{table}`.`#{column}`"]
           end
         end.flatten.sort_by(&:size).reverse.each do |quoted_reference|        
-          # _logger_debug "devolved #{quoted_reference} to NULL"
-          # XXX clause removal would go here 
           string.gsub!(quoted_reference, "NULL")
         end
-        # _logger_debug "altered to #{string}"
         string
       end