AvantiConveniences 1.0.6 → 1.0.7

data/AvantiConveniences.gemspec

@@ -2,41 +2,42 @@
 
 Gem::Specification.new do |s|
   s.name = %q{AvantiConveniences}
-  s.version = "1.0.4"
-
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamie Flournoy"]
-  s.date = %q{2009-03-20}
+  s.date = %q{2009-12-28}
   s.description = %q{AvantiConveniences is a set of convenience code for Ruby on Rails applications.}
   s.email = ["jamie@pervasivecode.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/arg_checks.rb", "lib/avanti_conveniences.rb", "lib/hash_extensions.rb", "lib/string_extensions.rb", "lib/text_formatter.rb", "lib/uri_extensions.rb", "test/test_arg_checks.rb", "test/test_avanti_conveniences.rb", "test/test_hash_extensions.rb", "test/test_string_extensions.rb", "test/test_text_formatter.rb", "test/test_uri_extensions.rb"]
-  s.has_rdoc = true
+  s.files = ["AvantiConveniences.gemspec", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/arg_checks.rb", "lib/array_extensions.rb", "lib/avanti_conveniences.rb", "lib/die.rb", "lib/float_extensions.rb", "lib/hash_extensions.rb", "lib/string_extensions.rb", "lib/text_formatter.rb", "lib/time_extensions.rb", "lib/uri_extensions.rb", "test/test_arg_checks.rb", "test/test_array_extensions.rb", "test/test_avanti_conveniences.rb", "test/test_die.rb", "test/test_float_extensions.rb", "test/test_hash_extensions.rb", "test/test_string_extensions.rb", "test/test_text_formatter.rb", "test/test_time_extensions.rb", "test/test_uri_extensions.rb"]
   s.homepage = %q{http://www.pervasivecode.com/blog/avanticonveniences/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{avanticonveniences}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{AvantiConveniences is a set of convenience code for Ruby on Rails applications.}
-  s.test_files = ["test/test_arg_checks.rb", "test/test_avanti_conveniences.rb", "test/test_hash_extensions.rb", "test/test_string_extensions.rb", "test/test_text_formatter.rb", "test/test_uri_extensions.rb"]
+  s.test_files = ["test/test_arg_checks.rb", "test/test_array_extensions.rb", "test/test_avanti_conveniences.rb", "test/test_die.rb", "test/test_float_extensions.rb", "test/test_hash_extensions.rb", "test/test_string_extensions.rb", "test/test_text_formatter.rb", "test/test_time_extensions.rb", "test/test_uri_extensions.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 1.2.6"])
       s.add_runtime_dependency(%q<text-hyphen>, [">= 1.0.0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.11.0"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 2.10.1"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
     else
       s.add_dependency(%q<activesupport>, [">= 1.2.6"])
       s.add_dependency(%q<text-hyphen>, [">= 1.0.0"])
-      s.add_dependency(%q<hoe>, [">= 1.11.0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.1"])
+      s.add_dependency(%q<hoe>, [">= 2.3.3"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 1.2.6"])
     s.add_dependency(%q<text-hyphen>, [">= 1.0.0"])
-    s.add_dependency(%q<hoe>, [">= 1.11.0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.1"])
+    s.add_dependency(%q<hoe>, [">= 2.3.3"])
   end
 end

data/History.txt

@@ -1,3 +1,6 @@
+=== 1.0.7 / 2009-12-28
+* Bug fix in Hash#map_keys, Hash#map_values, and Hash#map_pairs when handling keys or values that are arrays.
+
 === 1.0.6 / 2009-12-22
 
 * Added Array#average, Die.roll, Float::INFINITY, Time#at_midnight

data/lib/avanti_conveniences.rb

@@ -9,5 +9,5 @@ require File.dirname(__FILE__) + '/time_extensions'
 require File.dirname(__FILE__) + '/uri_extensions'
 
 class AvantiConveniences
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/hash_extensions.rb

@@ -2,13 +2,17 @@ class Hash
   # Call a block for every key in the Hash, and replace each key with the block's return value.
   # This returns a new Hash, so you do not need to call #rehash on it.
   def map_keys(&block)
-    Hash[* self.to_a.map{|k,v| [yield(k), v] }.flatten ]
+    mapped = Hash.new
+    self.to_a.map{|k,v| [yield(k), v] }.each{|k,v| mapped[k] = v}
+    mapped
   end
   alias_method :rekey, :map_keys  unless Hash.new.respond_to? :rekey
 
   # Call a block for every value in the Hash, and replace each value with the block's return value.
   def map_values(&block)
-    Hash[* self.to_a.map{|k,v| [k, yield(v)] }.flatten ]
+    mapped = Hash.new
+    self.to_a.map{|k,v| [k, yield(v)] }.each{|k,v| mapped[k] = v}
+    mapped
   end
   alias_method :revalue, :map_keys unless Hash.new.respond_to? :revalue
 
@@ -16,7 +20,9 @@ class Hash
   # The block should return a similar 2-element array of (key, value) which will be used to replace
   # the original key and value.
   def map_pairs(&block)
-    Hash[* self.to_a.map{|k,v| yield(k,v) }.flatten ]
+    mapped = Hash.new
+    self.to_a.map{|k,v| yield(k,v) }.each{|k,v| mapped[k] = v}
+    mapped
   end
 
 end

data/test/test_hash_extensions.rb

@@ -2,22 +2,47 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/hash_extensions'
 
 class TestHashExtensions < Test::Unit::TestCase
+
   def test_map_keys
     expected = {10 => :a, 20 => :b}
     actual = {1 => :a, 2 => :b}.map_keys{|k| k * 10}
     assert_equal expected, actual
   end
     
+
+  def test_map_array_keys
+    expected = {[10, 20, 30] => :a, [40, 50] => :b}
+    actual = {[1, 2, 3] => :a, [4,5] => :b}.map_keys{|k| k.map{|cell| cell * 10} }
+    assert_equal expected, actual
+  end
+    
+
   def test_map_values
     expected = {:a => 10, :b => 20}
-    actual = {:a => 1, :b => 2}.map_values{|k| k * 10}
+    actual = {:a => 1, :b => 2}.map_values{|v| v * 10}
+    assert_equal expected, actual
+  end
+
+    
+  def test_map_array_values
+    expected = {:a => [10, 20, 30], :b => [40, 50]}
+    actual = {:a => [1, 2, 3], :b => [4,5]}.map_values{|v| v.map{|cell| cell * 10} }
     assert_equal expected, actual
   end
+
     
   def test_map_pairs
     expected = {'A' => 10, 'B' => 20}
     actual = {'a' => 1, 'b' => 2}.map_pairs{|k, v| [k.upcase, v * 10] }
     assert_equal expected, actual
   end
+
     
+  def test_map_array_pairs
+    expected = {%w{A B} => [10, 20, 30], %w{C D} => [40, 50]}
+    actual = {[:a, :b] => [1,2,3], [:c, :d] => [4,5]}.map_pairs{|k, v| [k.map{|sym| sym.to_s.upcase}, v.map{|cell| cell * 10}] }
+    assert_equal expected, actual
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: AvantiConveniences
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Jamie Flournoy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2009-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency