multiple_table_inheritance 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.2.1
+
+* Ensure the subtype value is always set to the child class name even when a
+  new record is being built.
+
 0.2.0
 
 * Child model records can now inherit parent model methods via the :methods

data/README.md

@@ -25,7 +25,7 @@ From the command line:
 
 From your Gemfile:
 
-    gem 'multiple_table_inheritance', '~> 0.2.0'
+    gem 'multiple_table_inheritance', '~> 0.2.1'
 
 Usage
 =====

data/lib/multiple_table_inheritance/child/base.rb

@@ -25,15 +25,11 @@ module MultipleTableInheritance
           self.parent_association_name = association_name.to_sym
           self.primary_key = "#{parent_association_name}_id"
           
-          # Ensure parent association is always returned.
-          define_method("#{parent_association_name}_with_autobuild") do
-            send("#{parent_association_name}_without_autobuild") || send("build_#{parent_association_name}")
-          end
+          define_parent_association_builder
           
           # 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
         end
@@ -47,6 +43,17 @@ module MultipleTableInheritance
         
         private
         
+        def define_parent_association_builder
+          subtype_column = parent_association_class.subtype_column
+          define_method("#{parent_association_name}_with_autobuild") do
+            unless association = send("#{parent_association_name}_without_autobuild")
+              association = send("build_#{parent_association_name}")
+              association.send("#{subtype_column}=", self.class.to_s)
+            end
+            association
+          end
+        end
+        
         def inherited_columns_and_associations
           # Get the associated columns and relationship names
           inherited_columns = parent_association_class.column_names - column_names
@@ -129,13 +136,6 @@ module MultipleTableInheritance
           send("#{parent_association_name}=", record)
         end
         
-        def set_association_subtype
-          association = parent_association
-          if association.attribute_names.include?(association.class.subtype_column)
-            association[association.class.subtype_column] = self.class.to_s
-          end
-        end
-        
         def parent_association_must_be_valid
           association = parent_association
           

data/lib/multiple_table_inheritance/version.rb

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

metadata

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