multiple_table_inheritance 0.1.10 → 0.2.0

data/CHANGELOG.md

@@ -1,14 +1,15 @@
-0.1.11
+0.2.0
 
 * Child model records can now inherit parent model methods via the :methods
   option when calling :inherits_from.
-* Added several unit tests.
+* Adjusted implementation of find_by_id.
+* Added unit tests pertaining to the above issues.
 
 0.1.10
 
 * Fix issue with sanitizer not allowing relationships to be set when mass
   assignment security is not specified.
-* Added unit tests specific to the above issue.
+* Added unit tests pertaining to the above issue.
 
 0.1.9
 

data/README.md

@@ -25,7 +25,7 @@ From the command line:
 
 From your Gemfile:
 
-    gem 'multiple_table_inheritance', '~> 0.1.10'
+    gem 'multiple_table_inheritance', '~> 0.2.0'
 
 Usage
 =====
@@ -236,9 +236,6 @@ When inheriting from another parent model, methods can optionally be called on
 the parent model automatically as well.  To do so, specify the `:methods`
 option when calling `inherits_from`.
 
-NOTE: This is not fully implemented yet as of version 0.1.10.  Please wait until
-a future release to prior to using this feature.
-
     class Employee < ActiveRecord::Base
       acts_as_superclass
       belongs_to :team

data/lib/multiple_table_inheritance/child/base.rb

@@ -18,11 +18,10 @@ module MultipleTableInheritance
           
           @inherited_attribute_methods_mutex = Mutex.new
           
-          extend AttributeMethods, FinderMethods, SharedMethods
-          include InstanceMethods, SharedMethods
+          extend AttributeMethods, FinderMethods
+          include InstanceMethods
           include DelegateMethods if inherit_methods
           
-          # Set association references.
           self.parent_association_name = association_name.to_sym
           self.primary_key = "#{parent_association_name}_id"
           
@@ -37,9 +36,6 @@ module MultipleTableInheritance
           before_validation :set_association_subtype
           validate :parent_association_must_be_valid
           before_save :parent_association_must_be_saved
-          
-          # denote that the association methods have not been built
-          @loaded = false
         end
         
         def parent_association_class
@@ -110,9 +106,7 @@ module MultipleTableInheritance
             child.send(:parent_association=, parent) if parent
           end
         end
-      end
-      
-      module SharedMethods
+        
         def find_by_id(*args)
           send("find_by_#{parent_association_name}_id", *args)
         end
@@ -128,11 +122,11 @@ module MultipleTableInheritance
         private
         
         def parent_association
-          send(self.class.parent_association_name)
+          send(parent_association_name)
         end
         
         def parent_association=(record)
-          send("#{self.class.parent_association_name}=", record)
+          send("#{parent_association_name}=", record)
         end
         
         def set_association_subtype
@@ -163,16 +157,25 @@ module MultipleTableInheritance
       
       module DelegateMethods
         def method_missing(name, *args, &block)
-          if parent_association.respond_to?(name)
+          if parent_association_respond_to?(name)
             parent_association.send(name, *args, &block)
           else
-            super(name, *args, &block)
+            super
           end
         end
         
         def respond_to?(name, *args)
-          return true if name.to_sym == :parent_association
-          super(name, *args) || parent_association.respond_to?(name)
+          super || parent_association_respond_to?(name)
+        end
+        
+        private
+        
+        def parent_association_respond_to?(name)
+          parent_association_loaded? && parent_association.respond_to?(name)
+        end
+        
+        def parent_association_loaded?
+          !!association_instance_get(parent_association_name)
         end
       end
     end

data/lib/multiple_table_inheritance/version.rb

@@ -1,3 +1,3 @@
 module MultipleTableInheritance
-  VERSION = "0.1.10"
+  VERSION = "0.2.0"
 end

data/spec/active_record/child_spec.rb

@@ -18,6 +18,28 @@ describe MultipleTableInheritance::Child do
         @programmer.employee.should be_instance_of(Employee)
         @programmer.employee.id.should be(@programmer_id)
       end
+      
+      context 'via find_by_id on class' do
+        before do
+          @programmer = Programmer.find_by_id(@programmer_id)
+        end
+        
+        it 'should retrieve child records' do
+          @programmer.should be_instance_of(Programmer)
+          @programmer.id.should be(@programmer_id)
+        end
+      end
+      
+      context 'via find_by_id on relation' do
+        before do
+          @programmer = Programmer.where(Programmer.primary_key => @programmer_id).find_by_id(@programmer_id)
+        end
+        
+        it 'should retrieve child records' do
+          @programmer.should be_instance_of(Programmer)
+          @programmer.id.should be(@programmer_id)
+        end
+      end
     end
     
     context 'creating records' do
@@ -409,8 +431,13 @@ describe MultipleTableInheritance::Child do
         end
         
         it 'should allow parent methods to be called through child' do
-          pending "infinite recursion must be addressed"
-          # @programmer.should respond_to(:give_raise!)
+          @programmer.should respond_to(:give_raise!)
+        end
+        
+        it 'should call parent method through child' do
+          salary = @programmer.salary
+          @programmer.give_raise!(50)
+          @programmer.salary.should == salary + 50
         end
       end
       

data/spec/support/models.rb

@@ -12,25 +12,25 @@ class Employee < ActiveRecord::Base
   validates :salary, :presence => true, :numericality => { :min => 0 }
   
   def give_raise!(amount)
-    Employee.update_counters self.id, :salary => amount
+    update_attributes(:salary => salary + amount)
   end
 end
 
 class Programmer < ActiveRecord::Base
-  inherits_from :employee  #, :methods => true
+  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  #, :methods => true
+  inherits_from :employee, :methods => true
   attr_accessible :bonus
   validates :bonus, :numericality => true
 end
 
 class Janitor < ActiveRecord::Base
-  inherits_from :employee  #, :methods => true
+  inherits_from :employee, :methods => true
 end
 
 class Team < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000Z
+date: 2012-03-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156165380 !ruby/object:Gem::Requirement
+  requirement: &2152938260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156165380
+  version_requirements: *2152938260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156164800 !ruby/object:Gem::Requirement
+  requirement: &2152937760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156164800
+  version_requirements: *2152937760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156164220 !ruby/object:Gem::Requirement
+  requirement: &2152937240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156164220
+  version_requirements: *2152937240
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2156163640 !ruby/object:Gem::Requirement
+  requirement: &2152936760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156163640
+  version_requirements: *2152936760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2156163060 !ruby/object:Gem::Requirement
+  requirement: &2152936300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2156163060
+  version_requirements: *2152936300
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156141780 !ruby/object:Gem::Requirement
+  requirement: &2152935840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2156141780
+  version_requirements: *2152935840
 description: ActiveRecord plugin designed to allow simple multiple table inheritance.
 email:
 - matt@matthuggins.com