multiple_table_inheritance 0.1.5 → 0.1.7

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+0.1.8
+
+* Child model records can now inherit parent model methods via the :methods
+  option when calling :inherits_from.
+* Added several unit tests.
+
+0.1.7
+
+* Fix bug caused by extraneous super call in sanitizer class.
+
+0.1.6
+
+* Fix issue with mass assignment sanitizer classes not being loaded
+  consistently across different versions of Rails 3.
+
 0.1.5
 
 * Fix issue with LoggerSanitizer not being defined in Rails projects.

data/README.md

@@ -25,7 +25,7 @@ From the command line:
 
 From your Gemfile:
 
-    gem 'multiple_table_inheritance', '~> 0.1.5'
+    gem 'multiple_table_inheritance', '~> 0.1.7'
 
 Usage
 =====
@@ -254,5 +254,5 @@ option when calling `inherits_from`.
     @programmer.give_raise!
     # yields: "Congrats on your well-deserved raise, Mike!"
 
-NOTE: This is not fully implemented yet as of version 0.1.4.  Please wait until
+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

@@ -39,9 +39,6 @@ module MultipleTableInheritance
             attr_accessible attr.to_sym
           end
           
-          # Sanitize attributes across parent and child
-          self.mass_assignment_sanitizer = Child::Sanitizer.new(self)
-          
           # Bind relationship, handle validation, and save properly.
           belongs_to parent_association_name, options
           alias_method_chain parent_association_name, :autobuild
@@ -94,6 +91,12 @@ module MultipleTableInheritance
       end
       
       module InstanceMethods
+        protected
+        
+        def sanitize_for_mass_assignment(attributes, role = :default)
+          Child::Sanitizer.new(self.class, role).sanitize(attributes)
+        end
+        
         private
         
         def parent_association

data/lib/multiple_table_inheritance/child/sanitizer.rb

@@ -1,14 +1,12 @@
-require 'activemodel/mass_assignment_security/sanitizer' unless defined?(ActiveModel::MassAssignmentSecurity::LoggerSanitizer)
-
 module MultipleTableInheritance
   module Child
-    class Sanitizer < ActiveModel::MassAssignmentSecurity::LoggerSanitizer
-      def initialize(target)
+    class Sanitizer
+      def initialize(target, role)
         @target = target
-        super
+        @role = role
       end
       
-      def sanitize(attributes, authorizer)
+      def sanitize(attributes)
         sanitized_attributes = attributes.reject { |key, value| deny?(key) }
         debug_protected_attribute_removal(attributes, sanitized_attributes)
         sanitized_attributes
@@ -16,6 +14,25 @@ module MultipleTableInheritance
       
     protected
       
+      def debug_protected_attribute_removal(attributes, sanitized_attributes)
+        removed_keys = attributes.keys - sanitized_attributes.keys
+        process_removed_attributes(removed_keys) if removed_keys.any?
+      end
+      
+    private
+      
+      def logger
+        @target.logger
+      end
+      
+      def logger?
+        @target.respond_to?(:logger) && @target.logger
+      end
+      
+      def process_removed_attributes(attrs)
+        logger.warn "Can't mass-assign protected attributes: #{attrs.join(', ')}" if logger?
+      end
+      
       def deny?(key)
         return true if protected_attribute?(key)
         return !accessible_attribute?(key)
@@ -32,19 +49,27 @@ module MultipleTableInheritance
       end
       
       def protected_attributes
-        @protected_attributes ||= (@target.protected_attributes + @target.parent_association_class.protected_attributes)
+        @protected_attributes ||= (protected_child_attributes + protected_parent_attributes)
       end
       
       def accessible_attributes
-        @accessible_attributes ||= (@target.accessible_attributes + @target.parent_association_class.accessible_attributes)
+        @accessible_attributes ||= (accessible_child_attributes + accessible_parent_attributes)
+      end
+      
+      def protected_child_attributes
+        @protected_child_attributes ||= @target.protected_attributes(@role)
+      end
+      
+      def protected_parent_attributes
+        @protected_parent_attributes ||= @target.parent_association_class.protected_attributes(@role)
       end
       
       def accessible_child_attributes
-        @accessible_child_attributes ||= @target.accessible_attributes
+        @accessible_child_attributes ||= @target.accessible_attributes(@role)
       end
       
       def accessible_parent_attributes
-        @accessible_parent_attributes ||= @target.parent_association_class.accessible_attributes
+        @accessible_parent_attributes ||= @target.parent_association_class.accessible_attributes(@role)
       end
       
       def child_attribute_names

data/lib/multiple_table_inheritance/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153110840 !ruby/object:Gem::Requirement
+  requirement: &2153035620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153110840
+  version_requirements: *2153035620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153110260 !ruby/object:Gem::Requirement
+  requirement: &2153035040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153110260
+  version_requirements: *2153035040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153109680 !ruby/object:Gem::Requirement
+  requirement: &2153034460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2153109680
+  version_requirements: *2153034460
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2153109160 !ruby/object:Gem::Requirement
+  requirement: &2153033940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153109160
+  version_requirements: *2153033940
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153108700 !ruby/object:Gem::Requirement
+  requirement: &2153033420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2153108700
+  version_requirements: *2153033420
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2153108140 !ruby/object:Gem::Requirement
+  requirement: &2153032860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2153108140
+  version_requirements: *2153032860
 description: ActiveRecord plugin designed to allow simple multiple table inheritance.
 email:
 - matt@matthuggins.com