hash-utils 2.1.2 → 2.2.0

data/CHANGES.txt

@@ -1,4 +1,8 @@
 
+2.2.0 (2013-12-05)
+* Array: #values
+* Hash: #deep_merge! and #deep_merge removed
+
 2.1.2 (2013-06-07)
 * Hash: #first_key, #first_value
 

data/README.md

@@ -49,7 +49,7 @@ Contributing
 Copyright
 ---------
 
-Copyright © 2011 – 2012 [Martin Kozák][10]. See `LICENSE.txt` for
+Copyright © 2011 – 2013 [Martin Kozák][10]. See `LICENSE.txt` for
 further details.
 
 [1]: http://rubyworks.github.com/facets/

data/Rakefile

@@ -21,7 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/martinkozak/hash-utils"
   gem.license = "MIT"
   gem.summary = 'Adds more than 155 useful and frequently rather fundamental methods which are missing in Ruby programming language, to Array, File, Hash, Module, Object, String and Symbol classes. It tries to be similar project to Ruby Facets on principle, but less complex, more practical, non-atomic and organized by better way. Thanks to defensive and careful patching it should be compatible with all other libraries.'
-  #gem.post_install_message = "\nHASH UTILS: The 2.0 version avoids the method overwriting conflicts by not performing overwriting of already implemented methods. By this way, it can damage your existing applications based on older versions although it's very improbable. \n\n"
+  gem.post_install_message = "\nHASH UTILS: The 2.2 version removes the #deep_merge and #deep_merge! methods to avoid conflicts with Active Support or other libraries. Use them or the 'deep_merge' gem if need them. \n\n"
   gem.email = "martinkozak@martinkozak.net"
   gem.authors = ["Martin Kozák"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.0

data/hash-utils.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hash-utils"
-  s.version = "2.1.2"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2013-06-07"
+  s.date = "2013-12-05"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/martinkozak/hash-utils"
   s.licenses = ["MIT"]
+  s.post_install_message = "\nHASH UTILS: The 2.2 version removes the #deep_merge and #deep_merge! methods to avoid conflicts with Active Support or other libraries. Use them or the 'deep_merge' gem if need them. \n\n"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.25"
   s.summary = "Adds more than 155 useful and frequently rather fundamental methods which are missing in Ruby programming language, to Array, File, Hash, Module, Object, String and Symbol classes. It tries to be similar project to Ruby Facets on principle, but less complex, more practical, non-atomic and organized by better way. Thanks to defensive and careful patching it should be compatible with all other libraries."

data/lib/hash-utils/array.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011-2012 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2013 Martin Poljak (martin@poljak.cz)
 
 require "hash-utils/object"
 require "ruby-version"
@@ -581,5 +581,22 @@ class Array
         end
     end
     
+    ##
+    # Returns values of the array.
+    #
+    # @example
+    #   x = [1, 2, 3, 4, 5]
+    #   x.values        # will return array itself
+    #
+    # @return [Array] self
+    # @since 2.1.3
+    #
+    
+    if not self.__hash_utils_instance_respond_to? :values
+        def values
+            self
+        end
+    end
+    
 end
 

data/lib/hash-utils/hash.rb

@@ -611,65 +611,6 @@ class Hash
             return result
         end
     end
-    
-    ##
-    # Merges two hashes recursively in place. Receives unlimited
-    # count of hashes for merging them in left to right order.
-    #
-    # @param [*Hash] hashs for merge from
-    # @return [Hash] hash for merge to
-    # @since 0.12.0
-    #
-    
-    if not self.__hash_utils_instance_respond_to? :deep_merge!
-        def deep_merge!(*args)
-            fm = args.map { |hash| [self, hash] }
-            
-            while not fm.empty?
-                _in, _out = fm.shift
-                _out.each_pair do |k, v|
-                    if v.kind_of? Hash
-                        fm << [_in[k], _out[k]]
-                    else
-                        _in[k] = v
-                    end
-                end
-            end
-            
-            return self
-        end
-    end
-    
-    ##
-    # Merges two hashes recursively and returns new +Hash+. Receives 
-    # unlimited count of hashes for merging them in left to right order.
-    # Included hashes will be copied too.
-    #
-    # @param [*Hash] hashes for merge from
-    # @return [Hash] hash for merge to
-    # @since 0.12.0
-    #
-    
-    if not self.__hash_utils_instance_respond_to? :deep_merge
-        def deep_merge(*args)
-            result = self.dup
-            fm = args.map { |hash| [result, hash] }
-    
-            while not fm.empty?
-                _in, _out = fm.shift
-                _out.each_pair do |k, v|
-                    if _in[k].kind_of? Hash
-                        _in[k] = _in[k].dup
-                        fm << [_in[k], _out[k]]
-                    else
-                        _in[k] = v
-                    end
-                end
-            end
-    
-            return result
-        end
-    end
         
     ##
     # Iterates through items with given key only. None-existing values 

data/spec/modules/array_spec.rb

@@ -161,6 +161,10 @@ describe "Array" do
     specify("#to_set") do
         [1, 2, 3].to_set.should eq(Set::new([1, 2, 3]))
     end
+    specify("#values") do
+        a = [1, 2, 3]
+        a.values.should eq(a)
+    end
     specify("#zip!") do
         t = [1, 2, 3]
         t.zip!

data/spec/modules/hash_spec.rb

@@ -121,18 +121,6 @@ describe "Hash" do
         t.map_values! { |i| i + 1 } 
         t.should eq({ :a => 2, :b => 3 })
     end
-    specify("#deep_merge") do
-        h1 = {:a => {:b => :c, :d => :e}}
-        h2 = {:a => {:d => :f, :h => :i}}
-        h = h1.deep_merge(h2) 
-        h.should eq({:a => {:b => :c, :d => :f, :h => :i}})
-        h1.should eq({:a => {:b => :c, :d => :e}})
-    end
-    specify("#deep_merge!") do
-        h = {:a => {:b => :c, :d => :e}}
-        h.deep_merge!({:a => {:d => :f, :h => :i}})
-        h.should eq({:a => {:b => :c, :d => :f, :h => :i}})
-    end
     specify("#keys_to_sym") do
         h = {"a" => "b", 2 => "c", "d" => "e"}
         h.keys_to_sym.should eq({:a => "b", 2 => "c", :d => "e"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash-utils
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-version
@@ -158,7 +158,9 @@ files:
 homepage: http://github.com/martinkozak/hash-utils
 licenses:
 - MIT
-post_install_message: 
+post_install_message: "\nHASH UTILS: The 2.2 version removes the #deep_merge and #deep_merge!
+  methods to avoid conflicts with Active Support or other libraries. Use them or the
+  'deep_merge' gem if need them. \n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -170,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 814178071789703873
+      hash: -3166404120164833176
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: