multiple_table_inheritance 0.1.9 → 0.1.10

data/CHANGELOG.md

@@ -1,9 +1,15 @@
-0.1.10
+0.1.11
 
 * Child model records can now inherit parent model methods via the :methods
   option when calling :inherits_from.
 * Added several unit tests.
 
+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.
+
 0.1.9
 
 * Remove broken code accidentally included during testing.
@@ -13,6 +19,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.
+* Update order of loading test to ensure models can be loaded before tables
+  exist.
 
 0.1.7
 

data/README.md

@@ -25,7 +25,7 @@ From the command line:
 
 From your Gemfile:
 
-    gem 'multiple_table_inheritance', '~> 0.1.9'
+    gem 'multiple_table_inheritance', '~> 0.1.10'
 
 Usage
 =====
@@ -236,7 +236,7 @@ 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
+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

data/lib/multiple_table_inheritance/child/sanitizer.rb

@@ -73,11 +73,19 @@ module MultipleTableInheritance
       end
       
       def child_attribute_names
-        @child_attribute_names ||= @target.attribute_names
+        @child_attribute_names ||= begin
+          columns = @target.attribute_names
+          associations = @target.reflections.map { |key, value| key.to_s }
+          columns + associations
+        end
       end
       
       def parent_attribute_names
-        @parent_attribute_names ||= @target.parent_association_class.attribute_names
+        @parent_attribute_names ||= begin
+          columns = @target.parent_association_class.attribute_names
+          associations = @target.parent_association_class.reflections.map { |key, value| key.to_s }
+          columns + associations
+        end
       end
     end
   end

data/lib/multiple_table_inheritance/version.rb

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

data/spec/active_record/child_spec.rb

@@ -147,6 +147,30 @@ describe MultipleTableInheritance::Child do
             @pants.should_not be_new_record
           end
         end
+        
+        context 'with relationships' do
+          before(:each) do
+            @user = User.create!(:username => 'bob')
+            @image = Image.create(:url => 'https://www.google.com/images/srpr/logo3w.png')
+            @advertisement = ImageAdvertisement.create(:user => @user, :image => @image)
+          end
+          
+          it 'should not have errors' do
+            @advertisement.errors.messages.should be_empty
+          end
+          
+          it 'should have been saved' do
+            @advertisement.should_not be_new_record
+          end
+          
+          it 'should have correct user_id' do
+            @advertisement.user_id.should == @user.id
+          end
+          
+          it 'should have correct image_id' do
+            @advertisement.image_id.should == @image.id
+          end
+        end
       end
     end
     

data/spec/support/models.rb

@@ -143,3 +143,34 @@ module Store
     validates :color, :presence => true
   end
 end
+
+#########################################################
+# Model that includes relationships on both child and
+# parent with no mass assignment security defined.
+#########################################################
+
+class User < ActiveRecord::Base
+  validates :username, :presence => true, :uniqueness => true
+end
+
+class Image < ActiveRecord::Base
+  validates :url, :presence => true
+end
+
+class Advertisement < ActiveRecord::Base
+  acts_as_superclass
+  belongs_to :user
+  validates :user, :presence => true
+end
+
+class ImageAdvertisement < ActiveRecord::Base
+  inherits_from :advertisement
+  belongs_to :image
+  validates :image, :presence => true
+end
+
+class TextAdvertisement < ActiveRecord::Base
+  inherits_from :advertisement
+  validates :title, :presence => true
+  validates :body, :presence => true
+end

data/spec/support/tables.rb

@@ -97,3 +97,29 @@ conn.create_table :store_tables, :inherits => :furniture do |t|
   t.integer :chairs, :null => false
   t.string :color, :null => false
 end
+
+#########################################################
+# Store entities
+#########################################################
+
+conn.create_table :users do |t|
+  t.string :username, :null => false
+end
+
+conn.create_table :images do |t|
+  t.string :url, :null => false
+end
+
+conn.create_table :advertisements do |t|
+  t.string :subtype, :null => false
+  t.integer :user_id, :null => false
+end
+
+conn.create_table :image_advertisements, :inherits => :advertisement do |t|
+  t.integer :image_id, :null => false
+end
+
+conn.create_table :text_advertisements, :inherits => :advertisement do |t|
+  t.string :title, :null => false
+  t.string :body, :null => false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156229580 !ruby/object:Gem::Requirement
+  requirement: &2156165380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156229580
+  version_requirements: *2156165380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156229000 !ruby/object:Gem::Requirement
+  requirement: &2156164800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156229000
+  version_requirements: *2156164800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156228420 !ruby/object:Gem::Requirement
+  requirement: &2156164220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156228420
+  version_requirements: *2156164220
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2156227840 !ruby/object:Gem::Requirement
+  requirement: &2156163640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156227840
+  version_requirements: *2156163640
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2156227260 !ruby/object:Gem::Requirement
+  requirement: &2156163060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2156227260
+  version_requirements: *2156163060
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156226680 !ruby/object:Gem::Requirement
+  requirement: &2156141780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2156226680
+  version_requirements: *2156141780
 description: ActiveRecord plugin designed to allow simple multiple table inheritance.
 email:
 - matt@matthuggins.com