diff options
| author | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-21 22:18:10 -0500 |
|---|---|---|
| committer | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-21 22:18:10 -0500 |
| commit | f08a78a057782577d5efbc82662d7898e26dcb8c (patch) | |
| tree | d0638cf1d180ed3713ecafcf36ea1df9bc5eeb7a /railties/lib | |
| parent | c5069bd4951419ea02aea35ac5c121bc0c311940 (diff) | |
| parent | e8f7da6118936af2d145b3c025db4b4dcd0b3308 (diff) | |
| download | rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.gz rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.bz2 rails-f08a78a057782577d5efbc82662d7898e26dcb8c.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib')
| -rwxr-xr-x | railties/lib/commands/performance/request.rb | 6 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/railties/lib/commands/performance/request.rb b/railties/lib/commands/performance/request.rb deleted file mode 100755 index 1773886487..0000000000 --- a/railties/lib/commands/performance/request.rb +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -require 'config/environment' -require 'application' -require 'action_controller/request_profiler' - -ActionController::RequestProfiler.run(ARGV) diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 0bad45d9d8..9f8b59aa3d 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2004-2008 David Heinemeier Hansson +# Copyright (c) 2004-2009 David Heinemeier Hansson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 824d1d6096..f6b8899d58 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -414,6 +414,11 @@ Run `rake gems:install` to install the missing gems. def initialize_cache unless defined?(RAILS_CACHE) silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) } + + if RAILS_CACHE.respond_to?(:middleware) + # Insert middleware to setup and teardown local cache for each request + configuration.middleware.insert_after(:"ActionController::Failsafe", RAILS_CACHE.middleware) + end end end diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 795a0d7653..2c31d89538 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -151,7 +151,7 @@ class AppGenerator < Rails::Generator::Base def create_script_files(m) %w( about console dbconsole destroy generate runner server plugin - performance/benchmarker performance/profiler performance/request + performance/benchmarker performance/profiler ).each do |file| m.file "bin/#{file}", "script/#{file}", { :chmod => 0755, |