@@ -1,5 +1 @@ require 'trusted_params' - -ActiveRecord::Base.class_eval do - include TrustedParams::ActiveRecordAdditions -end init.rb @@ -2,13 +2,14 @@ module TrustedParams module ActiveRecordAdditions def self.included(base) base.extend(ClassMethods) + base.alias_method_chain :remove_attributes_protected_from_mass_assignment, :trusted_params end - def remove_attributes_protected_from_mass_assignment(attributes) - unless self.class.accessible_attributes.include? "all" + def remove_attributes_protected_from_mass_assignment_with_trusted_params(attributes) + unless self.class.accessible_attributes && self.class.accessible_attributes.include?("all") attributes.each do |key, value| - unless self.class.accessible_attributes.include?(key.to_s) || attributes.trusted?(key) - raise ActiveRecord::UnavailableAttributeAssignmentError, "attribute \"#{key}\" is protected from mass assignment" + unless (self.class.accessible_attributes && self.class.accessible_attributes.include?(key.to_s)) || attributes.trusted?(key) + raise ActiveRecord::UnavailableAttributeAssignmentError, "attribute \"#{key}\" is protected from mass assignment, use attr_accessible" end end end @@ -16,7 +17,11 @@ module TrustedParams end module ClassMethods - def attr_protected(*args) + def self.extended(base) + base.metaclass.alias_method_chain :attr_protected, :disabled + end + + def attr_protected_with_disabled(*args) raise "attr_protected has been disabled by trusted-params plugin, use attr_accessible" end end @@ -24,11 +29,9 @@ module TrustedParams end module ActiveRecord - # TODO for some reason this doesn't work for overriding methods - # currently this is done in init.rb instead - # Base.class_eval do - # include TrustedParams::ActiveRecordAdditions - # end + Base.class_eval do + include TrustedParams::ActiveRecordAdditions + end class UnavailableAttributeAssignmentError < ActiveRecordError end lib/trusted_params/active_record_additions.rb @@ -9,9 +9,6 @@ Spec::Runner.configure do |config| end class MockedModel < ActiveRecord::Base - - include TrustedParams::ActiveRecordAdditions - class_inheritable_hash :paginate_options def self.paginate(options) spec/spec_helper.rb 222c66b1cc5b2b35a7295a801e55976dad651c0c Ryan Bates ryan@railscasts.com http://github.com/ryanb/trusted-params/commit/195840d81e664d0798708c2b35070f1a8bfa31bd 195840d81e664d0798708c2b35070f1a8bfa31bd 2009-06-01T11:36:52-07:00 2009-06-01T11:36:52-07:00 using alias method chain so method override happens fd6a82857cfc994d71a5eb885176e08fc68dd4b5 Ryan Bates ryan@railscasts.com