multiple_table_inheritance 0.1.7 → 0.1.9

data/CHANGELOG.md

@@ -1,9 +1,19 @@
-0.1.8
+0.1.10
 
 * Child model records can now inherit parent model methods via the :methods
   option when calling :inherits_from.
 * Added several unit tests.
 
+0.1.9
+
+* Remove broken code accidentally included during testing.
+
+0.1.8
+
+* Fix bug where rake commands cannot be run if `inherits_from` or
+  `acts_as_superclass` have been called within an ActiveRecord model and the
+  model's tables do not already exist.
+
 0.1.7
 
 * Fix bug caused by extraneous super call in sanitizer class.

data/README.md

@@ -25,7 +25,7 @@ From the command line:
 
 From your Gemfile:
 
-    gem 'multiple_table_inheritance', '~> 0.1.7'
+    gem 'multiple_table_inheritance', '~> 0.1.9'
 
 Usage
 =====
@@ -236,6 +236,9 @@ 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.9.  Please wait until
+a future release to prior to using this feature.
+
     class Employee < ActiveRecord::Base
       acts_as_superclass
       belongs_to :team
@@ -253,6 +256,3 @@ option when calling `inherits_from`.
     @programmer = Programmer.first
     @programmer.give_raise!
     # yields: "Congrats on your well-deserved raise, Mike!"
-
-NOTE: This is not fully implemented yet as of version 0.1.7.  Please wait until
-a future release to prior to using this feature.

data/lib/multiple_table_inheritance/child/base.rb

@@ -16,7 +16,9 @@ module MultipleTableInheritance
           options = Base::default_options.merge(options.to_options)
           inherit_methods = options.delete(:methods)
           
-          extend FinderMethods, SharedMethods
+          @inherited_attribute_methods_mutex = Mutex.new
+          
+          extend AttributeMethods, FinderMethods, SharedMethods
           include InstanceMethods, SharedMethods
           include DelegateMethods if inherit_methods
           
@@ -29,41 +31,31 @@ module MultipleTableInheritance
             send("#{parent_association_name}_without_autobuild") || send("build_#{parent_association_name}")
           end
           
-          # Allow getting and setting of parent attributes and relationships.
-          inherited_columns_and_associations.each do |name|
-            delegate name, "#{name}=", :to => parent_association_name
-          end
-          
-          # Ensure parent's accessible attributes are accessible in child.
-          parent_association_class.accessible_attributes.each do |attr|
-            attr_accessible attr.to_sym
-          end
-          
           # Bind relationship, handle validation, and save properly.
           belongs_to parent_association_name, options
           alias_method_chain parent_association_name, :autobuild
           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
-          reflection = create_reflection(:belongs_to, parent_association_name, {}, self)
-          reflection.klass
+          @parent_association_class ||= begin
+            reflection = create_reflection(:belongs_to, parent_association_name, {}, self)
+            reflection.klass
+          end
         end
         
         private
         
         def inherited_columns_and_associations
           # Get the associated columns and relationship names
-          inherited_columns = parent_association_class.column_names
+          inherited_columns = parent_association_class.column_names - column_names
           inherited_methods = parent_association_class.reflections.map { |key, value| key.to_s }
           
-          # Filter out columns that the class already has
-          # inherited_columns = inherited_columns.reject do |column|
-          #   (self.column_names.grep(column).length > 0) || (column == 'type') || (column == parent_association_class.subtype_column)
-          # end
-          
           # Filter out methods that the class already has
           inherited_methods = inherited_methods.reject do |method|
             self.reflections.map { |key, value| key.to_s }.include?(method)
@@ -73,13 +65,49 @@ module MultipleTableInheritance
         end
       end
       
+      module AttributeMethods
+        def define_attribute_methods
+          super
+          
+          @inherited_attribute_methods_mutex.synchronize do
+            return if inherited_attribute_methods_generated?
+            inherit_parent_attributes
+            inherit_parent_accessible_attributes
+            inherited_attribute_methods_generated!
+          end
+        end
+        
+        def inherit_parent_attributes
+          inherited_columns_and_associations.each do |name|
+            delegate name, "#{name}=", :to => parent_association_name
+          end
+        end
+        
+        def inherit_parent_accessible_attributes
+          parent_association_class.accessible_attributes.each do |attr|
+            attr_accessible attr.to_sym
+          end
+        end
+        
+        def inherited_attribute_methods_generated?
+          @inherited_attribute_methods_generated ||= false
+        end
+        
+        def inherited_attribute_methods_generated!
+          @inherited_attribute_methods_generated = true
+        end
+      end
+      
       module FinderMethods
         def find_by_sql(*args)
           child_records = super(*args)
           
+          ids = child_records.collect(&:id)
+          parent_records = parent_association_class.as_supertype.find_all_by_id(ids)
+          
           child_records.each do |child|
-            parent = parent_association_class.as_supertype.find_by_id(child.id)
-            child.send(:parent_association=, parent)
+            parent = parent_records.find { |parent| parent.id == child.id }
+            child.send(:parent_association=, parent) if parent
           end
         end
       end

data/lib/multiple_table_inheritance/parent/base.rb

@@ -17,11 +17,36 @@ module MultipleTableInheritance
           options = Base::default_options.merge(options.to_options)
           self.subtype_column = options[:subtype]
           
+          @child_attribute_methods_mutex = Mutex.new
+          extend AttributeMethods
+        end
+      end
+      
+      module AttributeMethods
+        def define_attribute_methods
+          super
+          
+          @child_attribute_methods_mutex.synchronize do
+            return if child_attribute_methods_generated?
+            extend_child_association
+            child_attribute_methods_generated!
+          end
+        end
+        
+        def extend_child_association
           if column_names.include?(subtype_column.to_s)
             include InstanceMethods
             before_destroy :destroy_child_association
           end
         end
+        
+        def child_attribute_methods_generated?
+          @child_attribute_methods_generated ||= false
+        end
+        
+        def child_attribute_methods_generated!
+          @child_attribute_methods_generated = true
+        end
       end
       
       module InstanceMethods

data/lib/multiple_table_inheritance/version.rb

@@ -1,3 +1,3 @@
 module MultipleTableInheritance
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/spec/spec_helper.rb

@@ -4,8 +4,9 @@ require 'multiple_table_inheritance'
 
 MultipleTableInheritance::Railtie.insert
 
-require 'support/tables'
+require 'support/database'
 require 'support/models'
+require 'support/tables'
 
 module MultipleTableInheritanceSpecHelper
   def mock_employees!

data/spec/support/database.rb

@@ -0,0 +1,10 @@
+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)

data/spec/support/tables.rb

@@ -1,13 +1,3 @@
-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
 
 #########################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153035620 !ruby/object:Gem::Requirement
+  requirement: &2156229580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153035620
+  version_requirements: *2156229580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153035040 !ruby/object:Gem::Requirement
+  requirement: &2156229000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153035040
+  version_requirements: *2156229000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153034460 !ruby/object:Gem::Requirement
+  requirement: &2156228420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2153034460
+  version_requirements: *2156228420
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2153033940 !ruby/object:Gem::Requirement
+  requirement: &2156227840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153033940
+  version_requirements: *2156227840
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153033420 !ruby/object:Gem::Requirement
+  requirement: &2156227260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2153033420
+  version_requirements: *2156227260
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2153032860 !ruby/object:Gem::Requirement
+  requirement: &2156226680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2153032860
+  version_requirements: *2156226680
 description: ActiveRecord plugin designed to allow simple multiple table inheritance.
 email:
 - matt@matthuggins.com
@@ -106,6 +106,7 @@ files:
 - spec/active_record/child_spec.rb
 - spec/active_record/parent_spec.rb
 - spec/spec_helper.rb
+- spec/support/database.rb
 - spec/support/models.rb
 - spec/support/tables.rb
 homepage: http://github.com/mhuggins/multiple_table_inheritance
@@ -137,5 +138,6 @@ test_files:
 - spec/active_record/child_spec.rb
 - spec/active_record/parent_spec.rb
 - spec/spec_helper.rb
+- spec/support/database.rb
 - spec/support/models.rb
 - spec/support/tables.rb