utilities 0.0.19 → 0.0.20

data/lib/utilities/hash.rb

@@ -1,23 +1,39 @@
 class Hash
   # Returns a new hash with the results of running block once for every key in self
-  def collect_keys
-    each_with_object({}){ |(k,v),h| h[yield(k)] = v } if block_given?
+  def collect_keys(recursive=false, &block)
+    if block_given?
+      each_with_object({}) do |(k,v),h|
+        if recursive && v.kind_of?(Hash)
+          h[yield(k)] = v.collect_keys(recursive, &block)
+        else
+          h[yield(k)] = v
+        end
+      end
+    end
   end
   alias_method :map_keys, :collect_keys
   
   # Returns a new hash with the results of running block once for every value in self
-  def collect_values
-    each_with_object({}){ |(k,v),h| h[k] = yield(v) } if block_given?
+  def collect_values(recursive=false, &block)
+    if block_given?
+      each_with_object({}) do |(k,v),h|
+        if recursive && v.kind_of?(Hash)
+          h[k] = v.collect_values(recursive, &block)
+        else
+          h[k] = yield(v)
+        end
+      end
+    end
   end
   alias_method :map_values, :collect_values
   
   # Returns a new hash where all keys have been symbolized
-  def symbolize_keys
-    collect_keys{ |k| k.to_sym }
+  def symbolize_keys(recursive=false)
+    collect_keys(recursive){ |k| k.to_sym }
   end
   
   # Returns a new hash where all keys have been stringified
-  def stringify_keys
-    collect_keys{ |k| k.to_s }
+  def stringify_keys(recursive=false)
+    collect_keys(recursive){ |k| k.to_s }
   end
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 class Utilities
   MAJOR = 0
   MINOR = 0
-  BUILD = 19
+  BUILD = 20
 
   VERSION = "#{MAJOR}.#{MINOR}.#{BUILD}"
 end

data/test/test_utilities.rb

@@ -48,18 +48,26 @@ end
 describe Hash do
   it "#collect_keys should returns a new hash with the results of running block once for every key in self" do
     {"a"=>1, "b"=>2, "c"=>3}.collect_keys{|k| k + "z"}.should == {"az"=>1, "bz"=>2, "cz"=>3}
+    {"a"=>1, "b"=>{"c"=>3}}.collect_keys{|k| k + "z"}.should == {"az"=>1, "bz"=>{"c"=>3}}
+    {"a"=>1, "b"=>{"c"=>3}}.collect_keys(true){|k| k + "z"}.should == {"az"=>1, "bz"=>{"cz"=>3}}
   end
   
   it "#collect_values should returns a new hash with the results of running block once for every value in self" do
     {"a"=>1, "b"=>2, "c"=>3}.collect_values{|v| v**2}.should == {"a"=>1, "b"=>4, "c"=>9}
+    lambda{ {"a"=>1, "b"=>{"c"=>3}}.collect_values{|v| v**2}.should raise_error( NoMethodError ) }
+    {"a"=>1, "b"=>{"c"=>3}}.collect_values(true){|v| v**2}.should == {"a"=>1, "b"=>{"c"=>9}}
   end
   
   it "#symbolize_keys should returns a new hash where all keys have been symbolized" do
     {"a"=>1, "b"=>2, "c"=>3}.symbolize_keys.should == {:a=>1, :b=>2, :c=>3}
+    {"a"=>1, "b"=>{"c"=>3}}.symbolize_keys.should == {:a=>1, :b=>{"c"=>3}}
+    {"a"=>1, "b"=>{"c"=>3}}.symbolize_keys(true).should == {:a=>1, :b=>{:c=>3}}
   end
   
   it "#stringify_keys should returns a new hash where all keys have been stringified" do
     {:a=>1, :b=>2, :c=>3}.stringify_keys.should == {"a"=>1, "b"=>2, "c"=>3}
+    {:a=>1, :b=>{:c=>3}}.stringify_keys.should == {"a"=>1, "b"=>{:c=>3}}
+    {:a=>1, :b=>{:c=>3}}.stringify_keys(true).should == {"a"=>1, "b"=>{"c"=>3}}
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utilities
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies: []
 description: Few utilities include in all my projects, including a module for statistics,
   some to_date and to_time functions as well as intersection method for Range object.