has_many_polymorphic 2.0.0 → 2.0.1

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2007-2011 Collective Idea
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2007-2011 Collective Idea
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,90 +1,90 @@
-#HasManyPolymorphic
-
-This mixin adds a has many polymorphic relationship to a model and creates all the relationships needed by rails to handle it.
- 
-
-##Setup
-
-You must define the models that you want to use inside an initializer using
-
-    RussellEdge::HasManyPolymorphic::Engine.add_models(%w(PreferenceType))
-
-or
-
-	RussellEdge::HasManyPolymorphic::Engine.add_models("PreferenceType")
-		
-##Params
-- Name 
-	- name of the relationship, there is a convention that whatever name you choose, the polymorphic table columns on your through table should match.
-        
-- Options
-	- through - the model that handles the through relationship
-	- models  - models that should be included in this polymophic relationship
-        
-        
-##Added methods
-        
-  - {name param}
-	- the name of your relationship is used for the method name of this method. it will return an array of the models that are related via the has_many relationships
-        
-There is an after_save call back that will save the relationships when they are added or removed. If you want to remove a relationship the models need to be destroyed and this model reloaded.
-        
-##Example Usage
-	
-###Schema
-
-
-	create_table :zoos, :force => true do |t|
-      t.string :name
-    end
-  
-    create_table :monkeys, :force => true do |t|
-      t.string :name
-    end
-  
-    create_table :bears, :force => true do |t|
-      t.string :name
-    end
-  
-    create_table :birds, :force => true do |t|
-      t.string :name
-    end
-  
-    create_table :zoo_animals, :force => true do |t|
-      t.integer :zoo_id
-	  t.references :animal, :polymorphic => true
-    end
-	
-	
-###Class
-	
-	
-    class Zoo < ActiveRecord::Base
-	  has_many_polymorphic :animals,
-	    :through => :zoo_animals,
-		:models => [:monkeys, :birds, :bears]
-	end
-		  
-		  
-###What you get
-		
-    zoo = Zoo.first
-    zoo.monkeys
-    zoo.birds
-	zoo.bears
-		   
-and
-		   
-    zoo = Zoo.first
-	zoo.animals
-		   
-which is a concatentated array of the models. You also get the following
-		   
-    monkey = Monkey.first
-    monkey.zoos
-		   
-    bird = Bird.first
-    bird.zoos
-	
-	bear = Bear.first
+#HasManyPolymorphic
+
+This mixin adds a has many polymorphic relationship to a model and creates all the relationships needed by rails to handle it.
+ 
+
+##Setup
+
+You must define the models that you want to use inside an initializer using
+
+    RussellEdge::HasManyPolymorphic::Engine.add_models(%w(PreferenceType))
+
+or
+
+	RussellEdge::HasManyPolymorphic::Engine.add_models("PreferenceType")
+		
+##Params
+- Name 
+	- name of the relationship, there is a convention that whatever name you choose, the polymorphic table columns on your through table should match.
+        
+- Options
+	- through - the model that handles the through relationship
+	- models  - models that should be included in this polymophic relationship
+        
+        
+##Added methods
+        
+  - {name param}
+	- the name of your relationship is used for the method name of this method. it will return an array of the models that are related via the has_many relationships
+        
+There is an after_save call back that will save the relationships when they are added or removed. If you want to remove a relationship the models need to be destroyed and this model reloaded.
+        
+##Example Usage
+	
+###Schema
+
+
+	create_table :zoos, :force => true do |t|
+      t.string :name
+    end
+  
+    create_table :monkeys, :force => true do |t|
+      t.string :name
+    end
+  
+    create_table :bears, :force => true do |t|
+      t.string :name
+    end
+  
+    create_table :birds, :force => true do |t|
+      t.string :name
+    end
+  
+    create_table :zoo_animals, :force => true do |t|
+      t.integer :zoo_id
+	  t.references :animal, :polymorphic => true
+    end
+	
+	
+###Class
+	
+	
+    class Zoo < ActiveRecord::Base
+	  has_many_polymorphic :animals,
+	    :through => :zoo_animals,
+		:models => [:monkeys, :birds, :bears]
+	end
+		  
+		  
+###What you get
+		
+    zoo = Zoo.first
+    zoo.monkeys
+    zoo.birds
+	zoo.bears
+		   
+and
+		   
+    zoo = Zoo.first
+	zoo.animals
+		   
+which is a concatentated array of the models. You also get the following
+		   
+    monkey = Monkey.first
+    monkey.zoos
+		   
+    bird = Bird.first
+    bird.zoos
+	
+	bear = Bear.first
     bear.zoos

data/Rakefile

@@ -1,28 +1,28 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require 'rubygems'
-require 'bundler/setup'
-require 'has_many_polymorphic/version'
-
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
-task :build do
-  system "gem build has_many_polymorphic.gemspec"
-end
-
-task :release => :build do
-  system "gem push has_many_polymorphic-#{HasManyPolymorphic::VERSION}.gem"
-end
-
-require 'rdoc/task'
-desc 'Generate documentation for the awesome_nested_set plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'HasManyPolymorphic'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'rubygems'
+require 'bundler/setup'
+require 'has_many_polymorphic/version'
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+task :build do
+  system "gem build has_many_polymorphic.gemspec"
+end
+
+task :release => :build do
+  system "gem push has_many_polymorphic-#{HasManyPolymorphic::VERSION}.gem"
+end
+
+require 'rdoc/task'
+desc 'Generate documentation for the awesome_nested_set plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'HasManyPolymorphic'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/has_many_polymorphic.rb

@@ -1,4 +1,4 @@
-require 'has_many_polymorphic/has_many_polymorphic'
-require 'has_many_polymorphic/engine'
-
-
+require 'has_many_polymorphic/has_many_polymorphic'
+require 'has_many_polymorphic/engine'
+
+

data/lib/has_many_polymorphic/engine.rb

@@ -1,44 +1,44 @@
-module RussellEdge
-  module HasManyPolymorphic
-    class Engine < Rails::Engine
-      isolate_namespace HasManyPolymorphic
-      DEFAULT_OPTIONS = {:models => %w()}
-      @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)
-
-      initializer "has_many_polymorphic.autoload_models", :after => :load_config_initializers do |app|
-        RussellEdge::HasManyPolymorphic::Engine.autoload_models
-      end
-
-      ActiveSupport.on_load(:active_record) do
-        include RussellEdge::HasManyPolymorphic
-      end
-      
-      #set engine to scope
-      engine = self
-      config.to_prepare do
-        engine.autoload_models
-      end
-
-      class << self
-        def add_models(models)
-          if models.is_a? Array
-            @@options[:models] = @@options[:models] | models
-          else
-            @@options[:models] << models
-          end
-        end
-
-        # Dispatcher callback to load polymorphic relationships
-        def autoload_models
-          @@options[:models].each do |model|
-            #try to load model if it exists.
-            begin
-              model.constantize
-            rescue=>e
-            end
-          end
-        end
-      end
-    end
-  end
+module RussellEdge
+  module HasManyPolymorphic
+    class Engine < Rails::Engine
+      isolate_namespace HasManyPolymorphic
+      DEFAULT_OPTIONS = {:models => %w()}
+      @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)
+
+      initializer "has_many_polymorphic.autoload_models", :after => :load_config_initializers do |app|
+        RussellEdge::HasManyPolymorphic::Engine.autoload_models
+      end
+
+      ActiveSupport.on_load(:active_record) do
+        include RussellEdge::HasManyPolymorphic
+      end
+      
+      #set engine to scope
+      engine = self
+      config.to_prepare do
+        engine.autoload_models
+      end
+
+      class << self
+        def add_models(models)
+          if models.is_a? Array
+            @@options[:models] = @@options[:models] | models
+          else
+            @@options[:models] << models
+          end
+        end
+
+        # Dispatcher callback to load polymorphic relationships
+        def autoload_models
+          @@options[:models].each do |model|
+            #try to load model if it exists.
+            begin
+              model.constantize
+            rescue=>e
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/lib/has_many_polymorphic/has_many_polymorphic.rb

@@ -1,143 +1,143 @@
-module RussellEdge #:nodoc:
-  module HasManyPolymorphic #:nodoc:
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      
-      ##
-      #  HasManyPolymorphic
-      #  This mixin adds a has many polymorphic relationship to a model and creates all the relationships needed
-      #  by rails to handle it.
-      #
-      #  Params
-      #
-      #  Name - name of the relationship, there is a convention that whatever name you choose, the polymorphic
-      #  table columns on your through table should match.
-      #
-      #  Options
-      #   - through - the model that handles the through relationship
-      #   - models  - models that should be included in this polymophic relationship
-      #
-      #
-      #  One method is added for you to use
-      #
-      #  - {name param}
-      #    - the name of your relationship is used for the method name of this method. it will return
-      #    an array of the models that are related via the has_many relationships
-      #
-      #  There is an after_save call back that will save the relationships when they are added or removed
-      #  If you want to remove a relationship the models need to be destroyed and this model reloaded.
-      #
-      #  Example Usage
-      #
-      #  class PreferenceType < ActiveRecord::Base
-      #  	has_morpheus :preferenced_records,
-      #       :through => :valid_preference_types,
-      #       :models => [:desktops, :organizers]
-      #  end
-      #
-      #  this gives you the following
-      #
-      #  preferenceType = PreferenceType.first
-      #  preferenceType.desktops
-      #  preferenceType.organizers
-      #
-      #  and
-      #
-      #  preferenceType.preferenced_records
-      #
-      #  which is a concatentated array of the models. You also get the following
-      #
-      #  desktop = Desktop.first
-      #  desktop.preference_types
-      #
-      #  organizer = Organizer.first
-      #  organizer.preference_types
-      ##
-
-      def has_many_polymorphic(name, options = {})
-        target_class_name = self.name
-        instance_array_name = "#{name}_array".to_sym
-          
-        #declare array to related models
-        attr_accessor instance_array_name
-        
-        #create the has_many relationship
-        has_many options[:through], :dependent => :destroy
-
-        #create the has_many relationship for each model
-        options[:models].each do |model|
-          has_many model, :through => options[:through], :source => model.to_s.singularize,
-            :conditions => ["#{options[:through]}.#{name.to_s.singularize}_type = ?", model.to_s.classify], :dependent => :destroy
-        end
-
-        #modify the through class to add the belongs to relationships
-        options[:through].to_s.classify.constantize.class_exec do
-          options[:models].each do |model|
-            belongs_to model.to_s.singularize.to_sym, :class_name => model.to_s.classify, :foreign_key => "#{name.to_s.singularize}_id"
-          end
-        end
-
-        #I want to keep the << and push methods of array so this helps to keep them.
-        define_method name do
-          #used the declared instance variable array
-          records = self.send(instance_array_name.to_s)
-          records = records || []
-          options[:models].each do |model|
-            records = records | self.send(model.to_s)
-          end
-            
-          #set it back to the instance variable
-          self.send("#{instance_array_name.to_s}=", records)
-            
-          records
-        end
-
-        #before we save this model make sure you save all the relationships.
-        before_save do |record|
-          record.send(name).each do |reln_record|
-            #handle STI get superclass class_name if not sub class of ActiveRecord::Base
-            klass_name = (reln_record.class.superclass == ActiveRecord::Base) ? reln_record.class.name : reln_record.class.superclass.name
-            conditions = "#{name.to_s.singularize}_id = #{reln_record.id} and #{name.to_s.singularize}_type = '#{klass_name}'"
-            exisiting_record = record.send("#{options[:through]}").where(conditions).first
-				
-            if exisiting_record.nil?
-              values_hash = {}
-              values_hash["#{record.class.name.underscore}_id"] = record.id
-              values_hash["#{name.to_s.singularize}_type"] = klass_name
-              values_hash["#{name.to_s.singularize}_id"] = reln_record.id
-              
-              options[:through].to_s.classify.constantize.create(values_hash)
-            end
-          end
-        end
-			
-	      #include instance methods into this model
-        include RussellEdge::HasManyPolymorphic::InstanceMethods
-
-        #add the relationship to the models.
-        options[:models].each do |model|
-          model.to_s.classify.constantize.class_exec do
-            has_many options[:through], :as => name.to_s.singularize
-            has_many target_class_name.tableize, :through => options[:through]
-          end
-        end
-
-      end
-    end
-				
-    module InstanceMethods
-      #clear array on reload
-      def reload(*args)
-        @records = []
-
-        super args
-      end
-
-    end
-
-  end
+module RussellEdge #:nodoc:
+  module HasManyPolymorphic #:nodoc:
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      
+      ##
+      #  HasManyPolymorphic
+      #  This mixin adds a has many polymorphic relationship to a model and creates all the relationships needed
+      #  by rails to handle it.
+      #
+      #  Params
+      #
+      #  Name - name of the relationship, there is a convention that whatever name you choose, the polymorphic
+      #  table columns on your through table should match.
+      #
+      #  Options
+      #   - through - the model that handles the through relationship
+      #   - models  - models that should be included in this polymophic relationship
+      #
+      #
+      #  One method is added for you to use
+      #
+      #  - {name param}
+      #    - the name of your relationship is used for the method name of this method. it will return
+      #    an array of the models that are related via the has_many relationships
+      #
+      #  There is an after_save call back that will save the relationships when they are added or removed
+      #  If you want to remove a relationship the models need to be destroyed and this model reloaded.
+      #
+      #  Example Usage
+      #
+      #  class PreferenceType < ActiveRecord::Base
+      #  	has_morpheus :preferenced_records,
+      #       :through => :valid_preference_types,
+      #       :models => [:desktops, :organizers]
+      #  end
+      #
+      #  this gives you the following
+      #
+      #  preferenceType = PreferenceType.first
+      #  preferenceType.desktops
+      #  preferenceType.organizers
+      #
+      #  and
+      #
+      #  preferenceType.preferenced_records
+      #
+      #  which is a concatentated array of the models. You also get the following
+      #
+      #  desktop = Desktop.first
+      #  desktop.preference_types
+      #
+      #  organizer = Organizer.first
+      #  organizer.preference_types
+      ##
+
+      def has_many_polymorphic(name, options = {})
+        target_class_name = self.name
+        instance_array_name = "#{name}_array".to_sym
+          
+        #declare array to related models
+        attr_accessor instance_array_name
+        
+        #create the has_many relationship
+        has_many options[:through], :dependent => :destroy
+
+        #create the has_many relationship for each model
+        options[:models].each do |model|
+          has_many model, :through => options[:through], :source => model.to_s.singularize,
+            :conditions => ["#{options[:through]}.#{name.to_s.singularize}_type = ?", model.to_s.classify], :dependent => :destroy
+        end
+
+        #modify the through class to add the belongs to relationships
+        options[:through].to_s.classify.constantize.class_exec do
+          options[:models].each do |model|
+            belongs_to model.to_s.singularize.to_sym, :class_name => model.to_s.classify, :foreign_key => "#{name.to_s.singularize}_id"
+          end
+        end
+
+        #I want to keep the << and push methods of array so this helps to keep them.
+        define_method name do
+          #used the declared instance variable array
+          records = self.send(instance_array_name.to_s)
+          records = records || []
+          options[:models].each do |model|
+            records = records | self.send(model.to_s)
+          end
+            
+          #set it back to the instance variable
+          self.send("#{instance_array_name.to_s}=", records)
+            
+          records
+        end
+
+        #before we save this model make sure you save all the relationships.
+        before_save do |record|
+          record.send(name).each do |reln_record|
+            #handle STI get superclass class_name if not sub class of ActiveRecord::Base
+            klass_name = (reln_record.class.superclass == ActiveRecord::Base) ? reln_record.class.name : reln_record.class.superclass.name
+            conditions = "#{name.to_s.singularize}_id = #{reln_record.id} and #{name.to_s.singularize}_type = '#{klass_name}'"
+            exisiting_record = record.send("#{options[:through]}").where(conditions).first
+				
+            if exisiting_record.nil?
+              values_hash = {}
+              values_hash["#{record.class.name.underscore}_id"] = record.id
+              values_hash["#{name.to_s.singularize}_type"] = klass_name
+              values_hash["#{name.to_s.singularize}_id"] = reln_record.id
+              
+              options[:through].to_s.classify.constantize.create(values_hash)
+            end
+          end
+        end
+			
+	      #include instance methods into this model
+        include RussellEdge::HasManyPolymorphic::InstanceMethods
+
+        #add the relationship to the models.
+        options[:models].each do |model|
+          model.to_s.classify.constantize.class_exec do
+            has_many options[:through], :as => name.to_s.singularize, :dependent => :destroy
+            has_many target_class_name.tableize, :through => options[:through], :dependent => :destroy
+          end
+        end
+
+      end
+    end
+				
+    module InstanceMethods
+      #clear array on reload
+      def reload(*args)
+        @records = []
+
+        super args
+      end
+
+    end
+
+  end
 end

data/lib/has_many_polymorphic/version.rb

@@ -1,3 +1,3 @@
-module HasManyPolymorphic
-  VERSION = '2.0.0' unless defined?(::HasManyPolymorphic::VERSION)
+module HasManyPolymorphic
+  VERSION = '2.0.1' unless defined?(::HasManyPolymorphic::VERSION)
 end

data/spec/db/database.yml

@@ -1,3 +1,3 @@
-spec:
-  adapter: sqlite3
+spec:
+  adapter: sqlite3
   database: has_many_polymorphic_spec.sqlite3

data/spec/db/schema.rb

@@ -1,22 +1,22 @@
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :zoos, :force => true do |t|
-    t.string :name
-  end
-  
-  create_table :monkeys, :force => true do |t|
-    t.string :name
-  end
-  
-  create_table :bears, :force => true do |t|
-    t.string :name
-  end
-  
-  create_table :birds, :force => true do |t|
-    t.string :name
-  end
-  
-  create_table :zoo_animals, :force => true do |t|
-    t.integer :zoo_id
-	t.references :animal, :polymorphic => true
-  end
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :zoos, :force => true do |t|
+    t.string :name
+  end
+  
+  create_table :monkeys, :force => true do |t|
+    t.string :name
+  end
+  
+  create_table :bears, :force => true do |t|
+    t.string :name
+  end
+  
+  create_table :birds, :force => true do |t|
+    t.string :name
+  end
+  
+  create_table :zoo_animals, :force => true do |t|
+    t.integer :zoo_id
+	t.references :animal, :polymorphic => true
+  end
 end

data/spec/debug.log

@@ -1,48 +1,48 @@
-# Logfile created on 2012-01-26 20:22:32 -0500 by logger.rb/31641
-   (10.0ms)  select sqlite_version(*)
-   (110.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (110.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (140.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (150.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (150.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
-   (140.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.0ms)  PRAGMA index_list("schema_migrations")
-   (130.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.0ms)  SELECT version FROM "schema_migrations"
-   (130.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
-   (20.0ms)  select sqlite_version(*)
-   (100.0ms)  DROP TABLE "zoos"
-   (110.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (110.0ms)  DROP TABLE "monkies"
-   (110.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (130.0ms)  DROP TABLE "bears"
-   (160.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (170.0ms)  DROP TABLE "birds"
-   (120.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "zoo_animals"
-   (130.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
-   (0.0ms)  SELECT version FROM "schema_migrations"
-   (10.0ms)  select sqlite_version(*)
-   (100.0ms)  DROP TABLE "zoos"
-   (110.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "monkies"
-   (120.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (140.0ms)  DROP TABLE "bears"
-   (130.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "birds"
-   (130.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "zoo_animals"
-   (130.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
-   (0.0ms)  SELECT version FROM "schema_migrations"
-   (10.0ms)  select sqlite_version(*)
-   (90.0ms)  DROP TABLE "zoos"
-   (100.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "monkies"
-   (110.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "bears"
-   (120.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "birds"
-   (170.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
-   (120.0ms)  DROP TABLE "zoo_animals"
-   (130.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
-   (0.0ms)  SELECT version FROM "schema_migrations"
+# Logfile created on 2012-01-26 20:22:32 -0500 by logger.rb/31641
+   (10.0ms)  select sqlite_version(*)
+   (110.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (110.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (140.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (150.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (150.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
+   (140.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (130.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.0ms)  SELECT version FROM "schema_migrations"
+   (130.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (20.0ms)  select sqlite_version(*)
+   (100.0ms)  DROP TABLE "zoos"
+   (110.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (110.0ms)  DROP TABLE "monkies"
+   (110.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (130.0ms)  DROP TABLE "bears"
+   (160.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (170.0ms)  DROP TABLE "birds"
+   (120.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "zoo_animals"
+   (130.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
+   (0.0ms)  SELECT version FROM "schema_migrations"
+   (10.0ms)  select sqlite_version(*)
+   (100.0ms)  DROP TABLE "zoos"
+   (110.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "monkies"
+   (120.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (140.0ms)  DROP TABLE "bears"
+   (130.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "birds"
+   (130.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "zoo_animals"
+   (130.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
+   (0.0ms)  SELECT version FROM "schema_migrations"
+   (10.0ms)  select sqlite_version(*)
+   (90.0ms)  DROP TABLE "zoos"
+   (100.0ms)  CREATE TABLE "zoos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "monkies"
+   (110.0ms)  CREATE TABLE "monkies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "bears"
+   (120.0ms)  CREATE TABLE "bears" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "birds"
+   (170.0ms)  CREATE TABLE "birds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)) 
+   (120.0ms)  DROP TABLE "zoo_animals"
+   (130.0ms)  CREATE TABLE "zoo_animals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "zoo_id" integer, "animal_id" integer, "animal_type" varchar(255)) 
+   (0.0ms)  SELECT version FROM "schema_migrations"

data/spec/has_many_polymorphic_spec.rb

@@ -1,55 +1,55 @@
-require 'spec_helper'
-
-describe "HasManyPolymorphic" do
-	before(:all) do
-	  Zoo.create(:name => 'Zoo Lander')
-	  Bear.create(:name => 'Smokey')
-	  Bird.create(:name => 'Big Bird')
-	  Monkey.create(:name => 'George')
-	end
-	
-	it "should have created the animals and zoo" do
-	  Zoo.first.name.should eq 'Zoo Lander'
-	  Monkey.find_by_name('George').name.should eq 'George'
-	  Bird.find_by_name('Big Bird').name.should eq 'Big Bird'
-	  Bear.find_by_name('Smokey').name.should eq 'Smokey'
-	end
-	
-	it "should allow you to add animals to a zoo" do
-	  zoo = Zoo.first
-	  zoo.animals.count.should eq 0
-	  zoo.monkeys << Monkey.find_by_name('George')
-	  zoo.birds << Bird.find_by_name('Big Bird')
-	  zoo.bears << Bear.find_by_name('Smokey')
-	  zoo.save
-	  
-	  zoo.monkeys.count.should eq 1
-	  zoo.monkeys.first.name.should eq 'George'
-	  
-	  zoo.birds.count.should eq 1
-	  zoo.birds.first.name.should eq 'Big Bird'
-	  
-	  zoo.bears.count.should eq 1
-	  zoo.bears.first.name.should eq 'Smokey'
-		
-	  zoo.animals.count.should eq 3
-	end
-	
-	it "should allow you to get the zoo from an animal" do
-	  zoo = Zoo.first
-		
-	  zoo.monkeys << Monkey.find_by_name('George')
-	  zoo.birds << Bird.find_by_name('Big Bird')
-	  zoo.bears << Bear.find_by_name('Smokey')
-	  zoo.save
-		
-	  monkey = Monkey.find_by_name('George')
-	  monkey.zoos.first.id.should eq zoo.id
-	 
-	  bird = Bird.find_by_name('Big Bird')
-	  bird.zoos.first.id.should eq zoo.id
-		
-	  bear = Bear.find_by_name('Smokey')
-	  bear.zoos.first.id.should eq zoo.id
-	end
+require 'spec_helper'
+
+describe "HasManyPolymorphic" do
+	before(:all) do
+	  Zoo.create(:name => 'Zoo Lander')
+	  Bear.create(:name => 'Smokey')
+	  Bird.create(:name => 'Big Bird')
+	  Monkey.create(:name => 'George')
+	end
+	
+	it "should have created the animals and zoo" do
+	  Zoo.first.name.should eq 'Zoo Lander'
+	  Monkey.find_by_name('George').name.should eq 'George'
+	  Bird.find_by_name('Big Bird').name.should eq 'Big Bird'
+	  Bear.find_by_name('Smokey').name.should eq 'Smokey'
+	end
+	
+	it "should allow you to add animals to a zoo" do
+	  zoo = Zoo.first
+	  zoo.animals.count.should eq 0
+	  zoo.monkeys << Monkey.find_by_name('George')
+	  zoo.birds << Bird.find_by_name('Big Bird')
+	  zoo.bears << Bear.find_by_name('Smokey')
+	  zoo.save
+	  
+	  zoo.monkeys.count.should eq 1
+	  zoo.monkeys.first.name.should eq 'George'
+	  
+	  zoo.birds.count.should eq 1
+	  zoo.birds.first.name.should eq 'Big Bird'
+	  
+	  zoo.bears.count.should eq 1
+	  zoo.bears.first.name.should eq 'Smokey'
+		
+	  zoo.animals.count.should eq 3
+	end
+	
+	it "should allow you to get the zoo from an animal" do
+	  zoo = Zoo.first
+		
+	  zoo.monkeys << Monkey.find_by_name('George')
+	  zoo.birds << Bird.find_by_name('Big Bird')
+	  zoo.bears << Bear.find_by_name('Smokey')
+	  zoo.save
+		
+	  monkey = Monkey.find_by_name('George')
+	  monkey.zoos.first.id.should eq zoo.id
+	 
+	  bird = Bird.find_by_name('Big Bird')
+	  bird.zoos.first.id.should eq zoo.id
+		
+	  bear = Bear.find_by_name('Smokey')
+	  bear.zoos.first.id.should eq zoo.id
+	end
 end

data/spec/spec_helper.rb

@@ -1,25 +1,25 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-plugin_test_dir = File.dirname(__FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec'
-require 'rails'
-require 'active_support'
-require 'active_model'
-require 'active_record'
-require 'action_controller'
-require 'simplecov'
-require 'rspec/rails'
-
-SimpleCov.start
-
-require 'has_many_polymorphic'
-require 'support/models'
-
-ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(plugin_test_dir + "/db/database.yml")).result)
-ActiveRecord::Base.establish_connection(ENV["DB"] || "spec")
-ActiveRecord::Migration.verbose = false
-load(File.join(plugin_test_dir, "db", "schema.rb"))
-
-RussellEdge::HasManyPolymorphic::Engine.add_models("Zoo")
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+plugin_test_dir = File.dirname(__FILE__)
+
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec'
+require 'rails'
+require 'active_support'
+require 'active_model'
+require 'active_record'
+require 'action_controller'
+require 'simplecov'
+require 'rspec/rails'
+
+SimpleCov.start
+
+require 'has_many_polymorphic'
+require 'support/models'
+
+ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(plugin_test_dir + "/db/database.yml")).result)
+ActiveRecord::Base.establish_connection(ENV["DB"] || "spec")
+ActiveRecord::Migration.verbose = false
+load(File.join(plugin_test_dir, "db", "schema.rb"))
+
+RussellEdge::HasManyPolymorphic::Engine.add_models("Zoo")

data/spec/support/models.rb

@@ -1,20 +1,20 @@
-class Monkey < ActiveRecord::Base
-end
-
-class Bird < ActiveRecord::Base
-end
-
-class Bear < ActiveRecord::Base
-end
-
-class ZooAnimal < ActiveRecord::Base
-	belongs_to :zoo
-	belongs_to :animal, :polymorphic => true
-end
-
-class Zoo < ActiveRecord::Base
-	has_many_polymorphic :animals,
-		:through => :zoo_animals,
-		:models => [:monkeys, :birds, :bears]
-end
-
+class Monkey < ActiveRecord::Base
+end
+
+class Bird < ActiveRecord::Base
+end
+
+class Bear < ActiveRecord::Base
+end
+
+class ZooAnimal < ActiveRecord::Base
+	belongs_to :zoo
+	belongs_to :animal, :polymorphic => true
+end
+
+class Zoo < ActiveRecord::Base
+	has_many_polymorphic :animals,
+		:through => :zoo_animals,
+		:models => [:monkeys, :birds, :bears]
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_many_polymorphic
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &26778720 !ruby/object:Gem::Requirement
+  requirement: &2153809920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *26778720
+  version_requirements: *2153809920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &26763660 !ruby/object:Gem::Requirement
+  requirement: &2153809280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *26763660
+  version_requirements: *2153809280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &26764908 !ruby/object:Gem::Requirement
+  requirement: &2153808240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *26764908
+  version_requirements: *2153808240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &26769108 !ruby/object:Gem::Requirement
+  requirement: &2153807160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *26769108
+  version_requirements: *2153807160
 description: Simple replacement for has_many_polymorphs
 email: russonrails@gmail.com
 executables: []
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple replacement for has_many_polymorphs