0
@@ -1,7 +1,5 @@
0
 *SVN*
0
 
0
-* Adding Hash#without Closes #7369 [eventualbuddha]
0
-
0
 * TimeWithZone#method_missing: send to utc to advance with dst correctness, otherwise send to time. Adding tests for time calculations methods [Geoff Buesing]
0
 
0
 * Add config.active_support.use_standard_json_time_format setting so that Times and Dates export to ISO 8601 dates.  [rick]

0
@@ -11,11 +11,6 @@ module ActiveSupport #:nodoc:
0
       #   end
0
       #
0
       #   search(options.slice(:mass, :velocity, :time))
0
-      #
0
-      # Also allows leaving out certain keys. This is useful when duplicating
0
-      # a hash but omitting a certain subset:
0
-      #
0
-      #   Event.new(event.attributes.without(:id, :user_id))
0
       module Slice
0
         # Returns a new hash with only the given keys.
0
         def slice(*keys)
0
@@ -27,17 +22,6 @@ module ActiveSupport #:nodoc:
0
         def slice!(*keys)
0
           replace(slice(*keys))
0
         end
0
-
0
-        # Returns a new hash without the given keys.
0
-        def without(*keys)
0
-          allowed = self.keys - (respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
0
-          slice(*allowed)
0
-        end
0
-
0
-        # Replaces the hash without the given keys.
0
-        def without!(*keys)
0
-          replace(without(*keys))
0
-        end
0
       end
0
     end
0
   end

0
@@ -310,38 +310,6 @@ class HashExtTest < Test::Unit::TestCase
0
     assert_equal expected, original.except!(:c)
0
     assert_equal expected, original
0
   end
0
-
0
-  def test_without
0
-    original = { :a => 'x', :b => 'y', :c => 10 }
0
-    expected = { :a => 'x' }
0
-
0
-    # Should return a hash without the given keys.
0
-    assert_equal expected, original.without(:b, :c)
0
-    assert_not_equal expected, original
0
-
0
-    # Should ignore non-existant keys.
0
-    assert_equal expected, original.without(:b, :c, :d)
0
-
0
-    # Should replace the hash with the given keys taken away.
0
-    assert_equal expected, original.without!(:b, :c)
0
-    assert_equal expected, original
0
-  end
0
-
0
-  def test_indifferent_without
0
-    original = { :a => 'x', :b => 'y', :c => 10 }.with_indifferent_access
0
-    expected = { :c => 10 }.with_indifferent_access
0
-
0
-    [['a', 'b'], [:a, :b]].each do |keys|
0
-      # Should return a new hash without the given keys.
0
-      assert_equal expected, original.without(*keys), keys.inspect
0
-      assert_not_equal expected, original
0
-
0
-      # Should replace the hash without the given keys.
0
-      copy = original.dup
0
-      assert_equal expected, copy.without!(*keys)
0
-      assert_equal expected, copy
0
-    end
0
-  end
0
 end
0
 
0
 class IWriteMyOwnXML