diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index f379aae5b91509ad261281f498aca884533c7a13..9437c4a1d79502a854dd863662d6c9fcea12de18 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,3 +1,5 @@ +* Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 [Marcel Molina] + * Fixed that Dependencies.reload can't load the same file twice #420 [Kent Sibilev] * Added Fixnum#ago/until, Fixnum#since/from_now #450 [bitsweat] diff --git a/activesupport/lib/core_ext.rb b/activesupport/lib/core_ext.rb index d288fb7e310aa2df8da7a80a5d1e258bdf581a96..573313e74132f17455d890c39e6dd227e4f383dd 100644 --- a/activesupport/lib/core_ext.rb +++ b/activesupport/lib/core_ext.rb @@ -1 +1 @@ -Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each { |file| require(file) } \ No newline at end of file +Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each { |file| require(file) } diff --git a/activesupport/lib/misc.rb b/activesupport/lib/misc.rb index d2c3d4a045008dac70641a302ca725ab282737eb..1ca00db1e7fda45525b16aa773be653c5d1b0e44 100644 --- a/activesupport/lib/misc.rb +++ b/activesupport/lib/misc.rb @@ -6,27 +6,3 @@ def silence_warnings $VERBOSE = old_verbose end end - -class Hash - # Return a new hash with all keys converted to symbols. - def symbolize_keys - inject({}) do |options, (key, value)| - options[key.to_sym] = value - options - end - end - - # Destructively convert all keys to symbols. - def symbolize_keys! - keys.each do |key| - unless key.is_a?(Symbol) - self[key.to_sym] = self[key] - delete(key) - end - end - self - end - - alias_method :to_options, :symbolize_keys - alias_method :to_options!, :symbolize_keys! -end diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index f481cf0242ab57d78e2a2b6c4c7ecf3863d4a9ba..52a28c15534fe3751757c5c1f44db098fca132be 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -1,7 +1,38 @@ require 'test/unit' -require File.dirname(__FILE__) + '/../../lib/core_ext/hash_ext' +require File.dirname(__FILE__) + '/../../lib/core_ext/hash' class HashExtTest < Test::Unit::TestCase + + def setup + @strings = { 'a' => 1, 'b' => 2 } + @symbols = { :a => 1, :b => 2 } + @mixed = { :a => 1, 'b' => 2 } + end + + def test_methods + h = {} + assert_respond_to h, :symbolize_keys + assert_respond_to h, :symbolize_keys! + assert_respond_to h, :to_options + assert_respond_to h, :to_options! + end + + def test_symbolize_keys + assert_equal @symbols, @symbols.symbolize_keys + assert_equal @symbols, @strings.symbolize_keys + assert_equal @symbols, @mixed.symbolize_keys + + assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys } + end + + def test_symbolize_keys! + assert_equal @symbols, @symbols.dup.symbolize_keys! + assert_equal @symbols, @strings.dup.symbolize_keys! + assert_equal @symbols, @mixed.dup.symbolize_keys! + + assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys! } + end + def test_assert_valid_keys assert_nothing_raised do { :failure => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ]) @@ -11,4 +42,4 @@ def test_assert_valid_keys { :failore => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ]) end end -end \ No newline at end of file +end diff --git a/activesupport/test/misc_test.rb b/activesupport/test/misc_test.rb index 2a6c40709a41e5761b13d4b63c15c5bf5548559a..5a2d1d33e821afa5cd0b2799770ac757edd1d39f 100644 --- a/activesupport/test/misc_test.rb +++ b/activesupport/test/misc_test.rb @@ -17,35 +17,3 @@ def test_silence_warnings_verbose_invariant end end end - -class HashOptionsTest < Test::Unit::TestCase - def setup - @strings = { 'a' => 1, 'b' => 2 } - @symbols = { :a => 1, :b => 2 } - @mixed = { :a => 1, 'b' => 2 } - end - - def test_methods - h = {} - assert_respond_to h, :symbolize_keys - assert_respond_to h, :symbolize_keys! - assert_respond_to h, :to_options - assert_respond_to h, :to_options! - end - - def test_symbolize_keys - assert_equal @symbols, @symbols.symbolize_keys - assert_equal @symbols, @strings.symbolize_keys - assert_equal @symbols, @mixed.symbolize_keys - - assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys } - end - - def test_symbolize_keys! - assert_equal @symbols, @symbols.dup.symbolize_keys! - assert_equal @symbols, @strings.dup.symbolize_keys! - assert_equal @symbols, @mixed.dup.symbolize_keys! - - assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys! } - end -end