diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-10-15 14:41:59 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-10-15 14:41:59 -0700 |
| commit | e1490d4e4c60211173d51e7b21c16dbe4c2d942a (patch) | |
| tree | 673813015c1328f600862d7de82f2a3f538980d4 | |
| parent | 02b76862e1ff8ceccb3cd48922ac178462e14892 (diff) | |
| download | rails-e1490d4e4c60211173d51e7b21c16dbe4c2d942a.tar.gz rails-e1490d4e4c60211173d51e7b21c16dbe4c2d942a.tar.bz2 rails-e1490d4e4c60211173d51e7b21c16dbe4c2d942a.zip | |
Change config implementation in AV slightly
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index a226054194..7843623996 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -20,7 +20,7 @@ ActiveSupport::Deprecation.debug = true ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect } ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect } -ActionView::Base.config = { :assets_dir => '/nowhere' } +ActionView::Base::DEFAULT_CONFIG = { :assets_dir => '/nowhere' } $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers" diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 58dae0bb0f..84e4103280 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -167,7 +167,16 @@ module ActionView #:nodoc: module Subclasses end - include Helpers, Rendering, Partials, ::ERB::Util, ActiveSupport::Configurable + include Helpers, Rendering, Partials, ::ERB::Util + + def config + self.config = DEFAULT_CONFIG unless @config + @config + end + + def config=(config) + @config = ActiveSupport::OrderedOptions.new.merge(config) + end extend ActiveSupport::Memoizable |