modalsupport 0.7.1 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/lib/modalsupport/array.rb

@@ -27,4 +27,15 @@ class Array
     end
   end
   
+  # create a hash from an array of [key,value] tuples
+  # you can set default or provide a block just as with Hash::new
+  # Note: if you use [key, value1, value2, value#], hash[key] will
+  # be [value1, value2, value#]
+  def to_h(default=nil, &block)
+    # code by Stefan Rusterholz fixed for Ruby 1.9.2; see http://www.ruby-forum.com/topic/138218
+    hash = block_given? ? Hash.new(&block) : Hash.new(default)
+    each { |(key, *value)| hash[key]=value.size>1 ? value : value.first }
+    hash
+  end
+  
 end

data/lib/modalsupport/recursive_map.rb

@@ -0,0 +1,29 @@
+module ModalSupport
+  
+  module_function
+  
+  # Map hashes and arrays recursively. The supplied block is used to map all items (values and container).
+  #
+  # Examples
+  #   # double numeric values
+  #   recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3]){|v| v.kind_of?(Numeric) ? v*2 : v}
+  #   # => {:a=>22, :b=>44, :c=>{:x=>200,:y=>400}, :d=>[2,4,6]}
+  #
+  #   # 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) 
+    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]
+    when Array
+      blk[container.map{|v| recursive_map(v, &blk)}]
+    else
+      blk[container]
+    end
+  end
+  
+end

data/lib/modalsupport.rb

@@ -10,5 +10,6 @@ require 'modalsupport/array'
 module ModalSupport
 end
 
+require 'modalsupport/recursive_map'
 require 'modalsupport/mixins/state_equivalent'
 require 'modalsupport/mixins/bracket_constructor'

data/modalsupport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-21}
   s.description = %q{additional support extensions to ActiveSupport and HoboSupport}
   s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/modalsupport/full.rb",
      "lib/modalsupport/mixins/bracket_constructor.rb",
      "lib/modalsupport/mixins/state_equivalent.rb",
+     "lib/modalsupport/recursive_map.rb",
      "lib/modalsupport/regexp.rb",
      "lib/modalsupport/ruby_engine.rb",
      "lib/modalsupport/ruby_platform.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "modalsupport.gemspec",
      "test/helper.rb",
      "test/test_array_index.rb",
+     "test/test_array_to_h.rb",
      "test/test_bracket_constructor.rb",
      "test/test_cross_each.rb",
      "test/test_grep.rb",
@@ -45,6 +47,7 @@ Gem::Specification.new do |s|
      "test/test_match.rb",
      "test/test_paralell_each.rb",
      "test/test_product.rb",
+     "test/test_recursive_map.rb",
      "test/test_relative_path.rb",
      "test/test_rotate.rb",
      "test/test_slice.rb",
@@ -59,6 +62,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
      "test/test_array_index.rb",
+     "test/test_array_to_h.rb",
      "test/test_bracket_constructor.rb",
      "test/test_cross_each.rb",
      "test/test_grep.rb",
@@ -66,6 +70,7 @@ Gem::Specification.new do |s|
      "test/test_match.rb",
      "test/test_paralell_each.rb",
      "test/test_product.rb",
+     "test/test_recursive_map.rb",
      "test/test_relative_path.rb",
      "test/test_rotate.rb",
      "test/test_slice.rb",

data/test/test_array_to_h.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+class TestArrayIndex < Test::Unit::TestCase
+
+  context "Arrays" do
+
+    should "have an to_h method converting key-value pairs to a hash" do
+      assert_respond_to [], :to_h
+      assert_equal({:a=>11, :b=>22}, [[:a,11], [:b,22]].to_h)
+      assert_equal({:a=>11, :b=>[22,33]}, [[:a,11], [:b,22,33]].to_h)
+      assert_equal({1=>nil, 2=>nil, 3=>nil}, [1,2,3].to_h)
+    end
+
+  end
+
+end

data/test/test_recursive_map.rb

@@ -0,0 +1,76 @@
+require 'helper'
+
+class TestRecursiveMap < Test::Unit::TestCase
+
+  context "recursive_map" do
+    
+    setup do
+      @value_doubler = lambda{|v| v.kind_of?(Numeric) ? v*2 : v}
+      @hash_to_array = lambda{|v| v.kind_of?(Hash) ? v.to_a : v}
+      @array_to_string = lambda{|v| v.kind_of?(Array) ? v.inspect : v}
+    end
+    
+    should "process values in containers" do
+      assert_equal( 
+        {:a=>22, :b=>44},
+        ModalSupport.recursive_map(:a=>11, :b=>22, &@value_doubler)
+      )
+      assert_equal( 
+        [22,44],
+        ModalSupport.recursive_map([11,22], &@value_doubler)
+      )
+    end
+
+    should "process values in nested containers" do
+      assert_equal( 
+        {:a=>22, :b=>44, :c=>{:x=>200,:y=>400}, :d=>[2,4,6]},
+        ModalSupport.recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3], &@value_doubler)
+      )
+      assert_equal( 
+        [22, 44, {:c=>{:x=>200,:y=>400}, :d=>[2,4,6]}],
+        ModalSupport.recursive_map([11, 22, {:c=>{:x=>100,:y=>200}, :d=>[1,2,3]}], &@value_doubler)
+      )
+    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}}]}]},
+        ModalSupport.recursive_map({:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3,{:zz=>[1000,2000,{:yy=>{:xx=>3000}}]}]}, &@value_doubler)
+      )
+      assert_equal(
+        [22, 44, {:d=>[2, 4, 6, {:zz=>[2000, 4000, {:yy=>{:xx=>6000}}]}], :b=>44, :c=>{:x=>200, :y=>400}, :a=>22}],
+        ModalSupport.recursive_map([11,22,{:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3,{:zz=>[1000,2000,{:yy=>{:xx=>3000}}]}]}], &@value_doubler)
+      )
+    end
+    
+    should "transform containers" do
+      assert_same_elements(
+        [[:a, 11], [:b, 22], [:d, [1, 2, 3]]],
+        ModalSupport.recursive_map(:a=>11, :b=>22, :d=>[1,2,3], &@hash_to_array)        
+      )
+      assert_equal(
+        {:a=>11, :b=>22, :d=>[1,2,3].inspect},
+        ModalSupport.recursive_map(:a=>11, :b=>22, :d=>[1,2,3], &@array_to_string)        
+      )
+      assert_same_elements(
+        [[:a, 11], [:b, 22], [:c, [[:x, 100], [:y, 200]]], [:d, [1, 2, 3]]],
+        ModalSupport.recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3], &@hash_to_array)
+      )
+      assert_equal(
+        {:a=>11, :b=>22, :c=>{:x=>100, :y=>200}, :d=>[1,2,3].inspect},
+        ModalSupport.recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3], &@array_to_string)
+      )
+      ruby_19 do
+        # we only test this in Ruby 1.9 because prior versions don't keep Hash ordering
+        assert_equal(
+          "[111, 222, {:a=>11, :b=>22, :c=>{:x=>100, :y=>200}, :d=>\"[1, 2, 3]\"}]",
+          ModalSupport.recursive_map([111,222,{:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3]}], &@array_to_string)
+        )        
+      end
+    end
+
+
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/modalsupport/full.rb
 - lib/modalsupport/mixins/bracket_constructor.rb
 - lib/modalsupport/mixins/state_equivalent.rb
+- lib/modalsupport/recursive_map.rb
 - lib/modalsupport/regexp.rb
 - lib/modalsupport/ruby_engine.rb
 - lib/modalsupport/ruby_platform.rb
@@ -63,6 +64,7 @@ files:
 - modalsupport.gemspec
 - test/helper.rb
 - test/test_array_index.rb
+- test/test_array_to_h.rb
 - test/test_bracket_constructor.rb
 - test/test_cross_each.rb
 - test/test_grep.rb
@@ -70,6 +72,7 @@ files:
 - test/test_match.rb
 - test/test_paralell_each.rb
 - test/test_product.rb
+- test/test_recursive_map.rb
 - test/test_relative_path.rb
 - test/test_rotate.rb
 - test/test_slice.rb
@@ -113,6 +116,7 @@ summary: simple extensions to core classes
 test_files: 
 - test/helper.rb
 - test/test_array_index.rb
+- test/test_array_to_h.rb
 - test/test_bracket_constructor.rb
 - test/test_cross_each.rb
 - test/test_grep.rb
@@ -120,6 +124,7 @@ test_files:
 - test/test_match.rb
 - test/test_paralell_each.rb
 - test/test_product.rb
+- test/test_recursive_map.rb
 - test/test_relative_path.rb
 - test/test_rotate.rb
 - test/test_slice.rb