has_many_polymorphs 2.12 → 2.13

data/CHANGELOG

@@ -1,3 +1,4 @@
+v2.13. Merge various fixes for Rails 2.2.2.
 
 v2.12. Improvements to the test suite; bugfixes for STI children (rsl). Remove fancy dependency system in favor of using Dispatcher::to_prepare every time.
 

data/Manifest

@@ -22,6 +22,7 @@ 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
@@ -92,10 +93,8 @@ 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/db/schema.rb
 test/integration/app/doc/README_FOR_APP
 test/integration/app/generators/commenting_generator_test.rb
-test/integration/app/hmp_development
 test/integration/app/lib/library_model.rb
 test/integration/app/public/404.html
 test/integration/app/public/500.html

data/README

@@ -1,13 +1,14 @@
-
 Has_many_polymorphs
 
 An ActiveRecord plugin for self-referential and double-sided polymorphic associations.
 
 == License
 
-Copyright 2007 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. 
+Copyright 2006-2008 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. 
+
+The public certificate for the gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem]. 
 
-The public certificate for this gem is at http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem.
+If you use this software, please {make a donation}[http://blog.evanweaver.com/donate/], or {recommend Evan}[http://www.workingwithrails.com/person/7739-evan-weaver] at Working with Rails.
 
 == Description
 
@@ -28,14 +29,14 @@ The plugin also includes a generator for a tagging system, a common use case (se
 
 == Requirements
 
-* Rails 1.2.3 or greater
+* Rails 2.2.2 or greater
 
 = Usage
 
 == Installation
 
 To install the Rails plugin, run:
-  script/plugin install svn://rubyforge.org/var/svn/fauna/has_many_polymorphs/trunk
+  script/plugin install git://github.com/fauna/has_many_polymorphs.git
 
 There's also a gem version. To install it instead, run: 
   sudo gem install has_many_polymorphs
@@ -187,7 +188,7 @@ Note that because of the way Rails reloads model classes, the plugin can sometim
 
 == Reporting problems
 
-* http://rubyforge.org/forum/forum.php?forum_id=16450
+The support forum is here[http://rubyforge.org/forum/forum.php?forum_id=16450].
 
 Patches and contributions are very welcome. Please note that contributors are required to assign copyright for their additions to Cloudburst, LLC.
 

data/Rakefile

@@ -0,0 +1,28 @@
+
+require 'echoe'
+
+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/files/doc/fauna/has_many_polymorphs/"  
+  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"  
+  p.dependencies = ["activerecord"]
+  p.rdoc_pattern = /polymorphs\/association|polymorphs\/class_methods|polymorphs\/reflection|polymorphs\/autoload|polymorphs\/configuration|README|CHANGELOG|TODO|LICENSE|templates\/migration\.rb|templates\/tag\.rb|templates\/tagging\.rb|templates\/tagging_extensions\.rb/    
+  p.require_signed = true
+  p.clean_pattern += ["**/ruby_sess*", "**/generated_models/**"]
+  p.test_pattern = ["test/unit/*_test.rb", "test/integration/*_test.rb", "test/generator/*_test.rb"]
+end
+
+desc "Run all the tests for every database adapter" 
+task "test_all" do
+  ['mysql', 'postgresql', 'sqlite3'].each do |adapter|
+    ENV['DB'] = adapter
+    ENV['PRODUCTION'] = nil
+    STDERR.puts "#{'='*80}\nDevelopment mode for #{adapter}\n#{'='*80}"
+    system("rake test:multi_rails:all")
+  
+    ENV['PRODUCTION'] = '1'
+    STDERR.puts "#{'='*80}\nProduction mode for #{adapter}\n#{'='*80}"
+    system("rake test:multi_rails:all")    
+  end
+end

data/generators/tagging/templates/tagging_extensions.rb

@@ -1,4 +1,3 @@
-
 class ActiveRecord::Base #:nodoc:
 
   # These extensions make models taggable. This file is automatically generated and required by your app if you run the tagging generator included with has_many_polymorphs.
@@ -13,7 +12,7 @@ class ActiveRecord::Base #:nodoc:
         begin
           tag = Tag.find_or_create_by_name(tag_name)
           raise Tag::Error, "tag could not be saved: #{tag_name}" if tag.new_record?
-          tag.taggables << self
+          tags << tag
         rescue ActiveRecord::StatementInvalid => e
           raise unless e.to_s =~ /duplicate/i
         end
@@ -66,7 +65,11 @@ class ActiveRecord::Base #:nodoc:
       <%= parent_association_name -%>s.to_s
       #:startdoc:
     end
-    
+
+    def tag_list=(value)
+        tag_with(value)
+    end    
+
     private 
     
     def tag_cast_to_string obj #:nodoc:
@@ -101,13 +104,14 @@ class ActiveRecord::Base #:nodoc:
   end
   
   module TaggingFinders
-    # 
     # Find all the objects tagged with the supplied list of tags
     # 
     # Usage : Model.tagged_with("ruby")
     #         Model.tagged_with("hello", "world")
     #         Model.tagged_with("hello", "world", :limit => 10)
     #
+    # XXX This query strategy is not performant, and needs to be rewritten as an inverted join or a series of unions
+    # 
     def tagged_with(*tag_list)
       options = tag_list.last.is_a?(Hash) ? tag_list.pop : {}
       tag_list = parse_tags(tag_list)
@@ -119,17 +123,22 @@ class ActiveRecord::Base #:nodoc:
       sql  = "SELECT #{(scope && scope[:select]) || options[:select]} "
       sql << "FROM #{(scope && scope[:from]) || options[:from]} "
 
-      add_joins!(sql, options, scope)
+      add_joins!(sql, options[:joins], scope)
       
       sql << "WHERE #{table_name}.#{primary_key} = taggings.taggable_id "
       sql << "AND taggings.taggable_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s}' "
       sql << "AND taggings.tag_id = tags.id "
       
-      tag_list_condition = tag_list.map {|t| "'#{t}'"}.join(", ")
+      tag_list_condition = tag_list.map {|name| "'#{name}'"}.join(", ")
       
       sql << "AND (tags.name IN (#{sanitize_sql(tag_list_condition)})) "
       sql << "AND #{sanitize_sql(options[:conditions])} " if options[:conditions]
-      sql << "GROUP BY #{table_name}.id "
+      
+      columns = column_names.map do |column| 
+        "#{table_name}.#{column}"
+      end.join(", ")
+      
+      sql << "GROUP BY #{columns} "
       sql << "HAVING COUNT(taggings.tag_id) = #{tag_list.size}"
       
       add_order!(sql, options[:order], scope)
@@ -138,6 +147,47 @@ class ActiveRecord::Base #:nodoc:
       
       find_by_sql(sql)
     end
+   
+   def self.tagged_with_any(*tag_list)
+     options = tag_list.last.is_a?(Hash) ? tag_list.pop : {}
+     tag_list = parse_tags(tag_list)
+   
+     scope = scope(:find)
+     options[:select] ||= "#{table_name}.*"
+     options[:from] ||= "#{table_name}, meta_tags, taggings"
+   
+     sql  = "SELECT #{(scope && scope[:select]) || options[:select]} "
+     sql << "FROM #{(scope && scope[:from]) || options[:from]} "
+
+     add_joins!(sql, options, scope)
+   
+     sql << "WHERE #{table_name}.#{primary_key} = taggings.taggable_id "
+     sql << "AND taggings.taggable_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s}' "
+     sql << "AND taggings.meta_tag_id = meta_tags.id "
+     
+     sql << "AND ("
+     or_options = []
+     tag_list.each do |name|
+       or_options << "meta_tags.name = '#{name}'"
+     end
+     or_options_joined = or_options.join(" OR ")
+     sql << "#{or_options_joined}) "
+     
+     
+     sql << "AND #{sanitize_sql(options[:conditions])} " if options[:conditions]
+      
+     columns = column_names.map do |column| 
+       "#{table_name}.#{column}"
+     end.join(", ")
+      
+     sql << "GROUP BY #{columns} "
+   
+     add_order!(sql, options[:order], scope)
+     add_limit!(sql, options, scope)
+     add_lock!(sql, options, scope)
+   
+     find_by_sql(sql)
+   end
     
     def parse_tags(tags)
       return [] if tags.blank?

data/has_many_polymorphs.gemspec

@@ -1,58 +1,40 @@
-
-# Gem::Specification for Has_many_polymorphs-2.12
-# Originally generated by Echoe
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{has_many_polymorphs}
-  s.version = "2.12"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "2.13"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
-  s.date = %q{2008-01-16}
+  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
+  s.date = %q{2009-02-02}
   s.description = %q{An ActiveRecord plugin for self-referential and double-sided polymorphic associations.}
   s.email = %q{}
-  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", "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/db/schema.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/generators/commenting_generator_test.rb", "test/integration/app/hmp_development", "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.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.has_rdoc = true
   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.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.0.1}
+  s.rubygems_version = %q{1.3.1}
+  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.add_dependency(%q<activerecord>, [">= 0"])
-end
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# 
-# require 'echoe'
-# 
-# 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/files/doc/fauna/has_many_polymorphs/"  
-#   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"  
-#   p.dependencies = ["activerecord"]
-#   p.rdoc_pattern = /polymorphs\/association|polymorphs\/class_methods|polymorphs\/reflection|polymorphs\/autoload|polymorphs\/configuration|README|CHANGELOG|TODO|LICENSE|templates\/migration\.rb|templates\/tag\.rb|templates\/tagging\.rb|templates\/tagging_extensions\.rb/    
-#   p.require_signed = true
-#   p.clean_pattern += ["**/ruby_sess*", "**/generated_models/**"]
-#   p.test_pattern = ["test/unit/*_test.rb", "test/integration/*_test.rb", "test/generator/*_test.rb"]
-# end
-# 
-# desc "Run all the tests for every database adapter" 
-# task "test_all" do
-#   ['mysql', 'postgresql', 'sqlite3'].each do |adapter|
-#     ENV['DB'] = adapter
-#     ENV['PRODUCTION'] = nil
-#     STDERR.puts "#{'='*80}\nDevelopment mode for #{adapter}\n#{'='*80}"
-#     system("rake test:multi_rails:all")
-#   
-#     ENV['PRODUCTION'] = '1'
-#     STDERR.puts "#{'='*80}\nProduction mode for #{adapter}\n#{'='*80}"
-#     system("rake test:multi_rails:all")    
-#   end
-# end
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/lib/has_many_polymorphs.rb

@@ -14,7 +14,7 @@ class ActiveRecord::Base
   extend ActiveRecord::Associations::PolymorphicClassMethods 
 end
 
-if ENV['HMP_DEBUG'] or ENV['RAILS_ENV'] =~ /development|test/ and ENV['USER'] == 'eweaver'
+if ENV['HMP_DEBUG'] || ENV['RAILS_ENV'] =~ /development|test/ && ENV['USER'] == 'eweaver'
   require 'has_many_polymorphs/debugging_tools' 
 end
 

data/lib/has_many_polymorphs/autoload.rb

@@ -1,6 +1,5 @@
-
 require 'initializer' unless defined? ::Rails::Initializer 
-require 'dispatcher' unless defined? ::ActionController::Dispatcher
+require 'action_controller/dispatcher' unless defined? ::ActionController::Dispatcher
 
 module HasManyPolymorphs
 
@@ -37,7 +36,7 @@ Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_pol
       require requirement
     end
   
-    Dir[options[:file_pattern]].each do |filename|
+    Dir.glob(options[:file_pattern]).each do |filename|
       next if filename =~ /#{options[:file_exclusions].join("|")}/
       open filename do |file|
         if file.grep(/#{options[:methods].join("|")}/).any?
@@ -64,7 +63,7 @@ class Rails::Initializer #:nodoc:
   alias_method_chain :after_initialize, :autoload 
 end
 
-Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
+ActionController::Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
   # Make sure it gets loaded in the app
   HasManyPolymorphs.autoload
 end

data/lib/has_many_polymorphs/class_methods.rb

@@ -360,10 +360,14 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
             begin
               table = plural._as_class.table_name
             rescue NameError => e
-              raise PolymorphicError, "Could not find a valid class for #{plural.inspect}. If it's namespaced, be sure to specify it as :\"module/#{plural}\" instead."
+              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
-            plural._as_class.columns.map(&:name).each_with_index do |field, f_index|
-              aliases["#{table}.#{field}"] = "t#{t_index}_r#{f_index}"
+            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..."
             end
           end
         end

data/lib/has_many_polymorphs/configuration.rb

@@ -3,15 +3,17 @@
 Access the <tt>has_many_polymorphs_options</tt> hash in your Rails::Initializer.run#after_initialize block if you need to modify the behavior of Rails::Initializer::HasManyPolymorphsAutoload.
 =end
 
-class Rails::Configuration
+module Rails #:nodoc:
+  class Configuration
 
-  def has_many_polymorphs_options
-    ::HasManyPolymorphs.options
-  end
-  
-  def has_many_polymorphs_options=(hash)
-    ::HasManyPolymorphs.options = HashWithIndifferentAccess.new(hash)
-  end
-  
+    def has_many_polymorphs_options
+      ::HasManyPolymorphs.options
+    end
+    
+    def has_many_polymorphs_options=(hash)
+      ::HasManyPolymorphs.options = HashWithIndifferentAccess.new(hash)
+    end
+    
+  end  
 end
 

data/lib/has_many_polymorphs/reflection.rb

@@ -2,18 +2,19 @@ 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
-            reflection = AssociationReflection.new(macro, name, options, active_record)
+            klass = options[:through] ? ThroughReflection : AssociationReflection
+            reflection = klass.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
@@ -32,7 +33,7 @@ Inherits from ActiveRecord::Reflection::AssociationReflection.
 
 =end
 
-    class PolymorphicReflection < AssociationReflection
+    class PolymorphicReflection < ThroughReflection
       # Stub out the validity check. Has_many_polymorphs checks validity on macro creation, not on reflection.
       def check_validity! 
         # nothing

data/test/integration/app/config/environments/development.rb

@@ -3,6 +3,7 @@ config.cache_classes = ENV['PRODUCTION']
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = !ENV['PRODUCTION']
 config.action_controller.perform_caching = ENV['PRODUCTION']
-config.action_view.cache_template_extensions = ENV['PRODUCTION']
+# The following has been deprecated in Rails 2.1 and removed in 2.2
+config.action_view.cache_template_extensions = ENV['PRODUCTION'] if Rails::VERSION::MAJOR < 2 or Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR < 1
 config.action_view.debug_rjs = !ENV['PRODUCTION']
 config.action_mailer.raise_delivery_errors = false

data/test/setup.rb

@@ -6,8 +6,8 @@ Dir.chdir "#{File.dirname(__FILE__)}/integration/app/" do
     system("rm has_many_polymorphs; ln -s ../../../../../ has_many_polymorphs")
   end
 
-  system "rake db:drop --trace RAILS_GEM_VERSION=2.0.2 "
-  system "rake db:create --trace RAILS_GEM_VERSION=2.0.2 "
+  system "rake db:drop   --trace RAILS_GEM_VERSION=2.2.2 "
+  system "rake db:create --trace RAILS_GEM_VERSION=2.2.2 "
   system "rake db:migrate --trace"
   system "rake db:fixtures:load --trace"  
 end

data/test/test_helper.rb

@@ -23,7 +23,7 @@ LOG = "#{HERE}/integration/app/log/development.log"
 require 'integration/app/config/environment'
 require 'test_help'
 
-Inflector.inflections {|i| i.irregular 'fish', 'fish' }
+ActiveSupport::Inflector.inflections {|i| i.irregular 'fish', 'fish' }
 
 $LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path = HERE + "/fixtures")
 $LOAD_PATH.unshift(HERE + "/models")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_many_polymorphs
 version: !ruby/object:Gem::Version 
-  version: "2.12"
+  version: "2.13"
 platform: ruby
 authors: 
 - ""
@@ -30,11 +30,22 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-01-16 00:00:00 -05:00
+date: 2009-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,8 +59,22 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+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
 files: 
 - CHANGELOG
 - examples/hmph.rb
@@ -75,6 +100,7 @@ files:
 - lib/has_many_polymorphs.rb
 - LICENSE
 - Manifest
+- Rakefile
 - README
 - test/fixtures/bow_wows.yml
 - test/fixtures/cats.yml
@@ -145,10 +171,8 @@ files:
 - 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/db/schema.rb
 - test/integration/app/doc/README_FOR_APP
 - test/integration/app/generators/commenting_generator_test.rb
-- test/integration/app/hmp_development
 - test/integration/app/lib/library_model.rb
 - test/integration/app/public/404.html
 - test/integration/app/public/500.html
@@ -229,8 +253,13 @@ files:
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/has_many_polymorphs/
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Has_many_polymorphs
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -243,12 +272,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: An ActiveRecord plugin for self-referential and double-sided polymorphic associations.

data/test/integration/app/db/schema.rb

@@ -1,44 +0,0 @@
-# This file is autogenerated. Instead of editing this file, please use the
-# migrations feature of ActiveRecord to incrementally modify your database, and
-# then regenerate this schema definition.
-
-ActiveRecord::Schema.define(:version => 9) do
-
-  create_table "double_sti_parent_relationships", :force => true do |t|
-    t.column "the_bone_type", :string,  :default => "", :null => false
-    t.column "the_bone_id",   :integer,                 :null => false
-    t.column "parent_type",   :string,  :default => "", :null => false
-    t.column "parent_id",     :integer,                 :null => false
-  end
-
-  create_table "double_sti_parents", :force => true do |t|
-    t.column "name", :string
-  end
-
-  create_table "library_models", :force => true do |t|
-    t.column "name", :string
-  end
-
-  create_table "organic_substances", :force => true do |t|
-    t.column "type", :string
-  end
-
-  create_table "single_sti_parent_relationships", :force => true do |t|
-    t.column "the_bone_type",        :string,  :default => "", :null => false
-    t.column "the_bone_id",          :integer,                 :null => false
-    t.column "single_sti_parent_id", :integer,                 :null => false
-  end
-
-  create_table "single_sti_parents", :force => true do |t|
-    t.column "name", :string
-  end
-
-  create_table "sticks", :force => true do |t|
-    t.column "name", :string
-  end
-
-  create_table "stones", :force => true do |t|
-    t.column "name", :string
-  end
-
-end