Merge remote branch 'mainstream/master'

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb

19 files changed, 111 insertions, 187 deletions

diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 8198b9bd2c..f5f91ddd80 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -339,6 +339,11 @@ class ArrayWrapperTests < Test::Unit::TestCase
     end
   end
 
+  class Proxy
+    def initialize(target) @target = target end
+    def method_missing(*a) @target.send(*a) end
+  end
+
   def test_array
     ary = %w(foo bar)
     assert_same ary, Array.wrap(ary)
@@ -364,4 +369,19 @@ class ArrayWrapperTests < Test::Unit::TestCase
   def test_object_with_to_ary
     assert_equal ["foo", "bar"], Array.wrap(FakeCollection.new)
   end
+
+  def test_proxy_object
+    p = Proxy.new(Object.new)
+    assert_equal [p], Array.wrap(p)
+  end
+
+  def test_proxy_to_object_with_to_ary
+    p = Proxy.new(FakeCollection.new)
+    assert_equal [p], Array.wrap(p)
+  end
+
+  def test_struct
+    o = Struct.new(:foo).new(123)
+    assert_equal [o], Array.wrap(o)
+  end
 end
diff --git a/activesupport/test/core_ext/boolean_ext_test.rb b/activesupport/test/core_ext/boolean_ext_test.rb
deleted file mode 100644
index 9439716efb..0000000000
--- a/activesupport/test/core_ext/boolean_ext_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/boolean/conversions'
-
-class BooleanExtAccessTests < Test::Unit::TestCase
-  def test_to_param_on_true
-    assert_equal true, true.to_param
-  end
-
-  def test_to_param_on_false
-    assert_equal false, false.to_param
-  end
-end
diff --git a/activesupport/test/core_ext/class/delegating_attributes_test.rb b/activesupport/test/core_ext/class/delegating_attributes_test.rb
index b51d68551d..beb55ba17e 100644
--- a/activesupport/test/core_ext/class/delegating_attributes_test.rb
+++ b/activesupport/test/core_ext/class/delegating_attributes_test.rb
@@ -52,6 +52,13 @@ class DelegatingAttributesTest < Test::Unit::TestCase
     assert !single_class.public_instance_methods.map(&:to_s).include?("both=")
   end
 
+  def test_simple_accessor_declaration_with_instance_reader_false
+    single_class.superclass_delegating_accessor :no_instance_reader, :instance_reader => false
+    assert single_class.respond_to?(:no_instance_reader)
+    assert single_class.respond_to?(:no_instance_reader=)
+    assert !single_class.public_instance_methods.map(&:to_s).include?("no_instance_reader")
+  end
+
   def test_working_with_simple_attributes
     single_class.superclass_delegating_accessor :both
 
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 18422d68bc..23c9bc7fb1 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'active_support/core_ext/date'
+require 'active_support/time'
 
 class DateExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index a7b179b2be..4341ead488 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'active_support/core_ext/date_time'
+require 'active_support/time'
 
 class DateTimeExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 4170de3dce..66f5f9fbde 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'active_support/core_ext/array'
-require 'active_support/core_ext/symbol'
 require 'active_support/core_ext/enumerable'
 
 Payment = Struct.new(:price)
@@ -90,15 +89,4 @@ class EnumerableTests < Test::Unit::TestCase
     assert ![ 1, 2 ].many? {|x| x > 1 }
     assert [ 1, 2, 2 ].many? {|x| x > 1 }
   end
-
-  def test_none
-    assert [].none?
-    assert [nil, false].none?
-    assert ![1].none?
-
-    assert [].none? {|x| x > 1 }
-    assert ![ 2 ].none? {|x| x > 1 }
-    assert ![ 1, 2 ].none? {|x| x > 1 }
-    assert [ 1, 1 ].none? {|x| x > 1 }
-  end
 end
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index eb4c37aaf0..4642bb1330 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -899,42 +899,6 @@ class HashToXmlTest < Test::Unit::TestCase
     # :builder, etc, shouldn't be added to options
     assert_equal({:skip_instruct => true}, options)
   end
-end
-
-class QueryTest < Test::Unit::TestCase
-  def test_simple_conversion
-    assert_query_equal 'a=10', :a => 10
-  end
-
-  def test_cgi_escaping
-    assert_query_equal 'a%3Ab=c+d', 'a:b' => 'c d'
-  end
-
-  def test_nil_parameter_value
-    empty = Object.new
-    def empty.to_param; nil end
-    assert_query_equal 'a=', 'a' => empty
-  end
-
-  def test_nested_conversion
-    assert_query_equal 'person%5Blogin%5D=seckar&person%5Bname%5D=Nicholas',
-      :person => {:name => 'Nicholas', :login => 'seckar'}
-  end
-
-  def test_multiple_nested
-    assert_query_equal 'account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10',
-      :person => {:id => 10}, :account => {:person => {:id => 20}}
-  end
-
-  def test_array_values
-    assert_query_equal 'person%5Bid%5D%5B%5D=10&person%5Bid%5D%5B%5D=20',
-      :person => {:id => [10, 20]}
-  end
-
-  def test_array_values_are_not_sorted
-    assert_query_equal 'person%5Bid%5D%5B%5D=20&person%5Bid%5D%5B%5D=10',
-      :person => {:id => [20, 10]}
-  end
 
   def test_expansion_count_is_limited
     expected = {
@@ -962,9 +926,4 @@ class QueryTest < Test::Unit::TestCase
       Hash.from_xml(attack_xml)
     end
   end
-
-  private
-    def assert_query_equal(expected, actual, message = nil)
-      assert_equal expected.split('&'), actual.to_query.split('&')
-    end
 end
diff --git a/activesupport/test/core_ext/integer_ext_test.rb b/activesupport/test/core_ext/integer_ext_test.rb
index 956ae5189d..e1591089f5 100644
--- a/activesupport/test/core_ext/integer_ext_test.rb
+++ b/activesupport/test/core_ext/integer_ext_test.rb
@@ -2,22 +2,6 @@ require 'abstract_unit'
 require 'active_support/core_ext/integer'
 
 class IntegerExtTest < Test::Unit::TestCase
-  def test_even
-    assert [ -2, 0, 2, 4 ].all? { |i| i.even? }
-    assert ![ -1, 1, 3 ].all? { |i| i.even? }
-
-    assert 22953686867719691230002707821868552601124472329079.odd?
-    assert !22953686867719691230002707821868552601124472329079.even?
-    assert 22953686867719691230002707821868552601124472329080.even?
-    assert !22953686867719691230002707821868552601124472329080.odd?
-  end
-
-  def test_odd
-    assert ![ -2, 0, 2, 4 ].all? { |i| i.odd? }
-    assert [ -1, 1, 3 ].all? { |i| i.odd? }
-    assert 1000000000000000000000000000000000000000000000000000000001.odd?
-  end
-
   def test_multiple_of
     [ -7, 0, 7, 14 ].each { |i| assert i.multiple_of?(7) }
     [ -7, 7, 14 ].each { |i| assert ! i.multiple_of?(6) }
diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb
index 10913e2ade..6352484d04 100644
--- a/activesupport/test/core_ext/name_error_test.rb
+++ b/activesupport/test/core_ext/name_error_test.rb
@@ -3,23 +3,19 @@ require 'active_support/core_ext/name_error'
 
 class NameErrorTest < Test::Unit::TestCase
   def test_name_error_should_set_missing_name
-    begin
-      SomeNameThatNobodyWillUse____Really ? 1 : 0
-      flunk "?!?!"
-    rescue NameError => exc
-      assert_equal "NameErrorTest::SomeNameThatNobodyWillUse____Really", exc.missing_name
-      assert exc.missing_name?(:SomeNameThatNobodyWillUse____Really)
-      assert exc.missing_name?("NameErrorTest::SomeNameThatNobodyWillUse____Really")
-    end
+    SomeNameThatNobodyWillUse____Really ? 1 : 0
+    flunk "?!?!"
+  rescue NameError => exc
+    assert_equal "NameErrorTest::SomeNameThatNobodyWillUse____Really", exc.missing_name
+    assert exc.missing_name?(:SomeNameThatNobodyWillUse____Really)
+    assert exc.missing_name?("NameErrorTest::SomeNameThatNobodyWillUse____Really")
   end
 
   def test_missing_method_should_ignore_missing_name
-    begin
-      some_method_that_does_not_exist
-      flunk "?!?!"
-    rescue NameError => exc
-      assert_equal nil, exc.missing_name
-      assert ! exc.missing_name?(:Foo)
-    end
+    some_method_that_does_not_exist
+    flunk "?!?!"
+  rescue NameError => exc
+    assert !exc.missing_name?(:Foo)
+    assert_nil exc.missing_name
   end
 end
diff --git a/activesupport/test/core_ext/nil_ext_test.rb b/activesupport/test/core_ext/nil_ext_test.rb
deleted file mode 100644
index 1062676d65..0000000000
--- a/activesupport/test/core_ext/nil_ext_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/nil/conversions'
-
-class NilExtAccessTests < Test::Unit::TestCase
-  def test_to_param
-    assert_nil nil.to_param
-  end
-end
diff --git a/activesupport/test/core_ext/object/to_param_test.rb b/activesupport/test/core_ext/object/to_param_test.rb
new file mode 100644
index 0000000000..c3efefddb5
--- /dev/null
+++ b/activesupport/test/core_ext/object/to_param_test.rb
@@ -0,0 +1,19 @@
+require 'abstract_unit'
+require 'active_support/core_ext/object/to_param'
+
+class ToParamTest < Test::Unit::TestCase
+  def test_object
+    foo = Object.new
+    def foo.to_s; 'foo' end
+    assert_equal 'foo', foo.to_param
+  end
+
+  def test_nil
+    assert_nil nil.to_param
+  end
+
+  def test_boolean
+    assert_equal true, true.to_param
+    assert_equal false, false.to_param
+  end
+end
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
new file mode 100644
index 0000000000..0fb15be654
--- /dev/null
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -0,0 +1,43 @@
+require 'abstract_unit'
+require 'active_support/core_ext/object/to_query'
+
+class ToQueryTest < Test::Unit::TestCase
+  def test_simple_conversion
+    assert_query_equal 'a=10', :a => 10
+  end
+
+  def test_cgi_escaping
+    assert_query_equal 'a%3Ab=c+d', 'a:b' => 'c d'
+  end
+
+  def test_nil_parameter_value
+    empty = Object.new
+    def empty.to_param; nil end
+    assert_query_equal 'a=', 'a' => empty
+  end
+
+  def test_nested_conversion
+    assert_query_equal 'person%5Blogin%5D=seckar&person%5Bname%5D=Nicholas',
+      :person => {:name => 'Nicholas', :login => 'seckar'}
+  end
+
+  def test_multiple_nested
+    assert_query_equal 'account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10',
+      :person => {:id => 10}, :account => {:person => {:id => 20}}
+  end
+
+  def test_array_values
+    assert_query_equal 'person%5Bid%5D%5B%5D=10&person%5Bid%5D%5B%5D=20',
+      :person => {:id => [10, 20]}
+  end
+
+  def test_array_values_are_not_sorted
+    assert_query_equal 'person%5Bid%5D%5B%5D=20&person%5Bid%5D%5B%5D=10',
+      :person => {:id => [20, 10]}
+  end
+
+  private
+    def assert_query_equal(expected, actual, message = nil)
+      assert_equal expected.split('&'), actual.to_query.split('&')
+    end
+end
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index f0121b862d..e6fbdb637b 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -182,13 +182,6 @@ class ObjectInstanceVariableTest < Test::Unit::TestCase
     assert_equal %w(@bar @baz), @source.instance_variable_names.sort
   end
 
-  def test_instance_variable_defined
-    assert @source.instance_variable_defined?('@bar')
-    assert @source.instance_variable_defined?(:@bar)
-    assert !@source.instance_variable_defined?(:@foo)
-    assert !@source.instance_variable_defined?('@foo')
-  end
-
   def test_copy_instance_variables_from_without_explicit_excludes
     assert_equal [], @dest.instance_variables
     @dest.copy_instance_variables_from(@source)
diff --git a/activesupport/test/core_ext/object_ext_test.rb b/activesupport/test/core_ext/object_ext_test.rb
deleted file mode 100644
index 484eecaab6..0000000000
--- a/activesupport/test/core_ext/object_ext_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/object/metaclass'
-require 'active_support/core_ext/object/conversions'
-
-class ObjectExtTest < Test::Unit::TestCase
-  def test_tap_yields_and_returns_self
-    foo = Object.new
-    assert_equal foo, foo.tap { |x| assert_equal foo, x; :bar }
-  end
-
-  def test_to_param
-    foo = Object.new
-    foo.class_eval("def to_s; 'foo'; end")
-    assert_equal 'foo', foo.to_param
-  end
-end
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index 2565c56b8a..5701eeef28 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
+require 'active_support/time'
 require 'active_support/core_ext/range'
-require 'active_support/core_ext/date/conversions'
 
 class RangeTest < Test::Unit::TestCase
   def test_to_s_from_dates
diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb
index cc3f07d5c5..68b089d5b4 100644
--- a/activesupport/test/core_ext/regexp_ext_test.rb
+++ b/activesupport/test/core_ext/regexp_ext_test.rb
@@ -2,28 +2,9 @@ require 'abstract_unit'
 require 'active_support/core_ext/regexp'
 
 class RegexpExtAccessTests < Test::Unit::TestCase
-  def test_number_of_captures
-    assert_equal 0, //.number_of_captures
-    assert_equal 1, /.(.)./.number_of_captures
-    assert_equal 2, /.(.).(?:.).(.)/.number_of_captures
-    assert_equal 3, /.((.).(?:.).(.))/.number_of_captures
-  end
-
   def test_multiline
     assert_equal true, //m.multiline?
     assert_equal false, //.multiline?
     assert_equal false, /(?m:)/.multiline?
   end
-
-  def test_optionalize
-    assert_equal "a?", Regexp.optionalize("a")
-    assert_equal "(?:foo)?", Regexp.optionalize("foo")
-    assert_equal "", Regexp.optionalize("")
-  end
-
-  def test_unoptionalize
-    assert_equal "a", Regexp.unoptionalize("a?")
-    assert_equal "foo", Regexp.unoptionalize("(?:foo)?")
-    assert_equal "", Regexp.unoptionalize("")
-  end
 end
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 584a41b631..56ed296dac 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -4,7 +4,8 @@ require 'abstract_unit'
 require 'inflector_test_cases'
 
 require 'active_support/core_ext/string'
-require 'active_support/core_ext/time'
+require 'active_support/time'
+require 'active_support/core_ext/kernel/reporting'
 
 class StringInflectionsTest < Test::Unit::TestCase
   include InflectorTestCases
@@ -185,17 +186,9 @@ class StringInflectionsTest < Test::Unit::TestCase
     assert s.starts_with?('hel')
     assert !s.starts_with?('el')
 
-    assert s.start_with?('h')
-    assert s.start_with?('hel')
-    assert !s.start_with?('el')
-
     assert s.ends_with?('o')
     assert s.ends_with?('lo')
     assert !s.ends_with?('el')
-
-    assert s.end_with?('o')
-    assert s.end_with?('lo')
-    assert !s.end_with?('el')
   end
 
   def test_string_squish
@@ -214,17 +207,6 @@ class StringInflectionsTest < Test::Unit::TestCase
     # And changes the original string:
     assert_equal original, expected
   end
-
-  if RUBY_VERSION < '1.9'
-    def test_each_char_with_utf8_string_when_kcode_is_utf8
-      with_kcode('UTF8') do
-        '€2.99'.each_char do |char|
-          assert_not_equal 1, char.length
-          break
-        end
-      end
-    end
-  end
 end
 
 class StringBehaviourTest < Test::Unit::TestCase
@@ -350,13 +332,6 @@ class TestGetTextString < Test::Unit::TestCase
   end
 end
 
-class StringBytesizeTest < Test::Unit::TestCase
-  def test_bytesize
-    assert_respond_to 'foo', :bytesize
-    assert_equal 3, 'foo'.bytesize
-  end
-end
-
 class OutputSafetyTest < ActiveSupport::TestCase
   def setup
     @string = "hello"
diff --git a/activesupport/test/core_ext/symbol_test.rb b/activesupport/test/core_ext/symbol_test.rb
deleted file mode 100644
index 1eaccb9965..0000000000
--- a/activesupport/test/core_ext/symbol_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'abstract_unit'
-
-class SymbolTests < Test::Unit::TestCase
-  def test_to_proc
-    assert_equal %w(one two three), [:one, :two, :three].map(&:to_s)
-    assert_equal(%w(one two three),
-      {1 => "one", 2 => "two", 3 => "three"}.sort_by(&:first).map(&:last))
-  end
-end
diff --git a/activesupport/test/core_ext/uri_ext_test.rb b/activesupport/test/core_ext/uri_ext_test.rb
index 2d4f38d095..e4a242abc4 100644
--- a/activesupport/test/core_ext/uri_ext_test.rb
+++ b/activesupport/test/core_ext/uri_ext_test.rb
@@ -7,7 +7,11 @@ class URIExtTest < Test::Unit::TestCase
     str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
     str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding)
 
-    assert_equal str, URI.unescape(URI.escape(str))
-    assert_equal str, URI.decode(URI.escape(str))
+    if URI.const_defined?(:Parser)
+      parser = URI::Parser.new
+      assert_equal str, parser.unescape(parser.escape(str))
+    else
+      assert_equal str, URI.unescape(URI.escape(str))
+    end
   end
 end