Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 648

Show
Ignore:
Timestamp:
02/17/05 19:04:47 (4 years ago)
Author:
david
Message:

AR, AP, and AM should look for AS in sibling directory before trying RubyGems #648

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionmailer/lib/action_mailer.rb

    r4 r648  
    2525  require 'action_controller' 
    2626rescue LoadError 
    27   # Action Pack is not already available, try RubyGems 
    28   require 'rubygems'     
    29   require_gem 'actionpack', '>= 0.9.0' 
     27  begin 
     28    require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller' 
     29  rescue LoadError 
     30    require 'rubygems' 
     31    require_gem 'actionpack', '>= 0.9.0' 
     32  end 
    3033end 
    3134 

  • trunk/actionpack/lib/action_controller.rb

    r625 r648  
    2727  require 'active_support' 
    2828rescue LoadError 
    29   require 'rubygems' 
    30   require_gem 'activesupport' 
     29  begin 
     30    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' 
     31  rescue LoadError 
     32    require 'rubygems' 
     33    require_gem 'activesupport' 
     34  end 
    3135end 
    3236 

  • trunk/actionpack/lib/action_view.rb

    r194 r648  
    2323 
    2424begin 
    25   require 'rubygems'    
     25  require 'rubygems' 
    2626  require 'builder' 
    2727rescue LoadError 

  • trunk/activerecord/lib/active_record.rb

    r625 r648  
    2828  require 'active_support' 
    2929rescue LoadError 
    30   require 'rubygems' 
    31   require_gem 'activesupport' 
     30  begin 
     31    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' 
     32  rescue LoadError 
     33    require 'rubygems' 
     34    require_gem 'activesupport' 
     35  end 
    3236end 
    3337