diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-01-20 10:33:38 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-01-20 10:33:38 +0100 |
| commit | 236f1f52cdcb695ee42ec1ad384fc9bee643f435 (patch) | |
| tree | d618fb10c41909f826b57e8a0589ed442d186f5a /activemodel | |
| parent | a282301a77288252d135855d088f20de2397998e (diff) | |
| parent | 94e0f1db1cf17aa86fed5d7dad50f9e82238900a (diff) | |
| download | rails-236f1f52cdcb695ee42ec1ad384fc9bee643f435.tar.gz rails-236f1f52cdcb695ee42ec1ad384fc9bee643f435.tar.bz2 rails-236f1f52cdcb695ee42ec1ad384fc9bee643f435.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/mass_assignment_security.rb | 38 | ||||
| -rw-r--r-- | activemodel/lib/active_model/observing.rb | 10 |
2 files changed, 26 insertions, 22 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb index 66cd9fdde6..97e31d4243 100644 --- a/activemodel/lib/active_model/mass_assignment_security.rb +++ b/activemodel/lib/active_model/mass_assignment_security.rb @@ -20,32 +20,32 @@ module ActiveModel # For example, a logged in user may need to assign additional attributes depending # on their role: # - # class AccountsController < ApplicationController - # include ActiveModel::MassAssignmentSecurity + # class AccountsController < ApplicationController + # include ActiveModel::MassAssignmentSecurity # - # attr_accessible :first_name, :last_name + # attr_accessible :first_name, :last_name # - # def self.admin_accessible_attributes - # accessible_attributes + [ :plan_id ] - # end + # def self.admin_accessible_attributes + # accessible_attributes + [ :plan_id ] + # end # - # def update - # ... - # @account.update_attributes(account_params) - # ... - # end + # def update + # ... + # @account.update_attributes(account_params) + # ... + # end # - # protected + # protected # - # def account_params - # sanitize_for_mass_assignment(params[:account]) - # end + # def account_params + # sanitize_for_mass_assignment(params[:account]) + # end # - # def mass_assignment_authorizer - # admin ? admin_accessible_attributes : super - # end + # def mass_assignment_authorizer + # admin ? admin_accessible_attributes : super + # end # - # end + # end # module ClassMethods # Attributes named in this macro are protected from mass-assignment diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb index 0d2dd36e59..bf4fd0740c 100644 --- a/activemodel/lib/active_model/observing.rb +++ b/activemodel/lib/active_model/observing.rb @@ -13,14 +13,18 @@ module ActiveModel # # Activates the observers assigned. Examples: # + # class ORM + # include ActiveModel::Observing + # end + # # # Calls PersonObserver.instance - # ActiveRecord::Base.observers = :person_observer + # ORM.observers = :person_observer # # # Calls Cacher.instance and GarbageCollector.instance - # ActiveRecord::Base.observers = :cacher, :garbage_collector + # ORM.observers = :cacher, :garbage_collector # # # Same as above, just using explicit class references - # ActiveRecord::Base.observers = Cacher, GarbageCollector + # ORM.observers = Cacher, GarbageCollector # # Note: Setting this does not instantiate the observers yet. # +instantiate_observers+ is called during startup, and before |