diff options
Diffstat (limited to 'actionpack')
-rwxr-xr-x | actionpack/Rakefile | 5 | ||||
-rw-r--r-- | actionpack/install.rb | 21 | ||||
-rwxr-xr-x | actionpack/lib/action_controller.rb | 18 | ||||
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 6 |
4 files changed, 22 insertions, 28 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index e19025720e..28cf431725 100755 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -47,7 +47,7 @@ spec = Gem::Specification.new do |s| s.name = PKG_NAME s.version = PKG_VERSION s.summary = "Web-flow and rendering framework putting the VC in MVC." - s.description = %q{Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.} + s.description = %q{Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.} #' s.author = "David Heinemeier Hansson" s.email = "david@loudthinking.com" @@ -56,6 +56,9 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' + + s.add_dependency('activesupport', '>= 1.0.0') + s.require_path = 'lib' s.autorequire = 'action_controller' diff --git a/actionpack/install.rb b/actionpack/install.rb index cd83b1a42c..1ca1c74016 100644 --- a/actionpack/install.rb +++ b/actionpack/install.rb @@ -19,8 +19,7 @@ unless $sitedir end makedirs = %w{ action_controller/assertions action_controller/cgi_ext - action_controller/session action_controller/support action_controller/support/core_ext - action_controller/support/core_ext/hash action_controller/support/core_ext/numeric action_controller/support/core_ext/string + action_controller/session action_controller/support action_controller/templates action_controller/templates/rescues action_controller/templates/scaffolds action_view/helpers action_view/vendor action_view/vendor/builder @@ -60,24 +59,6 @@ files = %w- action_controller/session/drb_store.rb action_controller/session/mem_cache_store.rb action_controller/session.rb - action_controller/support/class_inheritable_attributes.rb - action_controller/support/class_attribute_accessors.rb - action_controller/support/clean_logger.rb - action_controller/support/core_ext/hash/keys.rb - action_controller/support/core_ext/hash.rb - action_controller/support/core_ext/object_and_class.rb - action_controller/support/core_ext/numeric/bytes.rb - action_controller/support/core_ext/numeric/time.rb - action_controller/support/core_ext/numeric.rb - action_controller/support/core_ext/string/inflections.rb - action_controller/support/core_ext/string.rb - active_record/support/core_ext.rb - action_controller/support/inflector.rb - action_controller/support/binding_of_caller.rb - action_controller/support/breakpoint.rb - action_controller/support/dependencies.rb - action_controller/support/misc.rb - action_controller/support/module_attribute_accessors.rb action_controller/templates/rescues/_request_and_response.rhtml action_controller/templates/rescues/diagnostics.rhtml action_controller/templates/rescues/layout.rhtml diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 8ed5fda595..30245e934a 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -23,10 +23,20 @@ $:.unshift(File.dirname(__FILE__)) -require 'action_controller/support/core_ext' -require 'action_controller/support/clean_logger' -require 'action_controller/support/misc' -require 'action_controller/support/dependencies' +begin + require 'active_support/core_ext' + require 'active_support/clean_logger' + require 'active_support/misc' + require 'active_support/dependencies' +rescue LoadError + require 'rubygems' + require_gem 'activesupport' + + require 'active_support/core_ext' + require 'active_support/clean_logger' + require 'active_support/misc' + require 'active_support/dependencies' +end require 'action_controller/base' require 'action_controller/rescue' diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 5d7ccf72f1..7883233e84 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -2,9 +2,9 @@ require 'action_controller/request' require 'action_controller/response' require 'action_controller/routing' require 'action_controller/url_rewriter' -require 'action_controller/support/class_attribute_accessors' -require 'action_controller/support/class_inheritable_attributes' -require 'action_controller/support/inflector' +require 'active_support/class_attribute_accessors' +require 'active_support/class_inheritable_attributes' +require 'active_support/inflector' require 'drb' module ActionController #:nodoc: |