Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM warnings are in dependencies.
This commit is contained in:
parent
cd9ffd11e1
commit
a5587efc19
|
@ -28,6 +28,8 @@ class TestMailer < ActionMailer::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
class <<self
|
class <<self
|
||||||
|
remove_method :received_body
|
||||||
|
remove_method :received_body=
|
||||||
attr_accessor :received_body
|
attr_accessor :received_body
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ module ActionController
|
||||||
# The scheme name consist of a letter followed by any combination of
|
# The scheme name consist of a letter followed by any combination of
|
||||||
# letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
|
# letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
|
||||||
# characters; and is terminated by a colon (":").
|
# characters; and is terminated by a colon (":").
|
||||||
when %r{^\w[\w\d+.-]*:.*}
|
when %r{^\w[\w+.-]*:.*}
|
||||||
options
|
options
|
||||||
when String
|
when String
|
||||||
request.protocol + request.host_with_port + options
|
request.protocol + request.host_with_port + options
|
||||||
|
|
|
@ -187,6 +187,7 @@ module ActionView #:nodoc:
|
||||||
@@debug_rjs = false
|
@@debug_rjs = false
|
||||||
|
|
||||||
class_attribute :helpers
|
class_attribute :helpers
|
||||||
|
remove_method :helpers
|
||||||
attr_reader :helpers
|
attr_reader :helpers
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
|
|
|
@ -1014,7 +1014,7 @@ module ActionView
|
||||||
class FormBuilder #:nodoc:
|
class FormBuilder #:nodoc:
|
||||||
# The methods which wrap a form helper call.
|
# The methods which wrap a form helper call.
|
||||||
class_inheritable_accessor :field_helpers
|
class_inheritable_accessor :field_helpers
|
||||||
self.field_helpers = (FormHelper.instance_methods - ['form_for'])
|
self.field_helpers = (FormHelper.instance_method_names - ['form_for'])
|
||||||
|
|
||||||
attr_accessor :object_name, :object, :options
|
attr_accessor :object_name, :object, :options
|
||||||
|
|
||||||
|
@ -1040,7 +1040,7 @@ module ActionView
|
||||||
end
|
end
|
||||||
|
|
||||||
(field_helpers - %w(label check_box radio_button fields_for hidden_field)).each do |selector|
|
(field_helpers - %w(label check_box radio_button fields_for hidden_field)).each do |selector|
|
||||||
src = <<-end_src
|
src, file, line = <<-end_src, __FILE__, __LINE__ + 1
|
||||||
def #{selector}(method, options = {}) # def text_field(method, options = {})
|
def #{selector}(method, options = {}) # def text_field(method, options = {})
|
||||||
@template.send( # @template.send(
|
@template.send( # @template.send(
|
||||||
#{selector.inspect}, # "text_field",
|
#{selector.inspect}, # "text_field",
|
||||||
|
@ -1049,7 +1049,7 @@ module ActionView
|
||||||
objectify_options(options)) # objectify_options(options))
|
objectify_options(options)) # objectify_options(options))
|
||||||
end # end
|
end # end
|
||||||
end_src
|
end_src
|
||||||
class_eval src, __FILE__, __LINE__
|
class_eval src, file, line
|
||||||
end
|
end
|
||||||
|
|
||||||
def fields_for(record_or_name_or_array, *args, &block)
|
def fields_for(record_or_name_or_array, *args, &block)
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'action_view/helpers/tag_helper'
|
require 'action_view/helpers/tag_helper'
|
||||||
require 'action_view/helpers/prototype_helper'
|
|
||||||
|
|
||||||
module ActionView
|
module ActionView
|
||||||
module Helpers
|
module Helpers
|
||||||
|
|
|
@ -853,5 +853,3 @@ module ActionView
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require 'action_view/helpers/javascript_helper'
|
|
||||||
|
|
|
@ -576,7 +576,7 @@ module ActionView
|
||||||
# each email is yielded and the result is used as the link text.
|
# each email is yielded and the result is used as the link text.
|
||||||
def auto_link_email_addresses(text, html_options = {})
|
def auto_link_email_addresses(text, html_options = {})
|
||||||
body = text.dup
|
body = text.dup
|
||||||
text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
|
text.gsub(/([\w\.!#\$%\-+]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
|
||||||
text = $1
|
text = $1
|
||||||
|
|
||||||
if body.match(/<a\b[^>]*>(.*)(#{Regexp.escape(text)})(.*)<\/a>/)
|
if body.match(/<a\b[^>]*>(.*)(#{Regexp.escape(text)})(.*)<\/a>/)
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
# This is so that templates compiled in this file are UTF-8
|
# This is so that templates compiled in this file are UTF-8
|
||||||
|
|
||||||
require 'set'
|
require 'set'
|
||||||
require "action_view/template/resolver"
|
|
||||||
|
|
||||||
module ActionView
|
module ActionView
|
||||||
class Template
|
class Template
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
require 'active_support/core_ext/object/singleton_class'
|
require 'active_support/core_ext/object/singleton_class'
|
||||||
require 'active_support/core_ext/module/delegation'
|
require 'active_support/core_ext/module/delegation'
|
||||||
|
require 'active_support/core_ext/module/remove_method'
|
||||||
|
|
||||||
class Class
|
class Class
|
||||||
# Declare a class-level attribute whose value is inheritable and
|
# Declare a class-level attribute whose value is inheritable and
|
||||||
|
@ -45,12 +46,14 @@ class Class
|
||||||
s.send(:define_method, attr) { }
|
s.send(:define_method, attr) { }
|
||||||
s.send(:define_method, :"#{attr}?") { !!send(attr) }
|
s.send(:define_method, :"#{attr}?") { !!send(attr) }
|
||||||
s.send(:define_method, :"#{attr}=") do |value|
|
s.send(:define_method, :"#{attr}=") do |value|
|
||||||
|
singleton_class.remove_possible_method(attr)
|
||||||
singleton_class.send(:define_method, attr) { value }
|
singleton_class.send(:define_method, attr) { value }
|
||||||
end
|
end
|
||||||
|
|
||||||
define_method(attr) { self.class.send(attr) }
|
define_method(attr) { self.class.send(attr) }
|
||||||
define_method(:"#{attr}?") { !!send(attr) }
|
define_method(:"#{attr}?") { !!send(attr) }
|
||||||
define_method(:"#{attr}=") do |value|
|
define_method(:"#{attr}=") do |value|
|
||||||
|
singleton_class.remove_possible_method(attr)
|
||||||
singleton_class.send(:define_method, attr) { value }
|
singleton_class.send(:define_method, attr) { value }
|
||||||
end if instance_writer
|
end if instance_writer
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,4 +8,5 @@ require 'active_support/core_ext/module/attr_accessor_with_default'
|
||||||
require 'active_support/core_ext/module/delegation'
|
require 'active_support/core_ext/module/delegation'
|
||||||
require 'active_support/core_ext/module/synchronization'
|
require 'active_support/core_ext/module/synchronization'
|
||||||
require 'active_support/core_ext/module/deprecation'
|
require 'active_support/core_ext/module/deprecation'
|
||||||
require 'active_support/core_ext/module/remove_method'
|
require 'active_support/core_ext/module/remove_method'
|
||||||
|
require 'active_support/core_ext/module/method_names'
|
|
@ -0,0 +1,14 @@
|
||||||
|
class Module
|
||||||
|
if instance_methods[0].is_a?(Symbol)
|
||||||
|
def instance_method_names(*args)
|
||||||
|
instance_methods(*args).map(&:to_s)
|
||||||
|
end
|
||||||
|
|
||||||
|
def method_names(*args)
|
||||||
|
methods(*args).map(&:to_s)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
alias_method :instance_method_names, :instance_methods
|
||||||
|
alias_method :method_names, :methods
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,5 +1,3 @@
|
||||||
require 'active_support/inflector'
|
|
||||||
|
|
||||||
# String inflections define new methods on the String class to transform names for different purposes.
|
# String inflections define new methods on the String class to transform names for different purposes.
|
||||||
# For instance, you can figure out the name of a database from the name of a class.
|
# For instance, you can figure out the name of a database from the name of a class.
|
||||||
#
|
#
|
||||||
|
|
|
@ -23,12 +23,14 @@ class ERB
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
undef :h
|
remove_method(:h)
|
||||||
alias h html_escape
|
alias h html_escape
|
||||||
|
|
||||||
module_function :html_escape
|
|
||||||
module_function :h
|
module_function :h
|
||||||
|
|
||||||
|
singleton_class.send(:remove_method, :html_escape)
|
||||||
|
module_function :html_escape
|
||||||
|
|
||||||
# A utility method for escaping HTML entities in JSON strings.
|
# A utility method for escaping HTML entities in JSON strings.
|
||||||
# This method is also aliased as <tt>j</tt>.
|
# This method is also aliased as <tt>j</tt>.
|
||||||
#
|
#
|
||||||
|
|
|
@ -53,8 +53,8 @@ module ActiveSupport #:nodoc:
|
||||||
\xf4 [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
|
\xf4 [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
|
||||||
# Quick check for valid Shift-JIS characters, disregards the odd-even pairing
|
# Quick check for valid Shift-JIS characters, disregards the odd-even pairing
|
||||||
'Shift_JIS' => /\A(?:
|
'Shift_JIS' => /\A(?:
|
||||||
[\x00-\x7e \xa1-\xdf] |
|
[\x00-\x7e\xa1-\xdf] |
|
||||||
[\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
|
[\x81-\x9f\xe0-\xef] [\x40-\x7e\x80-\x9e\x9f-\xfc])\z /xn
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -18,3 +18,4 @@ require 'active_support/core_ext/string/interpolation'
|
||||||
require 'active_support/core_ext/rexml'
|
require 'active_support/core_ext/rexml'
|
||||||
require 'active_support/core_ext/time/conversions'
|
require 'active_support/core_ext/time/conversions'
|
||||||
require 'active_support/core_ext/file/path'
|
require 'active_support/core_ext/file/path'
|
||||||
|
require 'active_support/core_ext/module/method_names'
|
|
@ -7,7 +7,7 @@ require 'active_support/testing/pending'
|
||||||
require 'active_support/testing/isolation'
|
require 'active_support/testing/isolation'
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require 'mocha'
|
silence_warnings { require 'mocha' }
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
# Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
|
# Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
|
||||||
Object.const_set :Mocha, Module.new
|
Object.const_set :Mocha, Module.new
|
||||||
|
|
|
@ -78,8 +78,8 @@ module ActiveSupport
|
||||||
@@ran_class_setup = true
|
@@ran_class_setup = true
|
||||||
end
|
end
|
||||||
|
|
||||||
serialized = run_in_isolation do |runner|
|
serialized = run_in_isolation do |isolated_runner|
|
||||||
super(runner)
|
super(isolated_runner)
|
||||||
end
|
end
|
||||||
|
|
||||||
retval, proxy = Marshal.load(serialized)
|
retval, proxy = Marshal.load(serialized)
|
||||||
|
|
Loading…
Reference in New Issue