Harmonize framework require strategy. Don't add self to load path since Rails initializer and RubyGems handle it.

2 files changed, 16 insertions, 10 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 3c4a339d50..e58071d4af 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -21,16 +21,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-unless defined?(ActiveSupport)
-  begin
-    $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
+begin
+  require 'active_support'
+rescue LoadError
+  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+  if File.directory?(activesupport_path)
+    $:.unshift activesupport_path
     require 'active_support'
-  rescue LoadError
-    require 'rubygems'
-    gem 'activesupport'
   end
 end
 
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 3f35303a51..3590ab6d49 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -21,6 +21,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+begin
+  require 'active_support'
+rescue LoadError
+  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+  if File.directory?(activesupport_path)
+    $:.unshift activesupport_path
+    require 'active_support'
+  end
+end
 
 require 'action_view/template_handlers'
 require 'action_view/renderable'
@@ -35,7 +44,7 @@ require 'action_view/partials'
 require 'action_view/template_error'
 
 I18n.backend.populate do
-  I18n.load_translations File.dirname(__FILE__) + '/action_view/locale/en-US.yml'
+  I18n.load_translations "#{File.dirname(__FILE__)}/action_view/locale/en-US.yml"
 end
 
 require 'action_view/helpers'