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

actionmailer/lib/action_mailer.rb

@@ -21,13 +21,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-unless defined?(ActionController)
+begin
-  begin
+  require 'action_controller'
-    $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
+rescue LoadError
+  actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
+  if File.directory?(actionpack_path)
+    $:.unshift actionpack_path
     require 'action_controller'
-  rescue LoadError
-    require 'rubygems'
-    gem 'actionpack', '>= 1.12.5'
   end
 end
 

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
+begin
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+  require 'active_support'
-
+rescue LoadError
-unless defined?(ActiveSupport)
+  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  begin
+  if File.directory?(activesupport_path)
-    $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
+    $:.unshift activesupport_path
     require 'active_support'
-  rescue LoadError
-    require 'rubygems'
-    gem 'activesupport'
   end
 end
 

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'

activerecord/lib/active_record.rb

@@ -21,17 +21,14 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.dirname(__FILE__)) unless
+begin
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib"
-if File.exist?(active_support_path)
-  $:.unshift active_support_path
-  require 'active_support'
-else
-  require 'rubygems'
-  gem 'activesupport'
   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 'active_record/base'

activeresource/lib/active_resource.rb

@@ -21,16 +21,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.dirname(__FILE__)) unless
+begin
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+  require 'active_support'
-
+rescue LoadError
-unless defined?(ActiveSupport)
+  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  begin
+  if File.directory?(activesupport_path)
-    $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")  
+    $:.unshift activesupport_path
     require 'active_support'
-  rescue LoadError
-    require 'rubygems'
-    gem 'activesupport'
   end
 end
 

activesupport/lib/active_support.rb

@@ -21,8 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.dirname(__FILE__))
-
 require 'active_support/vendor'
 require 'active_support/basic_object'
 require 'active_support/inflector'