Changeset 9210

Timestamp:

04/02/08 12:47:52 (8 months ago)

Author:

pratik

Message:

Revert [9209] Use Hash#except

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/hash/slice.rb (modified) (2 diffs)
• trunk/activesupport/test/core_ext/hash_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/activesupport/lib/active_support/core_ext/hash/slice.rb

@@ -12 +12 @@
-      #
-      #   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.
@@ -28 +23 @@
-          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

trunk/activesupport/test/core_ext/hash_ext_test.rb

@@ -310 +310 @@
-    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