diff options
45 files changed, 118 insertions, 82 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: diff --git a/activerecord/Rakefile b/activerecord/Rakefile index f599224dbc..87885d5bd1 100755 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -110,6 +110,9 @@ spec = Gem::Specification.new do |s| dist_dirs.each do |dir| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end + + s.add_dependency('activesupport', '>= 1.0.0') + s.files.delete "test/fixtures/fixture_database.sqlite" s.files.delete "test/fixtures/fixture_database_2.sqlite" s.files.delete "test/fixtures/fixture_database.sqlite3" diff --git a/activerecord/install.rb b/activerecord/install.rb index 020f7bc18a..6091e99af3 100644 --- a/activerecord/install.rb +++ b/activerecord/install.rb @@ -18,7 +18,7 @@ unless $sitedir end end -makedirs = %w{ active_record/associations active_record/connection_adapters active_record/support active_record/vendor active_record/acts active_record/support/core_ext active_record/support/core_ext/hash active_record/support/core_ext/numeric active_record/support/core_ext/string } +makedirs = %w{ active_record/associations active_record/connection_adapters active_record/support active_record/vendor active_record/acts } makedirs.each {|f| File::makedirs(File.join($sitedir, *f.split(/\//)))} # deprecated files that should be removed @@ -48,21 +48,6 @@ files = %w- active_record/reflection.rb active_record/acts/list.rb active_record/acts/tree.rb - active_record/support/class_attribute_accessors.rb - active_record/support/class_inheritable_attributes.rb - active_record/support/clean_logger.rb - active_record/support/core_ext/hash/keys.rb - active_record/support/core_ext/hash.rb - active_record/support/core_ext/object_and_class.rb - active_record/support/core_ext/numeric/bytes.rb - active_record/support/core_ext/numeric/time.rb - active_record/support/core_ext/numeric.rb - active_record/support/core_ext/string/inflections.rb - active_record/support/core_ext/string.rb - active_record/support/core_ext.rb - active_record/support/inflector.rb - active_record/support/misc.rb - active_record/support/module_attribute_accessors.rb active_record/timestamp.rb active_record/transactions.rb active_record/validations.rb diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index a1dde6bf5b..0eea2d02c1 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -24,10 +24,20 @@ $:.unshift(File.dirname(__FILE__)) -require 'active_record/support/core_ext' -require 'active_record/support/clean_logger' -require 'active_record/support/misc' -require 'active_record/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 'active_record/base' require 'active_record/observer' diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8bb981fb5e..656258e49b 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1,6 +1,6 @@ -require 'active_record/support/class_attribute_accessors' -require 'active_record/support/class_inheritable_attributes' -require 'active_record/support/inflector' +require 'active_support/class_attribute_accessors' +require 'active_support/class_inheritable_attributes' +require 'active_support/inflector' require 'yaml' module ActiveRecord #:nodoc: diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 9cbcf1c786..b03543a7c7 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -1,8 +1,8 @@ require 'erb' require 'yaml' require 'csv' -require 'active_record/support/class_inheritable_attributes' -require 'active_record/support/inflector' +require 'active_support/class_inheritable_attributes' +require 'active_support/inflector' # Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours: # diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb index 5433b306f9..dbab4b0e80 100755 --- a/activerecord/test/abstract_unit.rb +++ b/activerecord/test/abstract_unit.rb @@ -3,8 +3,8 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'test/unit' require 'active_record' require 'active_record/fixtures' -require 'active_record/support/binding_of_caller' -require 'active_record/support/breakpoint' +require 'active_support/binding_of_caller' +require 'active_support/breakpoint' require 'connection' class Test::Unit::TestCase #:nodoc: diff --git a/activerecord/test/class_inheritable_attributes_test.rb b/activerecord/test/class_inheritable_attributes_test.rb index 00a6945a66..e42f620284 100644 --- a/activerecord/test/class_inheritable_attributes_test.rb +++ b/activerecord/test/class_inheritable_attributes_test.rb @@ -1,7 +1,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'test/unit' -require 'active_record/support/class_inheritable_attributes' +require 'active_support/class_inheritable_attributes' class A include ClassInheritableAttributes diff --git a/activesupport/Rakefile b/activesupport/Rakefile index 4f58b89a20..39d20dcbee 100644 --- a/activesupport/Rakefile +++ b/activesupport/Rakefile @@ -1,6 +1,45 @@ require 'rake/testtask' +require 'rake/gempackagetask' +require 'rake/contrib/rubyforgepublisher' + +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_NAME = 'activesupport' +PKG_VERSION = '1.0.0' + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" task :default => :test Rake::TestTask.new { |t| t.pattern = 'test/**/*_test.rb' } + +# Create compressed packages +dist_dirs = [ "lib", "test"] + +spec = Gem::Specification.new do |s| + s.name = PKG_NAME + s.version = PKG_VERSION + s.summary = "Support and utility classes." + s.description = %q{Utility library which carries commonly used classes and goodies from the rails project} + + s.files = [ "CHANGELOG" ] + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) } + s.require_path = 'lib' + s.has_rdoc = true + + s.author = "David Heinemeier Hansson" + s.email = "david@loudthinking.com" + s.homepage = "http://www.rubyonrails.com" + s.rubyforge_project = "activesupport" +end + +Rake::GemPackageTask.new(spec) do |p| + p.gem_spec = spec + p.need_tar = true + p.need_zip = true +end + +# Publish beta gem +desc "Publish the beta gem" +task :pgem => [:package] do + Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload + `ssh davidhh@comox.textdrive.com './gemupdate.sh'` +end diff --git a/activesupport/lib/binding_of_caller.rb b/activesupport/lib/active_support/binding_of_caller.rb index d18fbdef3d..d18fbdef3d 100644 --- a/activesupport/lib/binding_of_caller.rb +++ b/activesupport/lib/active_support/binding_of_caller.rb diff --git a/activesupport/lib/breakpoint.rb b/activesupport/lib/active_support/breakpoint.rb index 1c171e2ee6..1c171e2ee6 100755 --- a/activesupport/lib/breakpoint.rb +++ b/activesupport/lib/active_support/breakpoint.rb diff --git a/activesupport/lib/class_attribute_accessors.rb b/activesupport/lib/active_support/class_attribute_accessors.rb index 786dcf98cb..786dcf98cb 100644 --- a/activesupport/lib/class_attribute_accessors.rb +++ b/activesupport/lib/active_support/class_attribute_accessors.rb diff --git a/activesupport/lib/class_inheritable_attributes.rb b/activesupport/lib/active_support/class_inheritable_attributes.rb index f9ca7af7b2..f9ca7af7b2 100644 --- a/activesupport/lib/class_inheritable_attributes.rb +++ b/activesupport/lib/active_support/class_inheritable_attributes.rb diff --git a/activesupport/lib/clean_logger.rb b/activesupport/lib/active_support/clean_logger.rb index 1a36562892..1a36562892 100644 --- a/activesupport/lib/clean_logger.rb +++ b/activesupport/lib/active_support/clean_logger.rb diff --git a/activesupport/lib/core_ext.rb b/activesupport/lib/active_support/core_ext.rb index 573313e741..573313e741 100644 --- a/activesupport/lib/core_ext.rb +++ b/activesupport/lib/active_support/core_ext.rb diff --git a/activesupport/lib/core_ext/hash.rb b/activesupport/lib/active_support/core_ext/hash.rb index e899d3e1e2..e899d3e1e2 100644 --- a/activesupport/lib/core_ext/hash.rb +++ b/activesupport/lib/active_support/core_ext/hash.rb diff --git a/activesupport/lib/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb index 2353cfaf3b..2353cfaf3b 100644 --- a/activesupport/lib/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb diff --git a/activesupport/lib/core_ext/hash/keys.rb b/activesupport/lib/active_support/core_ext/hash/keys.rb index 8725138856..8725138856 100644 --- a/activesupport/lib/core_ext/hash/keys.rb +++ b/activesupport/lib/active_support/core_ext/hash/keys.rb diff --git a/activesupport/lib/core_ext/numeric.rb b/activesupport/lib/active_support/core_ext/numeric.rb index 88fead7aa4..88fead7aa4 100644 --- a/activesupport/lib/core_ext/numeric.rb +++ b/activesupport/lib/active_support/core_ext/numeric.rb diff --git a/activesupport/lib/core_ext/numeric/bytes.rb b/activesupport/lib/active_support/core_ext/numeric/bytes.rb index 98e5e13abb..98e5e13abb 100644 --- a/activesupport/lib/core_ext/numeric/bytes.rb +++ b/activesupport/lib/active_support/core_ext/numeric/bytes.rb diff --git a/activesupport/lib/core_ext/numeric/time.rb b/activesupport/lib/active_support/core_ext/numeric/time.rb index 43c0425b00..43c0425b00 100644 --- a/activesupport/lib/core_ext/numeric/time.rb +++ b/activesupport/lib/active_support/core_ext/numeric/time.rb diff --git a/activesupport/lib/core_ext/object_and_class.rb b/activesupport/lib/active_support/core_ext/object_and_class.rb index 59a463ae29..59a463ae29 100644 --- a/activesupport/lib/core_ext/object_and_class.rb +++ b/activesupport/lib/active_support/core_ext/object_and_class.rb diff --git a/activesupport/lib/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb index 6d554b483c..6d554b483c 100644 --- a/activesupport/lib/core_ext/string.rb +++ b/activesupport/lib/active_support/core_ext/string.rb diff --git a/activesupport/lib/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb index aa4ff3a74d..aa4ff3a74d 100644 --- a/activesupport/lib/core_ext/string/inflections.rb +++ b/activesupport/lib/active_support/core_ext/string/inflections.rb diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 0a9b8e1d3d..0a9b8e1d3d 100644 --- a/activesupport/lib/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb diff --git a/activesupport/lib/inflector.rb b/activesupport/lib/active_support/inflector.rb index e09208dd4f..e09208dd4f 100644 --- a/activesupport/lib/inflector.rb +++ b/activesupport/lib/active_support/inflector.rb diff --git a/activesupport/lib/misc.rb b/activesupport/lib/active_support/misc.rb index 1ca00db1e7..1ca00db1e7 100644 --- a/activesupport/lib/misc.rb +++ b/activesupport/lib/active_support/misc.rb diff --git a/activesupport/lib/module_attribute_accessors.rb b/activesupport/lib/active_support/module_attribute_accessors.rb index 3d466e4493..3d466e4493 100644 --- a/activesupport/lib/module_attribute_accessors.rb +++ b/activesupport/lib/active_support/module_attribute_accessors.rb diff --git a/activesupport/test/class_inheritable_attributes_test.rb b/activesupport/test/class_inheritable_attributes_test.rb index 6157d70649..9a472eacd2 100644 --- a/activesupport/test/class_inheritable_attributes_test.rb +++ b/activesupport/test/class_inheritable_attributes_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../lib/class_inheritable_attributes' +require File.dirname(__FILE__) + '/../lib/active_support/class_inheritable_attributes' class ClassInheritableAttributesTest < Test::Unit::TestCase def setup diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 14f2b901b4..f5ace81927 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../../lib/core_ext/hash' +require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/hash' class HashExtTest < Test::Unit::TestCase def setup diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb index a83c472b84..0bcb8a2b51 100644 --- a/activesupport/test/core_ext/numeric_ext_test.rb +++ b/activesupport/test/core_ext/numeric_ext_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../../lib/core_ext/numeric' +require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/numeric' class NumericExtTimeTest < Test::Unit::TestCase def setup diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb index 5a0ae58837..71eeb4bdb8 100644 --- a/activesupport/test/core_ext/object_and_class_ext_test.rb +++ b/activesupport/test/core_ext/object_and_class_ext_test.rb @@ -1,21 +1,21 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../../lib/core_ext/object_and_class' +require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/object_and_class' -class A; end -class B < A; end -class C < B; end -class D < A; end +class ClassA; end +class ClassB < ClassA; end +class ClassC < ClassB; end +class ClassD < ClassA; end class ClassExtTest < Test::Unit::TestCase def test_methods - assert defined?(B) - assert defined?(C) - assert defined?(D) + assert defined?(ClassB) + assert defined?(ClassC) + assert defined?(ClassD) - A.remove_subclasses + ClassA.remove_subclasses - assert !defined?(B) - assert !defined?(C) - assert !defined?(D) + assert !defined?(ClassB) + assert !defined?(ClassC) + assert !defined?(ClassD) end end diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 317dbcf711..74a4010f91 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -1,6 +1,6 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../../lib/core_ext/string' -require File.dirname(__FILE__) + '/../../lib/misc' +require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/string' +require File.dirname(__FILE__) + '/../../lib/active_support/misc' silence_warnings do require File.dirname(__FILE__) + '/../inflector_test' diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index b6aeca27b3..1af960ee36 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib' +$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib/active_support/' require 'misc' require 'dependencies' diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb index 2f4174beca..6723313046 100644 --- a/activesupport/test/inflector_test.rb +++ b/activesupport/test/inflector_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../lib/inflector' +require File.dirname(__FILE__) + '/../lib/active_support/inflector' module Ace module Base diff --git a/activesupport/test/misc_test.rb b/activesupport/test/misc_test.rb index 5a2d1d33e8..cfd54c0ad0 100644 --- a/activesupport/test/misc_test.rb +++ b/activesupport/test/misc_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../lib/misc' +require File.dirname(__FILE__) + '/../lib/active_support/misc' class MiscTest < Test::Unit::TestCase def test_silence_warnings diff --git a/pushgems.rb b/pushgems.rb index c8ccf5d474..345b9ed649 100755 --- a/pushgems.rb +++ b/pushgems.rb @@ -2,7 +2,7 @@ build_number = `svn log -q -rhead http://dev.rubyonrails.org/svn/rails`.scan(/r([0-9]*)/).first.first.to_i -(%w( actionmailer actionpack activerecord railties ) - ARGV).each do |pkg| +(%w( actionmailer actionpack activerecord railties activesupport) - ARGV).each do |pkg| puts "Pushing: #{pkg} (#{build_number})" `cd #{pkg} && PKG_BUILD=#{build_number} rake pgem && cd ..` -end
\ No newline at end of file +end diff --git a/railties/Rakefile b/railties/Rakefile index 2cd1086a5a..53880a4f6e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -41,6 +41,9 @@ task :fresh_rails_without_docs => [ :clean, :make_dir_structure, :initialize_fil desc "Generates a fresh Rails package without documentation (faster)" task :fresh_rails_without_docs_using_links => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ] +desc "Generates minimal Rails package using symlinks" +task :dev => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ] + desc "Packages the fresh Rails package with documentation" task :package => [ :clean, :fresh_rails ] do system %{cd ..; tar -czvf #{PKG_NAME}-#{PKG_VERSION}.tgz #{PKG_NAME}} diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb index f8a8e8cb6f..6064e18b03 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/shared.rb @@ -19,6 +19,7 @@ ADDITIONAL_LOAD_PATHS.concat %w( vendor vendor/railties vendor/railties/lib + vendor/activesupport/lib vendor/activerecord/lib vendor/actionpack/lib vendor/actionmailer/lib diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index ed9b2d9636..edfe86efc4 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -23,7 +23,8 @@ $:.unshift(File.dirname(__FILE__)) -require 'support/core_ext' +require 'active_support/core_ext' + require 'rails_generator/base' require 'rails_generator/lookup' diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb index b8c926f3ce..54b4b32fd3 100644 --- a/railties/lib/rails_generator/base.rb +++ b/railties/lib/rails_generator/base.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../support/class_attribute_accessors' -require File.dirname(__FILE__) + '/../support/inflector' +require 'active_support/class_attribute_accessors' +require 'active_support/inflector' require File.dirname(__FILE__) + '/options' require File.dirname(__FILE__) + '/manifest' require File.dirname(__FILE__) + '/spec' diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index 4ddeb94887..80af7fedf9 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -1,5 +1,5 @@ require 'optparse' -require File.dirname(__FILE__) + '/../support/class_inheritable_attributes' +require 'active_support/class_inheritable_attributes' module Rails module Generator |