diff options
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/Rakefile | 3 | ||||
| -rw-r--r-- | activerecord/install.rb | 17 | ||||
| -rwxr-xr-x | activerecord/lib/active_record.rb | 18 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 6 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 4 | ||||
| -rwxr-xr-x | activerecord/test/abstract_unit.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/class_inheritable_attributes_test.rb | 2 |
7 files changed, 26 insertions, 28 deletions
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 |