Ticket #1792: warning.megapatch

Index: actionmailer/test/mail_service_test.rb
===================================================================
--- actionmailer/test/mail_service_test.rb      (revision 1873)
+++ actionmailer/test/mail_service_test.rb      (working copy)
@@ -18,8 +18,11 @@
 end
 
 class Net::SMTP
-  def self.start(*args)
-    yield MockSMTP.new
+  class << self
+    alias old_start start
+    def start(*args)
+      yield MockSMTP.new
+    end
   end
 end
 
Index: actionmailer/Rakefile
===================================================================
--- actionmailer/Rakefile       (revision 1873)
+++ actionmailer/Rakefile       (working copy)
@@ -24,6 +24,7 @@
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
   t.verbose = true
+  t.warning = true
 }
 
 
@@ -194,4 +195,4 @@
       first_file = false
     end
   end
-end
\ No newline at end of file
+end
Index: actionmailer/lib/action_mailer/adv_attr_accessor.rb
===================================================================
--- actionmailer/lib/action_mailer/adv_attr_accessor.rb (revision 1873)
+++ actionmailer/lib/action_mailer/adv_attr_accessor.rb (working copy)
@@ -26,31 +26,3 @@
   end
 end
 
-module ActionMailer
-  module AdvAttrAccessor #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods #:nodoc:
-      def adv_attr_accessor(*names)
-        names.each do |name|
-          define_method("#{name}=") do |value|
-            instance_variable_set("@#{name}", value)
-          end
-
-          define_method(name) do |*parameters|
-            raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
-            if parameters.empty?
-              instance_variable_get("@#{name}")
-            else
-              instance_variable_set("@#{name}", parameters.first)
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
Index: actionmailer/lib/action_mailer/quoting.rb
===================================================================
--- actionmailer/lib/action_mailer/quoting.rb   (revision 1873)
+++ actionmailer/lib/action_mailer/quoting.rb   (working copy)
@@ -46,54 +46,3 @@
     end
   end
 end
-
-module ActionMailer
-  module Quoting #:nodoc:
-    # Convert the given text into quoted printable format, with an instruction
-    # that the text be eventually interpreted in the given charset.
-    def quoted_printable(text, charset)
-      text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.gsub( / /, "_" )
-      "=?#{charset}?Q?#{text}?="
-    end
-
-    # A quick-and-dirty regexp for determining whether a string contains any
-    # characters that need escaping.
-    if !defined?(CHARS_NEEDING_QUOTING)
-      CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
-    end
-
-    # Quote the given text if it contains any "illegal" characters
-    def quote_if_necessary(text, charset)
-      (text =~ CHARS_NEEDING_QUOTING) ?
-        quoted_printable(text, charset) :
-        text
-    end
-
-    # Quote any of the given strings if they contain any "illegal" characters
-    def quote_any_if_necessary(charset, *args)
-      args.map { |v| quote_if_necessary(v, charset) }
-    end
-
-    # Quote the given address if it needs to be. The address may be a
-    # regular email address, or it can be a phrase followed by an address in
-    # brackets. The phrase is the only part that will be quoted, and only if
-    # it needs to be. This allows extended characters to be used in the
-    # "to", "from", "cc", and "bcc" headers.
-    def quote_address_if_necessary(address, charset)
-      if Array === address
-        address.map { |a| quote_address_if_necessary(a, charset) }
-      elsif address =~ /^(\S.*)\s+(<.*>)$/
-        address = $2
-        phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset)
-        "\"#{phrase}\" #{address}"
-      else
-        address
-      end
-    end
-
-    # Quote any of the given addresses, if they need to be.
-    def quote_any_address_if_necessary(charset, *args)
-      args.map { |v| quote_address_if_necessary(v, charset) }
-    end
-  end
-end
Index: actionmailer/lib/action_mailer/vendor/text/format.rb
===================================================================
--- actionmailer/lib/action_mailer/vendor/text/format.rb        (revision 1873)
+++ actionmailer/lib/action_mailer/vendor/text/format.rb        (working copy)
@@ -831,7 +831,7 @@
 
     def __create(arg = nil, &block) #:nodoc:
         # Format::Text.new(text-to-wrap)
-      @text = arg unless arg.nil?
+      @text = arg.nil? ? nil : arg
         # Defaults
       @columns          = 72
       @tabstop          = 8
Index: actionmailer/lib/action_mailer/vendor/tmail/facade.rb
===================================================================
--- actionmailer/lib/action_mailer/vendor/tmail/facade.rb       (revision 1873)
+++ actionmailer/lib/action_mailer/vendor/tmail/facade.rb       (working copy)
@@ -464,6 +464,8 @@
     ### utils
     ###
 
+    alias old_create_reply create_reply
+
     def create_reply
       mail = TMail::Mail.parse('')
       mail.subject = 'Re: ' + subject('').sub(/\A(?:\[[^\]]+\])?(?:\s*Re:)*\s*/i, '')
Index: activesupport/test/inflector_test.rb
===================================================================
--- activesupport/test/inflector_test.rb        (revision 1873)
+++ activesupport/test/inflector_test.rb        (working copy)
@@ -1,5 +1,5 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/inflector'
+require File.dirname(__FILE__) + '/../lib/active_support/inflector' unless defined? Inflector
 
 module Ace
   module Base
Index: activesupport/Rakefile
===================================================================
--- activesupport/Rakefile      (revision 1873)
+++ activesupport/Rakefile      (working copy)
@@ -16,6 +16,7 @@
 task :default => :test
 Rake::TestTask.new { |t| 
   t.pattern = 'test/**/*_test.rb'
+  t.warning = true
 }
 
 # Create compressed packages
@@ -180,4 +181,4 @@
       first_file = false
     end
   end
-end
\ No newline at end of file
+end
Index: activesupport/lib/active_support/breakpoint.rb
===================================================================
--- activesupport/lib/active_support/breakpoint.rb      (revision 1873)
+++ activesupport/lib/active_support/breakpoint.rb      (working copy)
@@ -16,7 +16,7 @@
 # license please contact me.
 
 require 'irb'
-require File.dirname(__FILE__) + '/binding_of_caller'
+require File.dirname(__FILE__) + '/binding_of_caller' unless defined? Binding.of_caller
 require 'drb'
 require 'drb/acl'
 
@@ -460,6 +460,10 @@
       old_CurrentContext
     end
   end
+  class << self
+    alias old_parse_opts parse_opts
+    remove_method :parse_opts
+  end
   def IRB.parse_opts() end
 
   class Context #:nodoc:
Index: activesupport/lib/active_support/class_inheritable_attributes.rb
===================================================================
--- activesupport/lib/active_support/class_inheritable_attributes.rb    (revision 1873)
+++ activesupport/lib/active_support/class_inheritable_attributes.rb    (working copy)
@@ -113,5 +113,8 @@
     if respond_to?(:inherited)
       alias_method :inherited_without_inheritable_attributes, :inherited
     end
-    alias_method :inherited, :inherited_with_inheritable_attributes
+
+    alias old_inherited inherited
+    alias inherited inherited_with_inheritable_attributes
+
 end
Index: activesupport/lib/active_support/clean_logger.rb
===================================================================
--- activesupport/lib/active_support/clean_logger.rb    (revision 1873)
+++ activesupport/lib/active_support/clean_logger.rb    (working copy)
@@ -12,7 +12,8 @@
   private
     remove_const "Format"
     Format = "%s\n"
+    alias old_format_message format_message
     def format_message(severity, timestamp, msg, progname)
       Format % [msg]
     end
-end
\ No newline at end of file
+end
Index: activesupport/lib/active_support/core_ext/integer/inflections.rb
===================================================================
--- activesupport/lib/active_support/core_ext/integer/inflections.rb    (revision 1873)
+++ activesupport/lib/active_support/core_ext/integer/inflections.rb    (working copy)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Integer #:nodoc:
Index: activesupport/lib/active_support/core_ext/string/inflections.rb
===================================================================
--- activesupport/lib/active_support/core_ext/string/inflections.rb     (revision 1873)
+++ activesupport/lib/active_support/core_ext/string/inflections.rb     (working copy)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
Index: activesupport/lib/active_support/dependencies.rb
===================================================================
--- activesupport/lib/active_support/dependencies.rb    (revision 1873)
+++ activesupport/lib/active_support/dependencies.rb    (working copy)
@@ -172,6 +172,9 @@
 Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
 
 class Module #:nodoc:
+
+  alias old_const_missing const_missing
+
   # Use const_missing to autoload associations so we don't have to
   # require_association when using single-table inheritance.
   def const_missing(class_id)
Index: activerecord/test/deprecated_associations_test.rb
===================================================================
--- activerecord/test/deprecated_associations_test.rb   (revision 1873)
+++ activerecord/test/deprecated_associations_test.rb   (working copy)
@@ -113,17 +113,6 @@
     assert_raises(RuntimeError) { !Company.find(3).firm?(Company.find(3)) } # "Summit shouldn't have itself as firm"
   end
 
-  def test_has_one
-    assert companies(:first_firm).account?(Account.find(1))
-    assert_equal Account.find(1).credit_limit, companies(:first_firm).account.credit_limit
-    assert companies(:first_firm).has_account?, "37signals should have an account"
-    assert Account.find(1).firm?(companies(:first_firm)), "37signals account should be able to backtrack"
-    assert Account.find(1).has_firm?, "37signals account should be able to backtrack"
-
-    assert !Account.find(2).has_firm?, "Unknown isn't linked"
-    assert !Account.find(2).firm?(companies(:first_firm)), "Unknown isn't linked"
-  end
-
   def test_has_many_dependence_on_account
     assert_equal 2, Account.find_all.length
     companies(:first_firm).destroy
@@ -317,12 +306,18 @@
 
   def test_has_one
     assert companies(:first_firm).account?(Account.find(1))
-    assert companies(:first_firm).has_account?, "37signals should have an account"
-    assert Account.find(1).firm?(companies(:first_firm)), "37signals account should be able to backtrack"
-    assert Account.find(1).has_firm?, "37signals account should be able to backtrack"
+    assert_equal(Account.find(1).credit_limit,
+                 companies(:first_firm).account.credit_limit)
+    assert(companies(:first_firm).has_account?,
+           "37signals should have an account")
+    assert(Account.find(1).firm?(companies(:first_firm)),
+           "37signals account should be able to backtrack")
+    assert(Account.find(1).has_firm?,
+           "37signals account should be able to backtrack")
 
     assert !Account.find(2).has_firm?, "Unknown isn't linked"
-    assert !Account.find(2).firm?(companies(:first_firm)), "Unknown isn't linked"
+    assert(!Account.find(2).firm?(companies(:first_firm)),
+           "Unknown isn't linked")
   end
 
   def test_has_one_build
Index: activerecord/test/associations_test.rb
===================================================================
--- activerecord/test/associations_test.rb      (revision 1873)
+++ activerecord/test/associations_test.rb      (working copy)
@@ -138,15 +138,6 @@
     assert_equal account, firm.account
   end
 
-  def test_failing_build_association
-    firm = Firm.new("name" => "GlobalMegaCorp")
-    firm.save
-
-    account = firm.build_account
-    assert !account.save
-    assert_equal "can't be empty", account.errors.on("credit_limit")
-  end
-
   def test_create_association
     firm = Firm.new("name" => "GlobalMegaCorp")
     firm.save
Index: activerecord/test/base_test.rb
===================================================================
--- activerecord/test/base_test.rb      (revision 1873)
+++ activerecord/test/base_test.rb      (working copy)
@@ -685,7 +685,7 @@
   def test_auto_id
     auto = AutoId.new
     auto.save
-    assert (auto.id > 0)
+    assert(auto.id > 0)
   end
   
   def quote_column_name(name)
@@ -780,7 +780,7 @@
     assert_equal 1, topics(:first, :reload).replies_count
 
     topics(:first).decrement(:replies_count).decrement!(:replies_count)
-    assert_equal -1, topics(:first, :reload).replies_count
+    assert_equal(-1, topics(:first, :reload).replies_count)
   end
   
   def test_toggle_attribute
Index: activerecord/test/deprecated_finder_test.rb
===================================================================
--- activerecord/test/deprecated_finder_test.rb (revision 1873)
+++ activerecord/test/deprecated_finder_test.rb (working copy)
@@ -4,16 +4,9 @@
 require 'fixtures/entrant'
 require 'fixtures/developer'
 
-class FinderTest < Test::Unit::TestCase
+class DeprecatedFinderTest < Test::Unit::TestCase
   fixtures :companies, :topics, :entrants, :developers
 
-  def test_find_all_with_limit
-    entrants = Entrant.find_all nil, "id ASC", 2
-    
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
-  end
-
   def test_find_all_with_prepared_limit_and_offset
     if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
       if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
@@ -101,6 +94,11 @@
   end
 
   def test_find_all_with_limit
+    entrants = Entrant.find_all nil, "id ASC", 2
+    
+    assert_equal(2, entrants.size)
+    assert_equal(entrants(:first).name, entrants.first.name)
+
     first_five_developers = Developer.find_all nil, 'id ASC', 5
     assert_equal 5, first_five_developers.length
     assert_equal 'David', first_five_developers.first.name
Index: activerecord/test/finder_test.rb
===================================================================
--- activerecord/test/finder_test.rb    (revision 1873)
+++ activerecord/test/finder_test.rb    (working copy)
@@ -12,7 +12,7 @@
   end
   
   def test_exists
-    assert (Topic.exists?(1))
+    assert Topic.exists?(1)
     assert !(Topic.exists?(45))
     assert !(Topic.exists?("foo"))
     assert !(Topic.exists?([1,2]))
@@ -38,13 +38,6 @@
     }
   end
   
-  def test_find_all_with_limit
-    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
-    
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
-  end
-
   def test_find_all_with_prepared_limit_and_offset
     if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
       if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
@@ -276,6 +269,11 @@
   end
 
   def test_find_all_with_limit
+    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
+    
+    assert_equal(2, entrants.size)
+    assert_equal(entrants(:first).name, entrants.first.name)
+
     first_five_developers = Developer.find :all, :order => 'id ASC', :limit =>  5
     assert_equal 5, first_five_developers.length
     assert_equal 'David', first_five_developers.first.name
Index: activerecord/Rakefile
===================================================================
--- activerecord/Rakefile       (revision 1873)
+++ activerecord/Rakefile       (working copy)
@@ -30,12 +30,14 @@
   t.libs << "test" << "test/connections/native_mysql"
   t.pattern = 'test/*_test{,_mysql}.rb'
   t.verbose = true
+  t.warning = true
 }
 
 Rake::TestTask.new("test_mysql_ruby") { |t|
   t.libs << "test" << "test/connections/native_mysql"
   t.pattern = 'test/*_test{,_mysql}.rb'
   t.verbose = true
+  t.warning = true
 }
 
 for adapter in %w( postgresql sqlite sqlite3 sqlserver sqlserver_odbc db2 oci )
@@ -43,6 +45,7 @@
     t.libs << "test" << "test/connections/native_#{adapter}"
     t.pattern = "test/*_test{,_#{adapter}}.rb"
     t.verbose = true
+    t.warning = true
   }
 end
 
Index: activerecord/lib/active_record/validations.rb
===================================================================
--- activerecord/lib/active_record/validations.rb       (revision 1873)
+++ activerecord/lib/active_record/validations.rb       (working copy)
@@ -310,7 +310,7 @@
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
-        attr_accessor *(attr_names.map { |n| "#{n}_confirmation" })
+        attr_accessor(*(attr_names.map { |n| "#{n}_confirmation" }))
        
         validates_each(attr_names, configuration) do |record, attr_name, value|
           record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_confirmation").nil? or value == record.send("#{attr_name}_confirmation")
@@ -339,7 +339,7 @@
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save, :allow_nil => true, :accept => "1" }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
-        attr_accessor *attr_names
+        attr_accessor(*attr_names)
        
         validates_each(attr_names,configuration) do |record, attr_name, value|
           record.errors.add(attr_name, configuration[:message]) unless value == configuration[:accept]
Index: activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
===================================================================
--- activerecord/lib/active_record/connection_adapters/abstract_adapter.rb      (revision 1873)
+++ activerecord/lib/active_record/connection_adapters/abstract_adapter.rb      (working copy)
@@ -410,10 +410,6 @@
         raise NotImplementedError, "change_column_default is not implemented"
       end
       
-      def supports_migrations?
-        false
-      end      
-
       def rename_column(table_name, column_name, new_column_name)
         raise NotImplementedError, "rename_column is not implemented"
       end
Index: activerecord/lib/active_record/connection_adapters/oci_adapter.rb
===================================================================
--- activerecord/lib/active_record/connection_adapters/oci_adapter.rb   (revision 1873)
+++ activerecord/lib/active_record/connection_adapters/oci_adapter.rb   (working copy)
@@ -55,7 +55,7 @@
 
         def cast_to_date_or_time(value)
           return value if value.is_a? Date
-          guess_date_or_time (value.is_a? Time) ? value : cast_to_time(value)
+          guess_date_or_time value.is_a?(Time) ? value : cast_to_time(value)
         end
 
         def cast_to_time(value)
Index: activerecord/lib/active_record/query_cache.rb
===================================================================
--- activerecord/lib/active_record/query_cache.rb       (revision 1873)
+++ activerecord/lib/active_record/query_cache.rb       (working copy)
@@ -42,9 +42,11 @@
       end
   end
   
-  class Base
+  class << Base
+    alias old_connection= connection=
+
     # Set the connection for the class with caching on
-    def self.connection=(spec)
+    def connection=(spec)
       raise ConnectionNotEstablished unless spec
 
       conn = spec.config[:query_cache] ?
Index: activerecord/lib/active_record/fixtures.rb
===================================================================
--- activerecord/lib/active_record/fixtures.rb  (revision 1873)
+++ activerecord/lib/active_record/fixtures.rb  (working copy)
@@ -483,7 +483,8 @@
         instantiate_fixtures if use_instantiated_fixtures
       end
 
-      alias_method :setup, :setup_with_fixtures
+      alias old_setup setup
+      alias setup setup_with_fixtures
 
       def teardown_with_fixtures
         # Rollback changes.
@@ -493,7 +494,8 @@
         end
       end
 
-      alias_method :teardown, :teardown_with_fixtures
+      alias old_teardown teardown
+      alias teardown teardown_with_fixtures
 
       def self.method_added(method)
         case method.to_s
Index: actionpack/Rakefile
===================================================================
--- actionpack/Rakefile (revision 1873)
+++ actionpack/Rakefile (working copy)
@@ -28,6 +28,7 @@
   t.test_files=Dir.glob( "test/c*/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" )
 #  t.pattern = 'test/*/*_test.rb'
   t.verbose = true
+  t.warning = true
 }
 
 
@@ -239,4 +240,4 @@
       first_file = false
     end
   end
-end
\ No newline at end of file
+end
Index: actionpack/lib/action_controller/request.rb
===================================================================
--- actionpack/lib/action_controller/request.rb (revision 1873)
+++ actionpack/lib/action_controller/request.rb (working copy)
@@ -1,7 +1,7 @@
 module ActionController
   # These methods are available in both the production and test Request objects.
   class AbstractRequest
-    cattr_accessor :relative_url_root
+    cattr_writer :relative_url_root
     
     # Returns both GET and POST parameters in a single hash.
     def parameters
Index: actionpack/lib/action_controller/test_process.rb
===================================================================
--- actionpack/lib/action_controller/test_process.rb    (revision 1873)
+++ actionpack/lib/action_controller/test_process.rb    (working copy)
@@ -15,13 +15,15 @@
 
   class TestRequest < AbstractRequest #:nodoc:
     attr_accessor :cookies
-    attr_accessor :query_parameters, :request_parameters, :path, :session, :env
+    attr_accessor :query_parameters, :request_parameters, :session, :env
     attr_accessor :host
+    attr_writer :path
 
     def initialize(query_parameters = nil, request_parameters = nil, session = nil)
       @query_parameters   = query_parameters || {}
       @request_parameters = request_parameters || {}
       @session            = session || TestSession.new
+      @path = nil
 
       initialize_containers
       initialize_default_values
Index: actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
===================================================================
--- actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb       (revision 1873)
+++ actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb       (working copy)
@@ -1,6 +1,7 @@
 class CGI #:nodoc:
   # Add @request.env['RAW_POST_DATA'] for the vegans.
   module QueryExtension
+    alias old_initialize_query initialize_query
     # Initialize the data from the query.
     #
     # Handles multipart forms (in particular, forms that involve file uploads).
Index: actionpack/lib/action_view/base.rb
===================================================================
--- actionpack/lib/action_view/base.rb  (revision 1873)
+++ actionpack/lib/action_view/base.rb  (working copy)
@@ -151,6 +151,7 @@
     def initialize(base_path = nil, assigns_for_first_render = {}, controller = nil)#:nodoc:
       @base_path, @assigns = base_path, assigns_for_first_render
       @controller = controller
+      @first_render = nil
     end
 
     # Renders the template present at <tt>template_path</tt>. If <tt>use_full_path</tt> is set to true,