diff options
| -rw-r--r-- | actionpack/examples/performance.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 7 | ||||
| -rw-r--r-- | actionpack/lib/action_view/lookup_context.rb | 18 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 2 |
4 files changed, 15 insertions, 17 deletions
diff --git a/actionpack/examples/performance.rb b/actionpack/examples/performance.rb index 398191154c..994e745bb0 100644 --- a/actionpack/examples/performance.rb +++ b/actionpack/examples/performance.rb @@ -1,5 +1,4 @@ ENV['RAILS_ENV'] ||= 'production' -ENV['NO_RELOAD'] ||= '1' require File.expand_path('../../../load_paths', __FILE__) require 'action_pack' @@ -77,6 +76,10 @@ class Runner end end +ActionController::Base.logger = nil +ActionController::Base.config.compile_methods! +ActionView::Resolver.caching = ENV["RAILS_ENV"] == "production" + class BasePostController < ActionController::Base append_view_path "#{File.dirname(__FILE__)}/views" diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 41fdc11196..d95770c049 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -66,12 +66,7 @@ module AbstractController end def view_context_class - @_view_context_class || self.class.view_context_class - end - - def initialize(*) - @_view_context_class = nil - super + @_view_context_class ||= self.class.view_context_class end # An instance of a view class. The default view class is ActionView::Base diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb index fa4bf70f77..d26158cefe 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -20,7 +20,7 @@ module ActionView def self.register_detail(name, options = {}, &block) self.registered_details << name - initialize = registered_details.map { |n| "self.#{n} = details[:#{n}]" } + initialize = registered_details.map { |n| "@details[:#{n}] = details[:#{n}] || default_#{n}" } Accessors.send :define_method, :"default_#{name}", &block Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1 @@ -29,7 +29,7 @@ module ActionView end def #{name}=(value) - value = Array.wrap(value.presence || default_#{name}) + value = value.present? ? Array.wrap(value) : default_#{name} _set_detail(:#{name}, value) if value != @details[:#{name}] end @@ -153,14 +153,14 @@ module ActionView "" end - parts = name.split('/') - name = parts.pop + prefixes = nil if prefixes.blank? + parts = name.split('/') + name = parts.pop - prefixes = if prefixes.blank? - [parts.join('/')] - else - prefixes.map { |prefix| [prefix, *parts].compact.join('/') } - end + return name, prefixes || [""] if parts.empty? + + parts = parts.join('/') + prefixes = prefixes ? prefixes.map { |p| "#{p}/#{parts}" } : [parts] return name, prefixes end diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index f855ea257c..eb80a865b5 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -24,7 +24,7 @@ module ActionView end end - cattr_accessor :caching + class_attribute :caching self.caching = true class << self |