aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash/diff.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-03-21 04:00:51 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-03-21 04:39:53 -0700
commitb4a1718832c70005e45a930d5106857cf882e147 (patch)
treeb1a5fd3f934fd7142e26190a1192fbe371e7250b /activesupport/lib/active_support/core_ext/hash/diff.rb
parentbc4e2aa931209e4d91779f15dbbf59b7db045dca (diff)
downloadrails-b4a1718832c70005e45a930d5106857cf882e147.tar.gz
rails-b4a1718832c70005e45a930d5106857cf882e147.tar.bz2
rails-b4a1718832c70005e45a930d5106857cf882e147.zip
Convert hash extension modules to class reopens
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/diff.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/diff.rb28
1 files changed, 11 insertions, 17 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb
index 6abd678822..da98593458 100644
--- a/activesupport/lib/active_support/core_ext/hash/diff.rb
+++ b/activesupport/lib/active_support/core_ext/hash/diff.rb
@@ -1,19 +1,13 @@
-module ActiveSupport #:nodoc:
- module CoreExtensions #:nodoc:
- module Hash #:nodoc:
- module Diff
- # Returns a hash that represents the difference between two hashes.
- #
- # Examples:
- #
- # {1 => 2}.diff(1 => 2) # => {}
- # {1 => 2}.diff(1 => 3) # => {1 => 2}
- # {}.diff(1 => 2) # => {1 => 2}
- # {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4}
- def diff(h2)
- self.dup.delete_if { |k, v| h2[k] == v }.merge(h2.dup.delete_if { |k, v| self.has_key?(k) })
- end
- end
- end
+class Hash
+ # Returns a hash that represents the difference between two hashes.
+ #
+ # Examples:
+ #
+ # {1 => 2}.diff(1 => 2) # => {}
+ # {1 => 2}.diff(1 => 3) # => {1 => 2}
+ # {}.diff(1 => 2) # => {1 => 2}
+ # {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4}
+ def diff(h2)
+ dup.delete_if { |k, v| h2[k] == v }.merge(h2.dup.delete_if { |k, v| has_key?(k) })
end
end