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

Changeset 838

Show
Ignore:
Timestamp:
03/06/05 12:20:53 (4 years ago)
Author:
david
Message:

Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]. Moved all active support dependencies into active support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/lib/action_controller.rb

    r697 r838  
    2323 
    2424$:.unshift(File.dirname(__FILE__)) 
     25$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
    2526 
    2627begin 
    27   require 'active_support' 
     28  require 'active_support'   
    2829rescue LoadError 
    29   begin 
    30     require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' 
    31   rescue LoadError 
    32     require 'rubygems' 
    33     require_gem 'activesupport' 
    34   end 
     30  require 'rubygems' 
     31  require_gem 'activesupport' 
    3532end 
    3633 
  • trunk/actionpack/lib/action_controller/base.rb

    r780 r838  
    33require 'action_controller/routing' 
    44require 'action_controller/url_rewriter' 
    5 require 'active_support/class_attribute_accessors' 
    6 require 'active_support/class_inheritable_attributes' 
    7 require 'active_support/inflector' 
    85require 'drb' 
    96 
  • trunk/actionwebservice

    • Property svn:ignore changed from
      pkg
      to
      pkg
      doc
  • trunk/activerecord/lib/active_record.rb

    r818 r838  
    2424 
    2525$:.unshift(File.dirname(__FILE__)) 
     26$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
    2627 
    2728begin 
    28   require 'active_support' 
     29  require 'active_support'   
    2930rescue LoadError 
    30   begin 
    31     require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' 
    32   rescue LoadError 
    33     require 'rubygems' 
    34     require_gem 'activesupport' 
    35   end 
     31  require 'rubygems' 
     32  require_gem 'activesupport' 
    3633end 
    3734 
  • trunk/activerecord/lib/active_record/base.rb

    r773 r838  
    1 require 'active_support/class_attribute_accessors' 
    2 require 'active_support/class_inheritable_attributes' 
    3 require 'active_support/inflector' 
    41require 'yaml' 
    52 
  • trunk/activerecord/lib/active_record/fixtures.rb

    r624 r838  
    22require 'yaml' 
    33require 'csv' 
    4 require 'active_support/class_inheritable_attributes' 
    5 require 'active_support/inflector' 
    64 
    75# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours: 
  • trunk/activesupport

    • Property svn:ignore changed from
      pkg
      to
      pkg
      doc
  • trunk/activesupport/lib/active_support.rb

    r768 r838  
    2424$:.unshift(File.dirname(__FILE__)) 
    2525 
     26require 'active_support/class_attribute_accessors' 
     27require 'active_support/class_inheritable_attributes' 
     28require 'active_support/inflector' 
     29 
    2630require 'active_support/core_ext' 
    2731require 'active_support/clean_logger' 
  • trunk/railties/CHANGELOG

    r832 r838  
    11*SVN* 
     2 
     3* Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN] 
    24 
    35* Fixed -h/--help for generate and destroy generators #331 
  • trunk/railties/lib/rails_generator.rb

    r627 r838  
    2323 
    2424$:.unshift(File.dirname(__FILE__)) 
     25$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
    2526 
    2627begin 
    27   require 'active_support' 
     28  require 'active_support'   
    2829rescue LoadError 
    2930  require 'rubygems'