diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-21 07:29:04 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-21 07:29:04 +0000 |
| commit | a821c3dd932a06fe702baa404b46a46156d357ea (patch) | |
| tree | 4e26a951ffc9060c22b30eb0e6d4b66ff8e9df88 | |
| parent | 1a44b9cf1ab1b5d3745de5fa6d73c27ec246080c (diff) | |
| download | rails-a821c3dd932a06fe702baa404b46a46156d357ea.tar.gz rails-a821c3dd932a06fe702baa404b46a46156d357ea.tar.bz2 rails-a821c3dd932a06fe702baa404b46a46156d357ea.zip | |
r3215@asus: jeremy | 2005-11-20 02:05:56 -0800
Eliminate double-requires due to Ruby seeing different paths to the same file.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5 files changed, 5 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/breakpoint.rb b/activesupport/lib/active_support/breakpoint.rb index ab2efd39d0..785dac7596 100755 --- a/activesupport/lib/active_support/breakpoint.rb +++ b/activesupport/lib/active_support/breakpoint.rb @@ -16,7 +16,7 @@ # license please contact me.
require 'irb'
-require File.dirname(__FILE__) + '/binding_of_caller'
+require File.dirname(__FILE__) + '/binding_of_caller' unless defined? Binding.of_caller
require 'drb'
require 'drb/acl'
diff --git a/activesupport/lib/active_support/core_ext/integer/inflections.rb b/activesupport/lib/active_support/core_ext/integer/inflections.rb index a86c4cc26c..94721cfc7c 100644 --- a/activesupport/lib/active_support/core_ext/integer/inflections.rb +++ b/activesupport/lib/active_support/core_ext/integer/inflections.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../inflector' +require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module Integer #:nodoc: diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb index 9b5e9ddfcd..5d19702719 100644 --- a/activesupport/lib/active_support/core_ext/string/inflections.rb +++ b/activesupport/lib/active_support/core_ext/string/inflections.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../inflector' +require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module String #:nodoc: diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 15189a75b1..0e82badad7 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -1,11 +1,7 @@ require 'test/unit' require 'date' require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/string' -require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/kernel' - -silence_warnings do - require File.dirname(__FILE__) + '/../inflector_test' -end +require File.dirname(__FILE__) + '/../inflector_test' unless defined? InflectorTest class StringInflectionsTest < Test::Unit::TestCase def test_pluralize diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb index d92b4a76a8..d0d7b0bedd 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/active_support/inflector' +require File.dirname(__FILE__) + '/../lib/active_support/inflector' unless defined? Inflector module Ace module Base |