Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Memoize in the endpoint.

  • Loading branch information...
commit 76cd4cb27e2ec197c7f62082334d5d7211fd2d19 1 parent ddb4600
@wycats wycats authored
View
2  .gitignore
@@ -30,5 +30,5 @@ railties/guides/output
actionpack/bin
*/vendor/gems/gems
*/vendor/gems/specifications
-*/vendor/gems/environment.rb
+actionpack/vendor/gems/environment.rb
*/vendor/gems/dirs/specifications
View
15 actionpack/lib/action_controller/metal.rb
@@ -79,6 +79,15 @@ def to_a
end
class ActionEndpoint
+ @@endpoints = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
+
+ def self.for(controller, action, stack)
+ @@endpoints[controller][action][stack] ||= begin
+ endpoint = new(controller, action)
+ stack.build(endpoint)
+ end
+ end
+
def initialize(controller, action)
@controller, @action = controller, action
end
@@ -108,11 +117,7 @@ def self.middleware
# ==== Returns
# Proc:: A rack application
def self.action(name)
- @actions ||= {}
- @actions[name.to_s] ||= begin
- endpoint = ActionEndpoint.new(self, name)
- middleware_stack.build(endpoint)
- end
+ ActionEndpoint.for(self, name, middleware_stack)
end
end
end
View
94 actionpack/vendor/gems/environment.rb
@@ -1,94 +0,0 @@
-# DO NOT MODIFY THIS FILE
-module Bundler
- dir = File.dirname(__FILE__)
-
- ENV["PATH"] = "#{dir}/../../bin:#{ENV["PATH"]}"
- ENV["RUBYOPT"] = "-r#{__FILE__} #{ENV["RUBYOPT"]}"
-
- $LOAD_PATH.unshift File.expand_path("#{dir}/dirs/gems/activemodel-3.0.pre/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/../../../activemodel/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/dirs/gems/activesupport-3.0.pre/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/../../../activesupport/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.0.0/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.0.0/lib")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.4.2/bin")
- $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.4.2/lib")
-
- @gemfile = "#{dir}/../../Gemfile"
-
- require "rubygems"
-
- @bundled_specs = {}
- @bundled_specs["rack"] = eval(File.read("#{dir}/specifications/rack-1.0.0.gemspec"))
- @bundled_specs["rack"].loaded_from = "#{dir}/specifications/rack-1.0.0.gemspec"
- @bundled_specs["activemodel"] = eval(File.read("#{dir}/dirs/specifications/activemodel-3.0.pre.gemspec"))
- @bundled_specs["activemodel"].loaded_from = "#{dir}/dirs/specifications/activemodel-3.0.pre.gemspec"
- @bundled_specs["rack-test"] = eval(File.read("#{dir}/specifications/rack-test-0.4.2.gemspec"))
- @bundled_specs["rack-test"].loaded_from = "#{dir}/specifications/rack-test-0.4.2.gemspec"
- @bundled_specs["activesupport"] = eval(File.read("#{dir}/dirs/specifications/activesupport-3.0.pre.gemspec"))
- @bundled_specs["activesupport"].loaded_from = "#{dir}/dirs/specifications/activesupport-3.0.pre.gemspec"
-
- def self.add_specs_to_loaded_specs
- Gem.loaded_specs.merge! @bundled_specs
- end
-
- def self.add_specs_to_index
- @bundled_specs.each do |name, spec|
- Gem.source_index.add_spec spec
- end
- end
-
- add_specs_to_loaded_specs
- add_specs_to_index
-
- def self.require_env(env = nil)
- context = Class.new do
- def initialize(env) @env = env && env.to_s ; end
- def method_missing(*) ; end
- def only(env)
- old, @only = @only, _combine_onlys(env)
- yield
- @only = old
- end
- def except(env)
- old, @except = @except, _combine_excepts(env)
- yield
- @except = old
- end
- def gem(name, *args)
- opt = args.last || {}
- only = _combine_onlys(opt[:only] || opt["only"])
- except = _combine_excepts(opt[:except] || opt["except"])
- files = opt[:require_as] || opt["require_as"] || name
-
- return unless !only || only.any? {|e| e == @env }
- return if except && except.any? {|e| e == @env }
-
- files.each { |f| require f }
- yield if block_given?
- true
- end
- private
- def _combine_onlys(only)
- return @only unless only
- only = [only].flatten.compact.uniq.map { |o| o.to_s }
- only &= @only if @only
- only
- end
- def _combine_excepts(except)
- return @except unless except
- except = [except].flatten.compact.uniq.map { |o| o.to_s }
- except |= @except if @except
- except
- end
- end
- context.new(env && env.to_s).instance_eval(File.read(@gemfile))
- end
-end
-
-module Gem
- def source_index.refresh!
- super
- Bundler.add_specs_to_index
- end
-end
Please sign in to comment.
Something went wrong with that request. Please try again.