Some small optimizations and improvements to benchmark code.

This commit is contained in:
José Valim 2011-12-08 15:23:23 +01:00
parent 06ac7d3ee0
commit efc28a7f70
4 changed files with 15 additions and 17 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -24,7 +24,7 @@ module ActionView
end
end
cattr_accessor :caching
class_attribute :caching
self.caching = true
class << self