Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert [9209] Use Hash#except

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9210 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 3b603bbc937ec9647de78fd271347987aea24e09 1 parent adaed1e
@lifo lifo authored
View
2  activesupport/CHANGELOG
@@ -1,7 +1,5 @@
*SVN*
-* Adding Hash#without Closes #7369 [eventualbuddha]
-
* TimeWithZone#method_missing: send to utc to advance with dst correctness, otherwise send to time. Adding tests for time calculations methods [Geoff Buesing]
* Add config.active_support.use_standard_json_time_format setting so that Times and Dates export to ISO 8601 dates. [rick]
View
16 activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -11,11 +11,6 @@ module Hash #:nodoc:
# end
#
# search(options.slice(:mass, :velocity, :time))
- #
- # Also allows leaving out certain keys. This is useful when duplicating
- # a hash but omitting a certain subset:
- #
- # Event.new(event.attributes.without(:id, :user_id))
module Slice
# Returns a new hash with only the given keys.
def slice(*keys)
@@ -27,17 +22,6 @@ def slice(*keys)
def slice!(*keys)
replace(slice(*keys))
end
-
- # Returns a new hash without the given keys.
- def without(*keys)
- allowed = self.keys - (respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
- slice(*allowed)
- end
-
- # Replaces the hash without the given keys.
- def without!(*keys)
- replace(without(*keys))
- end
end
end
end
View
32 activesupport/test/core_ext/hash_ext_test.rb
@@ -310,38 +310,6 @@ def test_except
assert_equal expected, original.except!(:c)
assert_equal expected, original
end
-
- def test_without
- original = { :a => 'x', :b => 'y', :c => 10 }
- expected = { :a => 'x' }
-
- # Should return a hash without the given keys.
- assert_equal expected, original.without(:b, :c)
- assert_not_equal expected, original
-
- # Should ignore non-existant keys.
- assert_equal expected, original.without(:b, :c, :d)
-
- # Should replace the hash with the given keys taken away.
- assert_equal expected, original.without!(:b, :c)
- assert_equal expected, original
- end
-
- def test_indifferent_without
- original = { :a => 'x', :b => 'y', :c => 10 }.with_indifferent_access
- expected = { :c => 10 }.with_indifferent_access
-
- [['a', 'b'], [:a, :b]].each do |keys|
- # Should return a new hash without the given keys.
- assert_equal expected, original.without(*keys), keys.inspect
- assert_not_equal expected, original
-
- # Should replace the hash without the given keys.
- copy = original.dup
- assert_equal expected, copy.without!(*keys)
- assert_equal expected, copy
- end
- end
end
class IWriteMyOwnXML
Please sign in to comment.
Something went wrong with that request. Please try again.