modalsupport 0.9.0 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/modalsupport/recursive_map.rb

@@ -1,7 +1,7 @@
 module ModalSupport
-  
+
   module_function
-  
+
   # Map hashes and arrays recursively. The supplied block is used to map all items (values and container).
   #
   # Examples
@@ -12,23 +12,34 @@ module ModalSupport
   #   # convert hashes to OpenStructs
   #   recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}){|v| v.kind_of?(Hash) ? OpenStruct.new(v) : v}
   #   # => #<OpenStruct b=22, a=11, c=#<OpenStruct x=100, y=200>>
-  def recursive_map(container, &blk) 
+  def recursive_map(container, key=nil, &blk)
     raise ArgumentError, "recursive_map requires a block" if blk.nil?
     case container
     when Hash
-      blk[container.map{|k,v|
-        [k, recursive_map(v, &blk)]
-      }.to_h]
+      if blk.arity==2
+        blk[key, container.map{|k,v|
+          [k, recursive_map(v, k, &blk)]
+        }.to_h]
+      else
+        blk[container.map{|k,v|
+          [k, recursive_map(v, &blk)]
+        }.to_h]
+      end
     when Array
-      blk[container.map{|v| recursive_map(v, &blk)}]
+      if blk.arity==2
+        blk[key, container.map_with_index{|v, i| recursive_map(v, i, &blk)}]
+      else
+        blk[container.map{|v| recursive_map(v, &blk)}]
+      end
     else
-      case mapped = blk[container]
+      mapped = blk.arity==2 ?  blk[key, container] : blk[container]
+      case mapped
       when Hash, Array
-        recursive_map(mapped, &blk)
+        recursive_map(mapped, key, &blk)
       else
         mapped
       end
     end
   end
-  
+
 end

data/modalsupport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalsupport"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-04-30"
+  s.date = "2012-05-14"
   s.description = "additional support extensions to ActiveSupport and HoboSupport"
   s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [

data/test/test_recursive_map.rb

@@ -32,6 +32,21 @@ class TestRecursiveMap < Test::Unit::TestCase
       )
     end
 
+    should "process values with indices in containers" do
+      assert_equal(
+        {:a=>11, :b=>44},
+        ModalSupport.recursive_map(:a=>11, :b=>22){|i,v|
+          i==:b ? v*2 : v
+        }
+      )
+      assert_equal(
+        [11,44],
+        ModalSupport.recursive_map([11,22]){|i,v|
+          i.nil? ? v : (i+1)*v
+        }
+      )
+    end
+
     should "process values in nested containers" do
       assert_equal(
         {:a=>22, :b=>44, :c=>{:x=>200,:y=>400}, :d=>[2,4,6]},
@@ -43,6 +58,21 @@ class TestRecursiveMap < Test::Unit::TestCase
       )
     end
 
+    should "process values with indices in nested containers" do
+      assert_equal(
+        {:a=>11, :b=>44, :c=>{:x=>200,:y=>200}, :d=>[1,4,3]},
+        ModalSupport.recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3]){|i,v|
+          [:x,:b,1].include?(i) ? v*2 : v
+        }
+      )
+      assert_equal(
+        [0, 22, {:c=>{:x=>100,:y=>200}, :d=>[0,2,6]}],
+        ModalSupport.recursive_map([11, 22, {:c=>{:x=>100,:y=>200}, :d=>[1,2,3]}]){|i,v|
+          (i.kind_of?(Numeric) && v.kind_of?(Numeric)) ? i*v : v
+        }
+      )
+    end
+
     should "process values in deeply nested containers" do
       assert_equal(
         {:a=>22, :b=>44, :c=>{:x=>200, :y=>400}, :d=>[2, 4, 6, {:zz=>[2000, 4000, {:yy=>{:xx=>6000}}]}]},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalsupport
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda