multiple_table_inheritance 0.1.3 → 0.1.4

data/spec/active_record/parent_spec.rb

@@ -10,58 +10,57 @@ describe MultipleTableInheritance::Parent do
     end
   end
   
-  context 'non-namespaced classes' do
+  context 'non-namespaced classes with default subtype' 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)
+        Employee.find_each do |employee_subtype|
+          employee_subtype.should_not be_instance_of(Employee)
+          ['Programmer', 'Manager', 'Janitor'].should include(employee_subtype.class.to_s)
         end
       end
-    
+      
       it 'should allow access to parent record' do
-        programmer_or_manager = Employee.first
-        programmer_or_manager.employee.should be_instance_of(Employee)
+        employee_subtype = Employee.first
+        employee_subtype.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 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
+            @employee_subtype = 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
+            Team.should_not_receive(:find_by_sql)
+            @employee_subtype.employee.team
           end
         end
-      
+        
         context 'is disabled' do
           before do
-            @programmer_or_manager = Employee.first
+            @employee_subtype = 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
+            pending "appears to be an rspec bug preventing this from working"
+            Team.should_not_receive(:find_by_sql).with(any_args).once
+            @employee_subtype.employee.team
           end
         end
       end
@@ -69,7 +68,7 @@ describe MultipleTableInheritance::Parent do
     
     context 'deleting records' do
       before do
-        programmer = Programmer.create!(:first_name => 'Billy', :last_name => 'Ray', :salary => 50000, :team => @team)
+        programmer = Programmer.create!(:first_name => 'Billy', :last_name => 'Ray', :salary => 50000)
         @employee = programmer.employee
         @employee_id = programmer.id
       end
@@ -87,30 +86,45 @@ describe MultipleTableInheritance::Parent do
     
     context 'an invalid subtype exists' do
       before do
-        @employee = Employee.create!(:first_name => 'Sub', :last_name => 'Type', :salary => 50000, :team => @team) do |employee|
+        @employee = Employee.create!(:first_name => 'Sub', :last_name => 'Type', :salary => 50000) do |employee|
           employee.subtype = 'DoesNotExist'
         end
       end
       
-      it 'should return successfully' do
-        @employee.should be_instance_of(Employee)
+      it 'should not have errors' do
+        @employee.errors.messages.should be_empty
       end
       
-      it 'should log an error' do
-        pending "logger.error should have been called"
+      it 'should have been saved' do
+        @employee.should_not be_new_record
+      end
+      
+      context 'retrieving saved record' do
+        before do
+          @record = Employee.find_by_id(@employee.id)
+        end
+        
+        it 'should not return the parent model instance' do
+          @record.should be_nil
+        end
+        
+        context 'logger exists on model' do
+          before do
+            require 'logger'
+            @logger = Logger.new(nil)
+            ActiveRecord::Base.stub(:logger).and_return(@logger)
+          end
+          
+          it 'should log a warning' do
+            @logger.should_receive(:warn)
+            Employee.find_by_id(@employee.id)
+          end
+        end
       end
-    end
-    
-    context 'default subtype' do
-      pending "test_everything"
-    end
-    
-    context 'custom subtype' do
-      pending "test_everything"
     end
   end
   
-  context 'namespaced classes' do
+  context 'namespaced classes with custom subtype' do
     context 'retrieving records' do
       before(:each) do
         mock_pets!

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'support/models'
 module MultipleTableInheritanceSpecHelper
   def mock_employees!
     3.times do |i|
-      team = Team.create!(:name => "Team#{i}")
+      team = Team.create!(:name => "Team #{i}")
       language = Language.create!(:name => "Java 1.#{i + 4}")
     end
     
@@ -28,6 +28,13 @@ module MultipleTableInheritanceSpecHelper
           :salary => 70000 + (i * 2500),
           :team => Team.first,
           :bonus => i * 2500)  # manager-specific field
+      
+      Janitor.create!(
+          :first_name => "Phil",
+          :last_name => "Moore #{i}",
+          :salary => 40000 + (i * 1000),
+          :team => Team.last,
+          :preferred_cleaner => %w{Comet Windex Swiffer}[i % 3])  # janitor-specific field
     end
   end
   
@@ -39,15 +46,13 @@ module MultipleTableInheritanceSpecHelper
       
       dog = Pet::Dog.create!(:name => "Rover #{i}") do |dog|
         dog.owner = owner
-        dog.favorite_toy = "#{i + 1}-inch Bone"
+        dog.favorite_toy = "#{i + 1}-inch Bone"  # dog-specific field
       end
-      puts dog.inspect
       
       cat = Pet::Cat.create!(:name => "Mittens #{i}") do |cat|
         cat.owner = owner
-        cat.longest_nap = 100 + i
+        cat.longest_nap = 100 + i  # cat-specific field
       end
-      puts cat.inspect
     end
   end
 end

data/spec/support/models.rb

@@ -1,6 +1,7 @@
-###############################################
-# Non-namespaced models
-###############################################
+#########################################################
+# Non-namespaced models with mass-assignment security
+# everywhere or only on parent.
+#########################################################
 
 class Employee < ActiveRecord::Base
   acts_as_superclass
@@ -9,21 +10,29 @@ class Employee < ActiveRecord::Base
   validates :first_name, :presence => true
   validates :last_name, :presence => true
   validates :salary, :presence => true, :numericality => { :min => 0 }
+  
+  def give_raise!(amount)
+    Employee.update_counters self.id, :salary => amount
+  end
 end
 
 class Programmer < ActiveRecord::Base
-  inherits_from :employee
+  inherits_from :employee  #, :methods => true
   attr_accessible :languages, :language_ids
   has_many :known_languages
   has_many :languages, :through => :known_languages
 end
 
 class Manager < ActiveRecord::Base
-  inherits_from :employee
+  inherits_from :employee  #, :methods => true
   attr_accessible :bonus
   validates :bonus, :numericality => true
 end
 
+class Janitor < ActiveRecord::Base
+  inherits_from :employee  #, :methods => true
+end
+
 class Team < ActiveRecord::Base
   attr_accessible :name, :description
   has_many :employees
@@ -44,9 +53,32 @@ class KnownLanguage < ActiveRecord::Base
   validates :language_id, :presence => true, :uniqueness => { :scope => :programmer_id }
 end
 
-###############################################
-# Namespaced models
-###############################################
+#########################################################
+# Non-namespaced models with mass assignment security
+# only on children or not specified.
+#########################################################
+
+class Clothing < ActiveRecord::Base
+  acts_as_superclass
+  validates :color, :presence => true
+end
+
+class Shirt < ActiveRecord::Base
+  inherits_from :clothing
+  attr_accessible :size
+  validates :size, :presence => true
+end
+
+class Pants < ActiveRecord::Base
+  inherits_from :clothing
+  validates :waist_size, :presence => true
+  validates :length, :presence => true
+end
+
+#########################################################
+# Namespaced models with mass assignment security
+# everywhere or only on parent.
+#########################################################
 
 module Pet
   def self.table_name_prefix
@@ -67,13 +99,47 @@ module Pet
     belongs_to :owner
     validates :owner_id, :presence => true
     validates :name, :presence => true
+    
+    def rename!(new_name)
+      update_attributes!(:name => new_name)
+    end
   end
   
-  class Dog < ActiveRecord::Base
+  class Cat < ActiveRecord::Base
     inherits_from :pet, :class_name => 'Pet::Pet'
+    attr_accessible :longest_nap
   end
   
   class Dog < ActiveRecord::Base
     inherits_from :pet, :class_name => 'Pet::Pet'
   end
 end
+
+#########################################################
+# Namespaced models with mass assignment security
+# only on children or not specified.
+#########################################################
+
+module Store
+  def self.table_name_prefix
+    'store_'
+  end
+  
+  class Furniture < ActiveRecord::Base
+    acts_as_superclass
+    validates :brand, :presence => true
+    validates :name, :presence => true
+  end
+  
+  class Bed < ActiveRecord::Base
+    inherits_from :furniture, :class_name => 'Store::Furniture'
+    validates :size, :presence => true
+  end
+  
+  class Table < ActiveRecord::Base
+    inherits_from :furniture, :class_name => 'Store::Furniture'
+    attr_accessible :chairs, :color
+    validates :chairs, :presence => true, :numericality => { :min => 1 }
+    validates :color, :presence => true
+  end
+end

data/spec/support/tables.rb

@@ -1,14 +1,18 @@
-ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => File.expand_path(File.join(File.dirname(__FILE__), '../../db/multiple_table_inheritance.db'))
-)
+db_path = File.expand_path(File.join(File.dirname(__FILE__), '../../db'))
+db_file = File.join(db_path, 'multiple_table_inheritance.db')
 
+# Create/Overwrite database file
+File.delete(db_file) if File.exist?(db_file)
+Dir.mkdir(db_path) unless File.directory?(db_path)
+File.open(db_file, 'w') {}
+
+# Open a database connection
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => db_file)
 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
+#########################################################
+# Employee entities
+#########################################################
 
 conn.create_table :employees do |t|
   t.string :subtype, :null => false
@@ -25,6 +29,10 @@ conn.create_table :managers, :inherits => :employee do |t|
   t.integer :bonus
 end
 
+conn.create_table :janitors, :inherits => :employee do |t|
+  t.string :preferred_cleaner
+end
+
 conn.create_table :teams do |t|
   t.string :name, :null => false
 end
@@ -38,6 +46,28 @@ conn.create_table :known_languages do |t|
   t.integer :language_id, :null => false
 end
 
+#########################################################
+# Clothing entities
+#########################################################
+
+conn.create_table :clothings do |t|
+  t.string :subtype, :null => false
+  t.string :color, :null => false
+end
+
+conn.create_table :shirts, :inherits => :clothing do |t|
+  t.string :size, :limit => 2, :null => false
+end
+
+conn.create_table :pants, :inherits => :clothing do |t|
+  t.integer :waist_size, :null => false
+  t.integer :length, :null => false
+end
+
+#########################################################
+# Pet entities
+#########################################################
+
 conn.create_table :pet_owners do |t|
   t.string :first_name, :null => false
   t.string :last_name, :null => false
@@ -51,10 +81,29 @@ conn.create_table :pet_pets do |t|
   t.string :color
 end
 
-conn.create_table :pet_dogs, :inherits => :pets do |t|
+conn.create_table :pet_dogs, :inherits => :pet do |t|
   t.string :favorite_toy
 end
 
-conn.create_table :pet_cats, :inherits => :pets do |t|
+conn.create_table :pet_cats, :inherits => :pet do |t|
   t.integer :longest_nap
 end
+
+#########################################################
+# Store entities
+#########################################################
+
+conn.create_table :store_furnitures do |t|
+  t.string :subtype, :null => false
+  t.string :brand, :null => false
+  t.string :name, :null => false
+end
+
+conn.create_table :store_beds, :inherits => :furniture do |t|
+  t.string :size, :null => false
+end
+
+conn.create_table :store_tables, :inherits => :furniture do |t|
+  t.integer :chairs, :null => false
+  t.string :color, :null => false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161139800 !ruby/object:Gem::Requirement
+  requirement: &2153195660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161139800
+  version_requirements: *2153195660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161139340 !ruby/object:Gem::Requirement
+  requirement: &2153195200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161139340
+  version_requirements: *2153195200
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2161138880 !ruby/object:Gem::Requirement
+  requirement: &2153194720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2161138880
+  version_requirements: *2153194720
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2161138420 !ruby/object:Gem::Requirement
+  requirement: &2153194240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161138420
+  version_requirements: *2153194240
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2161137960 !ruby/object:Gem::Requirement
+  requirement: &2153193740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2161137960
+  version_requirements: *2153193740
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2161137500 !ruby/object:Gem::Requirement
+  requirement: &2153142060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2161137500
+  version_requirements: *2153142060
 description: ActiveRecord plugin designed to allow simple multiple table inheritance.
 email:
 - matt@matthuggins.com
@@ -87,6 +87,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -94,13 +95,14 @@ files:
 - lib/multiple_table_inheritance.rb
 - lib/multiple_table_inheritance/child.rb
 - lib/multiple_table_inheritance/child/base.rb
+- lib/multiple_table_inheritance/child/sanitizer.rb
 - lib/multiple_table_inheritance/migration.rb
 - lib/multiple_table_inheritance/parent.rb
 - lib/multiple_table_inheritance/parent/base.rb
 - lib/multiple_table_inheritance/parent/relation.rb
 - lib/multiple_table_inheritance/railtie.rb
 - lib/multiple_table_inheritance/version.rb
-- multiiple_table_inheritance.gemspec
+- multiple_table_inheritance.gemspec
 - spec/active_record/child_spec.rb
 - spec/active_record/parent_spec.rb
 - spec/spec_helper.rb