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

Changeset 6057

Show
Ignore:
Timestamp:
01/28/07 07:16:55 (2 years ago)
Author:
bitsweat
Message:

Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller.rb

    r4948 r6057  
    2727unless defined?(ActiveSupport) 
    2828  begin 
    29     $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
    30     require 'active_support'   
     29    $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib" 
     30    require 'active_support' 
    3131  rescue LoadError 
    3232    require 'rubygems' 
    …… 
    3434  end 
    3535end 
     36 
     37$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/html-scanner" 
    3638 
    3739require 'action_controller/base' 

  • trunk/actionpack/lib/action_controller/assertions/response_assertions.rb

    r5785 r6057  
    11require 'rexml/document' 
    2 require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document" 
     2require 'html/document' 
    33 
    44module ActionController 

  • trunk/actionpack/lib/action_controller/assertions/selector_assertions.rb

    r5525 r6057  
    55 
    66require 'rexml/document' 
    7 require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document" 
     7require 'html/document' 
    88 
    99module ActionController 

  • trunk/actionpack/lib/action_controller/assertions/tag_assertions.rb

    r4935 r6057  
    11require 'rexml/document' 
    2 require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document" 
     2require 'html/document' 
    33 
    44module ActionController 

  • trunk/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb

    r4595 r6057  
    11class CGI #:nodoc: 
    22  module QueryExtension 
     3    # Remove the old initialize_query method before redefining it. 
     4    remove_method :initialize_query 
     5 
    36    # Initialize the data from the query. 
    47    # 

  • trunk/actionpack/lib/action_controller/integration.rb

    r5828 r6057  
    7373        self.accept      = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5" 
    7474 
    75         unless @named_routes_configured 
     75        unless defined? @named_routes_configured 
    7676          # install the named routes in this session instance. 
    7777          klass = class<<self; self; end 

  • trunk/actionpack/lib/action_controller/mime_type.rb

    r5664 r6057  
    143143end 
    144144 
    145 require File.dirname(__FILE__) + "/mime_types" 
     145require 'action_controller/mime_types' 

  • trunk/actionpack/lib/action_controller/request.rb

    r5895 r6057  
    44  class AbstractRequest 
    55    cattr_accessor :relative_url_root 
     6    remove_method :relative_url_root 
    67 
    78    # Returns the hash of environment variables for this request, 

  • trunk/actionpack/lib/action_controller/routing.rb

    r6044 r6057  
    508508        end 
    509509      end 
    510    
     510 
    511511      def matches_controller_and_action?(controller, action) 
    512         unless @matching_prepared 
     512        unless defined? @matching_prepared 
    513513          @controller_requirement = requirement_for(:controller) 
    514514          @action_requirement = requirement_for(:action) 

  • trunk/actionpack/lib/action_controller/test_process.rb

    r5748 r6057  
    1 require File.dirname(__FILE__) + '/assertions' 
     1require 'action_controller/assertions' 
    22 
    33module ActionController #:nodoc: 
    …… 
    9191 
    9292    def request_uri 
    93       @request_uri || super() 
     93      @request_uri || super 
    9494    end 
    9595 
    9696    def path 
    97       @path || super() 
     97      @path || super 
    9898    end 
    9999 

  • trunk/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb

    r4929 r6057  
    1 require File.dirname(__FILE__) + '/tokenizer' 
    2 require File.dirname(__FILE__) + '/node' 
    3 require File.dirname(__FILE__) + '/selector' 
     1require 'html/tokenizer' 
     2require 'html/node' 
     3require 'html/selector' 
    44 
    55module HTML #:nodoc: 
    6    
    76  # A top-level HTMl document. You give it a body of text, and it will parse that 
    87  # text into a tree of nodes. 

  • trunk/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb

    r6044 r6057  
    241241      @source = "" 
    242242      values = values[0] if values.size == 1 && values[0].is_a?(Array) 
     243 
    243244      # We need a copy to determine if we failed to parse, and also 
    244245      # preserve the original pass by-ref statement. 
    245246      statement = selector.strip.dup 
     247 
    246248      # Create a simple selector, along with negation. 
    247249      simple_selector(statement, values).each { |name, value| instance_variable_set("@#{name}", value) } 
     250 
     251      @alternates = [] 
     252      @depends = nil 
    248253 
    249254      # Alternative selector. 
    250255      if statement.sub!(/^\s*,\s*/, "") 
    251256        second = Selector.new(statement, values) 
    252         (@alternates ||= []) << second 
     257        @alternates << second 
    253258        # If there are alternate selectors, we group them in the top selector. 
    254259        if alternates = second.instance_variable_get(:@alternates) 
    255           second.instance_variable_set(:@alternates, nil) 
     260          second.instance_variable_set(:@alternates, []) 
    256261          @alternates.concat alternates 
    257262        end 
    …… 
    413418      # If this selector is part of the group, try all the alternative 
    414419      # selectors (unless first_only). 
    415       if @alternates && (!first_only || !matches) 
     420      if !first_only || !matches 
    416421        @alternates.each do |alternate| 
    417422          break if matches && first_only 
    …… 
    797802      # If there are alternate selectors, we group them in the top selector. 
    798803      if alternates = second.instance_variable_get(:@alternates) 
    799         second.instance_variable_set(:@alternates, nil) 
    800         (@alternates ||= []).concat alternates 
     804        second.instance_variable_set(:@alternates, []) 
     805        @alternates.concat alternates 
    801806      end 
    802807      second 

  • trunk/actionpack/lib/action_view.rb

    r4922 r6057  
    2222#++ 
    2323 
    24 $:.unshift(File.dirname(__FILE__) + "/action_view/vendor") 
    2524require 'action_view/base' 
    2625require 'action_view/partials' 
    …… 
    3029end 
    3130 
    32 ActionView::Base.load_helpers(File.dirname(__FILE__) + "/action_view/helpers/") 
     31ActionView::Base.load_helpers 

  • trunk/actionpack/lib/action_view/base.rb

    r5587 r6057  
    158158 
    159159    attr_reader :logger, :response, :headers 
    160     attr_internal *ActionController::Base::DEPRECATED_INSTANCE_VARIABLES 
     160    attr_internal(*ActionController::Base::DEPRECATED_INSTANCE_VARIABLES) 
    161161 
    162162    # Specify trim mode for the ERB compiler. Defaults to '-'. 
    …… 
    211211    end 
    212212 
    213     def self.load_helpers(helper_dir)#:nodoc: 
    214       Dir.entries(helper_dir).sort.each do |helper_file| 
    215         next unless helper_file =~ /^([a-z][a-z_]*_helper).rb$/ 
    216         require File.join(helper_dir, $1) 
     213    def self.load_helpers #:nodoc: 
     214      Dir.entries("#{File.dirname(__FILE__)}/helpers").sort.each do |file| 
     215        next unless file =~ /^([a-z][a-z_]*_helper).rb$/ 
     216        require "action_view/helpers/#{$1}" 
    217217        helper_module_name = $1.camelize 
    218         class_eval("include ActionView::Helpers::#{helper_module_name}") if Helpers.const_defined?(helper_module_name) 
     218        if Helpers.const_defined?(helper_module_name) 
     219          include Helpers.const_get(helper_module_name) 
     220        end 
    219221      end 
    220222    end 

  • trunk/actionpack/lib/action_view/helpers/active_record_helper.rb

    r5870 r6057  
    11require 'cgi' 
    2 require File.dirname(__FILE__) + '/form_helper' 
     2require 'action_view/helpers/form_helper' 
    33 
    44module ActionView 

  • trunk/actionpack/lib/action_view/helpers/asset_tag_helper.rb

    r5874 r6057  
    11require 'cgi' 
    2 require File.dirname(__FILE__) + '/url_helper' 
    3 require File.dirname(__FILE__) + '/tag_helper' 
     2require 'action_view/helpers/url_helper' 
     3require 'action_view/helpers/tag_helper' 
    44 
    55module ActionView 

  • trunk/actionpack/lib/action_view/helpers/form_helper.rb

    r6040 r6057  
    11require 'cgi' 
    2 require File.dirname(__FILE__) + '/date_helper' 
    3 require File.dirname(__FILE__) + '/tag_helper' 
     2require 'action_view/helpers/date_helper' 
     3require 'action_view/helpers/tag_helper' 
    44 
    55module ActionView 

  • trunk/actionpack/lib/action_view/helpers/form_options_helper.rb

    r4995 r6057  
    11require 'cgi' 
    22require 'erb' 
    3 require File.dirname(__FILE__) + '/form_helper' 
     3require 'action_view/helpers/form_helper' 
    44 
    55module ActionView 

  • trunk/actionpack/lib/action_view/helpers/form_tag_helper.rb

    r5972 r6057  
    11require 'cgi' 
    2 require File.dirname(__FILE__) + '/tag_helper' 
     2require 'action_view/helpers/tag_helper' 
    33 
    44module ActionView 

  • trunk/actionpack/lib/action_view/helpers/java_script_macros_helper.rb

    r5851 r6057  
    1 require File.dirname(__FILE__) + '/tag_helper' 
     1require 'action_view/helpers/tag_helper' 
    22 
    33module ActionView 

  • trunk/actionpack/lib/action_view/helpers/javascript_helper.rb

    r5245 r6057  
    1 require File.dirname(__FILE__) + '/tag_helper' 
    2 require File.dirname(__FILE__) + '/prototype_helper' 
     1require 'action_view/helpers/tag_helper' 
     2require 'action_view/helpers/prototype_helper' 
    33 
    44module ActionView 

  • trunk/actionpack/lib/action_view/helpers/prototype_helper.rb

    r5942 r6057  
    861861          append_enumerable_function!("#{enumerable.to_s.camelize(:lower)}(#{method_args}function(#{yield_args}) {") 
    862862          # only yield as many params as were passed in the block 
    863           yield *options[:yield_args].collect { |p| JavaScriptVariableProxy.new(@generator, p) }[0..block.arity-1] 
     863          yield(*options[:yield_args].collect { |p| JavaScriptVariableProxy.new(@generator, p) }[0..block.arity-1]) 
    864864          add_return_statement! if options[:return] 
    865865          @generator << '});' 
    …… 
    890890end 
    891891 
    892 require File.dirname(__FILE__) + '/javascript_helper' 
     892require 'action_view/helpers/javascript_helper' 

  • trunk/actionpack/lib/action_view/helpers/scriptaculous_helper.rb

    r5340 r6057  
    1 require File.dirname(__FILE__) + '/javascript_helper' 
     1require 'action_view/helpers/javascript_helper' 
    22 
    33module ActionView 

  • trunk/actionpack/lib/action_view/helpers/text_helper.rb

    r6034 r6057  
    1 require File.dirname(__FILE__) + '/tag_helper' 
     1require 'action_view/helpers/tag_helper' 
     2require 'html/document' 
    23 
    34module ActionView 
    …… 
    191192      def strip_links(text) 
    192193        text.gsub(/<a\b.*?>(.*?)<\/a>/mi, '\1') 
    193       end 
    194  
    195       # Try to require the html-scanner library 
    196       begin 
    197         require 'html/tokenizer' 
    198         require 'html/node' 
    199       rescue LoadError 
    200         # if there isn't a copy installed, use the vendor version in 
    201         # ActionController 
    202         $:.unshift File.join(File.dirname(__FILE__), "..", "..", 
    203                       "action_controller", "vendor", "html-scanner") 
    204         require 'html/tokenizer' 
    205         require 'html/node' 
    206194      end 
    207195 

  • trunk/actionpack/lib/action_view/helpers/url_helper.rb

    r5896 r6057  
    1 require File.dirname(__FILE__) + '/javascript_helper' 
     1require 'action_view/helpers/javascript_helper' 
    22 
    33module ActionView 

  • trunk/actionpack/test/activerecord/active_record_store_test.rb

    r5162 r6057  
    129129class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest 
    130130  def session_class 
    131     unless @session_class 
     131    unless defined? @session_class 
    132132      @session_class = CGI::Session::ActiveRecordStore::SqlBypass 
    133133      @session_class.connection = CGI::Session::ActiveRecordStore::Session.connection 

  • trunk/actionpack/test/controller/assert_select_test.rb

    r5525 r6057  
    44#++ 
    55 
    6 require File.dirname(__FILE__) + '/../abstract_unit' 
    7 require File.dirname(__FILE__) + '/fake_controllers' 
     6require "#{File.dirname(__FILE__)}/../abstract_unit" 
     7require "#{File.dirname(__FILE__)}/fake_controllers" 
    88 
    99 

  • trunk/actionpack/test/controller/raw_post_test.rb

    r4524 r6057  
    1 require 'test/unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22require 'cgi' 
    33require 'stringio' 
    4 require File.dirname(__FILE__) + '/../../lib/action_controller/cgi_ext/raw_post_data_fix' 
     4require 'action_controller/cgi_ext/raw_post_data_fix' 
    55 
    66class RawPostDataTest < Test::Unit::TestCase 

  • trunk/actionpack/test/controller/routing_test.rb

    r5976 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
    2 require 'test/unit' 
    3 require File.dirname(__FILE__) + '/fake_controllers' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
     2require "#{File.dirname(__FILE__)}/fake_controllers" 
    43require 'action_controller/routing' 
    54 
    …… 
    790789   
    791790  def default_route 
    792     unless @default_route 
     791    unless defined?(@default_route) 
    793792      @default_route = ROUTING::Route.new 
    794793       

  • trunk/actionpack/test/controller/selector_test.rb

    r4929 r6057  
    44#++ 
    55 
    6 require File.dirname(__FILE__) + '/../abstract_unit' 
    7 require File.dirname(__FILE__) + '/fake_controllers' 
     6require "#{File.dirname(__FILE__)}/../abstract_unit" 
     7require "#{File.dirname(__FILE__)}/fake_controllers" 
    88 
    99class SelectorTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/active_record_helper_test.rb

    r5870 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
    2 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper' 
    3 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_helper' 
    4 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/text_helper' 
    5 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper' 
    6 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper' 
    7 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_tag_helper' 
    8 # require File.dirname(__FILE__) + '/../../lib/action_view/helpers/active_record_helper' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    92 
    103class ActiveRecordHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/asset_tag_helper_test.rb

    r5875 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class AssetTagHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/benchmark_helper_test.rb

    r1719 r6057  
    1 require 'test/unit' 
    2 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/benchmark_helper' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
     2require 'action_view/helpers/benchmark_helper' 
    33 
    44class BenchmarkHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/compiled_templates_test.rb

    r5587 r6057  
    1 require 'test/unit' 
    2 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper' 
    3 require File.dirname(__FILE__) + '/../../lib/action_view/compiled_templates' 
    4 require File.dirname(__FILE__) + "/../abstract_unit" 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
     2require 'action_view/helpers/date_helper' 
     3require 'action_view/compiled_templates' 
    54 
    65class CompiledTemplateTests < Test::Unit::TestCase 
    7  
    86  def setup 
    97    @ct = ActionView::CompiledTemplates.new 

  • trunk/actionpack/test/template/date_helper_test.rb

    r5973 r6057  
    1 require 'test/unit' 
    2 require File.dirname(__FILE__) + "/../abstract_unit" 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    32 
    43class DateHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/deprecated_helper_test.rb

    r5438 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class DeprecatedHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/deprecated_instance_variables_test.rb

    r5320 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class DeprecatedViewInstanceVariablesTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/form_helper_test.rb

    r6040 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class FormHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/form_options_helper_test.rb

    r4331 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class MockTimeZone 

  • trunk/actionpack/test/template/form_tag_helper_test.rb

    r5347 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class FormTagHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/java_script_macros_helper_test.rb

    r4952 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class JavaScriptMacrosHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/javascript_helper_test.rb

    r5242 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class JavaScriptHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/number_helper_test.rb

    r5727 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
    2 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/number_helper' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    32 
    43class NumberHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/prototype_helper_test.rb

    r5942 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33module BaseTest 

  • trunk/actionpack/test/template/scriptaculous_helper_test.rb

    r3773 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class ScriptaculousHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/tag_helper_test.rb

    r5857 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22 
    33class TagHelperTest < Test::Unit::TestCase 

  • trunk/actionpack/test/template/text_helper_test.rb

    r6034 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    22require "#{File.dirname(__FILE__)}/../testing_sandbox" 
    33 

  • trunk/actionpack/test/template/url_helper_test.rb

    r5896 r6057  
    1 require File.dirname(__FILE__) + '/../abstract_unit' 
    2  
    3 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper' 
    4 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/asset_tag_helper' 
    5 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper' 
     1require "#{File.dirname(__FILE__)}/../abstract_unit" 
    62 
    73RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port)