multiple_table_inheritance 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.1.3
+
+* Fixed a bug that prevented migrations from being run properly.
+
 0.1.2
 
 * Fixed a bug that resulted in parent record not being accessible after

data/README.md

@@ -23,7 +23,7 @@ From the command line:
 
 From your Gemfile:
 
-    gem 'multiple_table_inheritance', '~> 0.1.2'
+    gem 'multiple_table_inheritance', '~> 0.1.3'
 
 Usage
 =====

data/lib/multiple_table_inheritance/child/base.rb

@@ -51,7 +51,7 @@ module MultipleTableInheritance
         
         def parent_association_class
           reflection = create_reflection(:belongs_to, parent_association_name, {}, self)
-          reflection.class_name.constantize
+          reflection.klass
         end
         
         def inherited_columns_and_associations
@@ -76,7 +76,7 @@ module MultipleTableInheritance
       module FinderMethods
         def find_by_sql(*args)
           child_records = super(*args)
-        
+          
           child_records.each do |child|
             child.send(:parent_association=, parent_association_class.as_supertype.find_by_id(child.id))
           end

data/lib/multiple_table_inheritance/migration.rb

@@ -1,14 +1,12 @@
 module MultipleTableInheritance
   module Migration
     def self.included(base)
-      base.extend ClassMethods
+      base.alias_method_chain :create_table, :inherits
     end
     
-    module ClassMethods
-      def create_table(table_name, options = {}, &block)
-        options[:primary_key] = "#{options[:inherits]}_id" if options[:inherits]
-        super(table_name, options, &block)
-      end
+    def create_table_with_inherits(table_name, options = {}, &block)
+      options[:primary_key] = "#{options[:inherits]}_id" if options[:inherits]
+      create_table_without_inherits(table_name, options, &block)
     end
   end
 end

data/lib/multiple_table_inheritance/parent/base.rb

@@ -16,7 +16,7 @@ module MultipleTableInheritance
         def acts_as_superclass(options={})
           options = Base::default_options.merge(options.to_options)
           self.subtype_column = options[:subtype]
-
+          
           if column_names.include?(subtype_column.to_s)
             include InstanceMethods
             before_destroy :destroy_child_association
@@ -33,7 +33,7 @@ module MultipleTableInheritance
         rescue NameError => e
           # TODO log error
         end
-
+        
         def find_by_subtype(*args)
           super || send("find_by_#{subtype_column}", *args)
         end

data/lib/multiple_table_inheritance/version.rb

@@ -1,3 +1,3 @@
 module MultipleTableInheritance
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/active_record/child_spec.rb

@@ -57,7 +57,7 @@ describe MultipleTableInheritance::Child do
   
   context 'deleting records' do
     before do
-      mock_everything!
+      mock_employees!
       @programmer = Programmer.first
       @programmer_id = @programmer.id
     end
@@ -81,7 +81,7 @@ describe MultipleTableInheritance::Child do
   
   context 'methods' do
     before do
-      mock_everything!
+      mock_employees!
     end
     
     context 'accessing parent records' do

data/spec/active_record/parent_spec.rb

@@ -10,61 +10,81 @@ describe MultipleTableInheritance::Parent do
     end
   end
   
-  context 'retrieving records' do
-    before do
-      mock_everything!
-    end
+  context 'non-namespaced classes' do
+    context 'retrieving records' do
+      before do
+        mock_employees!
+      end
     
-    it 'should retrieve child records' do
-      Employee.find_each do |programmer_or_manager|
-        programmer_or_manager.should_not be_instance_of(Employee)
-        ['Programmer', 'Manager'].should include(programmer_or_manager.class.to_s)
+      it 'should retrieve child records' do
+        Employee.find_each do |programmer_or_manager|
+          programmer_or_manager.should_not be_instance_of(Employee)
+          ['Programmer', 'Manager'].should include(programmer_or_manager.class.to_s)
+        end
       end
-    end
     
-    it 'should allow access to parent record' do
-      programmer_or_manager = Employee.first
-      programmer_or_manager.employee.should be_instance_of(Employee)
-    end
+      it 'should allow access to parent record' do
+        programmer_or_manager = Employee.first
+        programmer_or_manager.employee.should be_instance_of(Employee)
+      end
     
-    it 'should include all records' do
-      modified_results = Employee.all
-      original_results = Employee.as_supertype.all
-      modified_results.size.should == original_results.size
-    end
+      it 'should include all records' do
+        modified_results = Employee.all
+        original_results = Employee.as_supertype.all
+        modified_results.size.should == original_results.size
+      end
     
-    it 'should maintain result order' do
-      modified_results = Employee.order("id desc").all
-      original_results = Employee.as_supertype.order("id desc").all
-      modified_results.collect(&:id).should == original_results.collect(&:id)
-    end
+      it 'should maintain result order' do
+        modified_results = Employee.order("id desc").all
+        original_results = Employee.as_supertype.order("id desc").all
+        modified_results.collect(&:id).should == original_results.collect(&:id)
+      end
     
-    context 'associations preloading' do
-      context 'is enabled' do
-        before do
-          @programmer_or_manager = Employee.includes(:team).first
-        end
+      context 'associations preloading' do
+        context 'is enabled' do
+          before do
+            @programmer_or_manager = Employee.includes(:team).first
+          end
         
-        it 'should not perform an extra find' do
-          pending "ensure that team is not retrieved from the database"
-          Team.any_instance.should_not_receive(:find_by_sql)
-          @programmer_or_manager.employee.team
+          it 'should not perform an extra find' do
+            pending "ensure that team is not retrieved from the database"
+            Team.any_instance.should_not_receive(:find_by_sql)
+            @programmer_or_manager.employee.team
+          end
         end
-      end
       
-      context 'is disabled' do
-        before do
-          @programmer_or_manager = Employee.first
-        end
+        context 'is disabled' do
+          before do
+            @programmer_or_manager = Employee.first
+          end
         
-        it 'should not perform an extra find' do
-          pending "ensure that team is retrieved from the database"
-          Team.any_instance.should_receive(:find_by_sql).at_least(:once)
-          @programmer_or_manager.employee.team
+          it 'should not perform an extra find' do
+            pending "ensure that team is retrieved from the database"
+            Team.any_instance.should_receive(:find_by_sql).at_least(:once)
+            @programmer_or_manager.employee.team
+          end
         end
       end
     end
     
+    context 'deleting records' do
+      before do
+        programmer = Programmer.create!(:first_name => 'Billy', :last_name => 'Ray', :salary => 50000, :team => @team)
+        @employee = programmer.employee
+        @employee_id = programmer.id
+      end
+      
+      it 'should delete the parent record' do
+        @employee.destroy.should be_true
+        Employee.find_by_id(@employee_id).should be_nil
+      end
+      
+      it 'should delete the child record' do
+        @employee.destroy
+        Programmer.find_by_id(@employee_id).should be_nil
+      end
+    end
+    
     context 'an invalid subtype exists' do
       before do
         @employee = Employee.create!(:first_name => 'Sub', :last_name => 'Type', :salary => 50000, :team => @team) do |employee|
@@ -81,34 +101,63 @@ describe MultipleTableInheritance::Parent do
       end
     end
     
-    context 'default subtype is used' do
+    context 'default subtype' do
       pending "test_everything"
     end
     
-    context 'custom subtype is used' do
-      pending "test_everything"
-    end
-    
-    context 'namespaced classes are being used' do
+    context 'custom subtype' do
       pending "test_everything"
     end
   end
   
-  context 'deleting records' do
-    before do
-      programmer = Programmer.create!(:first_name => 'Billy', :last_name => 'Ray', :salary => 50000, :team => @team)
-      @employee = programmer.employee
-      @employee_id = programmer.id
-    end
-    
-    it 'should delete the parent record' do
-      @employee.destroy.should be_true
-      Employee.find_by_id(@employee_id).should be_nil
+  context 'namespaced classes' do
+    context 'retrieving records' do
+      before(:each) do
+        mock_pets!
+      end
+      
+      it 'should retrieve child records' do
+        Pet::Pet.find_each do |cat_or_dog|
+          cat_or_dog.should_not be_instance_of(Pet::Pet)
+          ['Pet::Cat', 'Pet::Dog'].should include(cat_or_dog.class.to_s)
+        end
+      end
+      
+      it 'should allow access to parent record' do
+        cat_or_dog = Pet::Pet.first
+        cat_or_dog.pet.should be_instance_of(Pet::Pet)
+      end
+      
+      it 'should include all records' do
+        modified_results = Pet::Pet.all
+        original_results = Pet::Pet.as_supertype.all
+        modified_results.size.should == original_results.size
+      end
+      
+      it 'should maintain result order' do
+        modified_results = Pet::Pet.order("id desc").all
+        original_results = Pet::Pet.as_supertype.order("id desc").all
+        modified_results.collect(&:id).should == original_results.collect(&:id)
+      end
     end
     
-    it 'should delete the child record' do
-      @employee.destroy
-      Programmer.find_by_id(@employee_id).should be_nil
+    context 'deleting records' do
+      before do
+        mock_pets!
+        dog = Pet::Dog.first
+        @pet = dog.pet
+        @pet_id = dog.id
+      end
+      
+      it 'should delete the parent record' do
+        @pet.destroy.should be_true
+        Pet::Pet.find_by_id(@pet_id).should be_nil
+      end
+      
+      it 'should delete the child record' do
+        @pet.destroy
+        Pet::Dog.find_by_id(@pet_id).should be_nil
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'support/tables'
 require 'support/models'
 
 module MultipleTableInheritanceSpecHelper
-  def mock_everything!
+  def mock_employees!
     3.times do |i|
       team = Team.create!(:name => "Team#{i}")
       language = Language.create!(:name => "Java 1.#{i + 4}")
@@ -30,6 +30,26 @@ module MultipleTableInheritanceSpecHelper
           :bonus => i * 2500)  # manager-specific field
     end
   end
+  
+  def mock_pets!
+    3.times do |i|
+      owner = Pet::Owner.create!(:first_name => 'Bob', :last_name => "Smith #{i}") do |owner|
+        owner.ssn = (123456789 + i).to_s
+      end
+      
+      dog = Pet::Dog.create!(:name => "Rover #{i}") do |dog|
+        dog.owner = owner
+        dog.favorite_toy = "#{i + 1}-inch Bone"
+      end
+      puts dog.inspect
+      
+      cat = Pet::Cat.create!(:name => "Mittens #{i}") do |cat|
+        cat.owner = owner
+        cat.longest_nap = 100 + i
+      end
+      puts cat.inspect
+    end
+  end
 end
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

data/spec/support/models.rb

@@ -1,3 +1,7 @@
+###############################################
+# Non-namespaced models
+###############################################
+
 class Employee < ActiveRecord::Base
   acts_as_superclass
   attr_accessible :first_name, :last_name, :salary, :team, :team_id
@@ -39,3 +43,37 @@ class KnownLanguage < ActiveRecord::Base
   validates :programmer_id, :presence => true
   validates :language_id, :presence => true, :uniqueness => { :scope => :programmer_id }
 end
+
+###############################################
+# Namespaced models
+###############################################
+
+module Pet
+  def self.table_name_prefix
+    'pet_'
+  end
+  
+  class Owner < ActiveRecord::Base
+    attr_accessible :first_name, :last_name
+    has_many :pets
+    validates :first_name, :presence => true
+    validates :last_name, :presence => true
+    validates :ssn, :presence => true
+  end
+
+  class Pet < ActiveRecord::Base
+    acts_as_superclass :subtype => 'species'
+    attr_accessible :name
+    belongs_to :owner
+    validates :owner_id, :presence => true
+    validates :name, :presence => true
+  end
+  
+  class Dog < ActiveRecord::Base
+    inherits_from :pet, :class_name => 'Pet::Pet'
+  end
+  
+  class Dog < ActiveRecord::Base
+    inherits_from :pet, :class_name => 'Pet::Pet'
+  end
+end

data/spec/support/tables.rb

@@ -3,36 +3,58 @@ ActiveRecord::Base.establish_connection(
   :database => File.expand_path(File.join(File.dirname(__FILE__), '../../db/multiple_table_inheritance.db'))
 )
 
-ActiveRecord::Base.connection do
-  ['employees', 'programmers', 'managers', 'teams', 'languages', 'known_languages'].each do |table|
-    execute "DROP TABLE IF EXISTS '#{table}'"
-  end
-  
-  create_table :employees do |t|
-    t.string :subtype, :null => false
-    t.string :first_name, :null => false
-    t.string :last_name, :null => false
-    t.integer :salary, :null => false 
-    t.integer :team_id
-  end
-  
-  create_table :programmers, :inherits => :employee do |t|
-  end
-  
-  create_table :managers, :inherits => :employee do |t|
-    t.integer :bonus
-  end
-  
-  create_table :teams do |t|
-    t.string :name, :null => false
-  end
-  
-  create_table :languages do |t|
-    t.string :name, :null => false
-  end
-  
-  create_table :known_languages do |t|
-    t.integer :programmer_id, :null => false
-    t.integer :language_id, :null => false
-  end
+conn = ActiveRecord::Base.connection
+
+TABLES = ['employees', 'programmers', 'managers', 'teams', 'languages', 'known_languages', 'pet_owners', 'pet_pets', 'pet_dogs', 'pet_cats'].freeze
+TABLES.each do |table|
+  conn.execute "DROP TABLE IF EXISTS '#{table}'"
+end
+
+conn.create_table :employees do |t|
+  t.string :subtype, :null => false
+  t.string :first_name, :null => false
+  t.string :last_name, :null => false
+  t.integer :salary, :null => false 
+  t.integer :team_id
+end
+
+conn.create_table :programmers, :inherits => :employee do |t|
+end
+
+conn.create_table :managers, :inherits => :employee do |t|
+  t.integer :bonus
+end
+
+conn.create_table :teams do |t|
+  t.string :name, :null => false
+end
+
+conn.create_table :languages do |t|
+  t.string :name, :null => false
+end
+
+conn.create_table :known_languages do |t|
+  t.integer :programmer_id, :null => false
+  t.integer :language_id, :null => false
+end
+
+conn.create_table :pet_owners do |t|
+  t.string :first_name, :null => false
+  t.string :last_name, :null => false
+  t.string :ssn, :null => false
+end
+
+conn.create_table :pet_pets do |t|
+  t.string :species, :null => false
+  t.integer :owner_id, :null => false
+  t.string :name, :null => false
+  t.string :color
+end
+
+conn.create_table :pet_dogs, :inherits => :pets do |t|
+  t.string :favorite_toy
+end
+
+conn.create_table :pet_cats, :inherits => :pets do |t|
+  t.integer :longest_nap
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156557900 !ruby/object:Gem::Requirement
+  requirement: &2161139800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156557900
+  version_requirements: *2161139800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156557340 !ruby/object:Gem::Requirement
+  requirement: &2161139340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156557340
+  version_requirements: *2161139340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156556760 !ruby/object:Gem::Requirement
+  requirement: &2161138880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156556760
+  version_requirements: *2161138880
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2156556240 !ruby/object:Gem::Requirement
+  requirement: &2161138420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156556240
+  version_requirements: *2161138420
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2156555400 !ruby/object:Gem::Requirement
+  requirement: &2161137960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2156555400
+  version_requirements: *2161137960
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156554360 !ruby/object:Gem::Requirement
+  requirement: &2161137500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2156554360
+  version_requirements: *2161137500
 description: ActiveRecord plugin designed to allow simple multiple table inheritance.
 email:
 - matt@matthuggins.com