hash-utils 0.9.0 → 0.10.0

data/Rakefile

@@ -17,6 +17,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/martinkozak/hash-utils"
   gem.license = "MIT"
   gem.summary = 'Adds a lot of useful fundamental utility methods which are missing in Ruby, both to Array and Hash classes and introduces some useful methods and syntactic sugar to Object and String classes too.'
+  gem.post_install_message = "\nHASH UTILS: Be warn, Hash#all? is deprecated since version 0.10.0 because of\nconflict with built-in one with in fact equivalent functionallity. It will be\nremoved around version 0.13.0. Please, check your code if you can and switch\nto Ruby's one.\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 @@
-0.9.0
+0.10.0

data/hash-utils.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hash-utils}
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Kozák"]
-  s.date = %q{2011-02-21}
+  s.date = %q{2011-02-23}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -36,6 +36,13 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/martinkozak/hash-utils}
   s.licenses = ["MIT"]
+  s.post_install_message = %q{
+HASH UTILS: Be warn, Hash#all? is deprecated since version 0.10.0 because of
+conflict with built-in one with in fact equivalent functionallity. It will be
+removed around version 0.13.0. Please, check your code if you can and switch
+to Ruby's one.
+
+}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{Adds a lot of useful fundamental utility methods which are missing in Ruby, both to Array and Hash classes and introduces some useful methods and syntactic sugar to Object and String classes too.}

data/lib/hash-utils/array.rb

@@ -31,32 +31,7 @@ class Array
         
         return result
     end
-
-    ##
-    # Checks, all values follow condition expressed in block.
-    # Block must return Boolean.
-    #
-    # If it's empty, returns +true+.
-    #
-    # @param [Proc] block checking block
-    # @return [Boolean] +true+ if yes, +false+ in otherwise
-    # @since 0.2.0
-    #
     
-    def all?(&block)
-        if self.empty?
-            return true
-        end
-        
-        self.each do |v|
-            if block.call(v) == false
-                return false
-            end
-        end
-        
-        return true
-    end
-
     ##
     # Checks, at least one value follows condition expressed in 
     # block. Block must return Boolean.
@@ -66,15 +41,7 @@ class Array
     # @since 0.2.0
     #
     
-    def some?(&block)
-        self.each do |v|
-            if block.call(v) == true
-                return true
-            end
-        end
-        
-        return false
-    end
+    alias :some? :one?
     
     ##
     # Converts array to +Hash+.
@@ -105,4 +72,26 @@ class Array
 		end
     end
     
+    ##
+    # Merges arrays in place. It seems to be rather unuseful, but it's
+    # intended for special cases, for example joining arrays while
+    # constructing.
+    #
+    # An example (underlying object is extended array):
+    #   def initialize(array)
+    #       self += array       # impossible, will fail
+    #       self.merge! array   # possible, of sure
+    #   end
+    #
+    # @param [Array] arrays array for merge-in
+    # @return [Array] self
+    # @since 0.10.0
+    #
+    
+    def merge!(*arrays)
+        arrays.flatten!(1)
+        arrays.each { |i| self << i }
+        self
+    end
+    
 end

data/lib/hash-utils/hash.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 # (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
-
 ##
 # Hash extension.
 #
@@ -218,11 +217,21 @@ class Hash
     #
     # @param [Proc] block checking block
     # @return [Boolean] +true+ if yes, +false+ in otherwise 
+    # @note This method is currently in conflict with Ruby 1.9.2 
+    #   +Hash#all?+ method. Given block arity is checked, so code should 
+    #   be compatible for now, but this method will be probably moved 
+    #   around +0.13.0+ for performance reasons of sure to deprecated 
+    #   module.
+    # @deprecated (since 0.10.0, conflict with built-in method)
     # @since 0.2.0
     #
     
     def all?(&block)
-        if self.empty?
+        if block.arity == 2
+            self.all_pairs? &block
+        end
+        
+        if self.empty? or block.nil?
             return true
         end
         
@@ -234,7 +243,7 @@ class Hash
         
         return true
     end
-        
+    
     ##
     # Checks, all elements follow condition expressed in block.
     # Block must return boolean.
@@ -243,6 +252,8 @@ class Hash
     #
     # @param [Proc] block checking block
     # @return [Boolean] +true+ if yes, +false+ in otherwise 
+    # @note Since version 0.13.0 will be replaced by an alias to 
+    #   Ruby built-in +#all?+.
     # @since 0.2.0
     #
     
@@ -270,15 +281,11 @@ class Hash
     #
     
     def some?(&block)
-        self.each_value do |v|
-            if block.call(v) == true
-                return true
-            end
+        self.one? do |pair|
+            block.call(pair[1])
         end
-        
-        return false
     end
-
+       
     ##
     # Checks, at least one element follows condition expressed in 
     # block. Block must return boolean.
@@ -287,16 +294,8 @@ class Hash
     # @return [Boolean] +true+ if yes, +false+ in otherwise 
     # @since 0.2.0
     #
-        
-    def some_pairs?(&block)
-        self.each_pair do |k, v|
-            if block.call(k, v) == true
-                return true
-            end
-        end
-        
-        return false
-    end
+    
+    alias :some_pairs? :one?
     
     ##
     # Compatibility method with {Array#to_h}. Returns itself.
@@ -305,9 +304,7 @@ class Hash
     # @since 0.4.0
     #
     
-    def to_h(mode = nil)
-        self
-    end
+    alias :to_h :to_hash
     
     ##
     # Simulates sorting in place. In fact, replaces old one by new one.
@@ -451,4 +448,29 @@ class Hash
         return false
     end
     
+    ##
+    # Combines two arrays to Hash. First array will be keys, second one
+    # will be values.
+    #
+    # @example
+    #   keys = [:a, :b, :c]
+    #   values = [1, 2, 3]
+    #
+    #   Hash::combine(keys, values)     # will return {:a => 1, :b => 2, :c => 3}
+    #
+    # @param [Array] keys keys
+    # @param [Array] values values
+    # @return [Hash] resultant hash
+    # @since 0.10.0
+    #
+    
+    def self.combine(keys, values)
+        result = { }
+        keys.each_index do |i|
+            result[keys[i]] = values[i]
+        end
+        
+        return result
+    end
+    
 end

data/test

@@ -3,9 +3,4 @@
 $:.push("./lib")
 require "hash-utils/hash"
 
-hash = {:a => 1, :b => 2}
-puts hash.has_keys? [:a, :b]
-puts hash.has_keys? [:a]
-puts hash.has_keys? [:a, :c]
-puts hash.has_some? [:a, :c]
-puts hash.has_some? [:c]
+puts Hash::combine([:a, :b, :c], [1, 2, 3]).inspect

metadata

@@ -2,7 +2,7 @@
 name: hash-utils
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,11 @@ has_rdoc: true
 homepage: http://github.com/martinkozak/hash-utils
 licenses: 
 - MIT
-post_install_message: 
+post_install_message: "\n\
+  HASH UTILS: Be warn, Hash#all? is deprecated since version 0.10.0 because of\n\
+  conflict with built-in one with in fact equivalent functionallity. It will be\n\
+  removed around version 0.13.0. Please, check your code if you can and switch\n\
+  to Ruby's one.\n\n"
 rdoc_options: []
 
 require_paths: 
@@ -76,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -744753291499288812
+      hash: 1122397568412292267
       segments: 
       - 0
       version: "0"