map_by_method 0.4.1 → 0.5.0

data/lib/map_by_method/version.rb

@@ -1,8 +1,8 @@
 module MapByMethod #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 4
-    TINY  = 1
+    MINOR = 5
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/map_by_method.rb

@@ -11,7 +11,13 @@ module MapByMethod
           re = /(map|collect|select|each|reject)(_by)?_([\\w\\_]+\\??)/
           if (match = method.to_s.match(re))
             iterator, callmethod = match[1], match[3]
-            return self.send(iterator) {|item| item.send callmethod}
+            callmethods = callmethod.split('_and_')
+            result = callmethods.collect do |callmethod|
+              self.send(iterator) {|item| item.send callmethod}
+            end
+            return callmethods.length == 1 ?
+              result.first :
+              result.transpose
           end
           return self.map {|item| item.send method.to_s.singularize.to_sym} 
         rescue NoMethodError

data/test/multiple_methods_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'ostruct'
+
+class MapByMethodTest < Test::Unit::TestCase
+
+  def setup
+    @data = [
+      OpenStruct.new(:name => 'Dr Nic', :amount => 300),
+      OpenStruct.new(:name => 'Banjo', :amount => 500)
+    ]
+  end
+  
+  def test_map_normal
+    assert_equal ['Dr Nic','Banjo'], @data.map_name
+    assert_equal [300,500], @data.map_amount
+  end
+  
+  def test_map_ands
+    assert_equal [['Dr Nic',300],['Banjo',500]], @data.map_name_and_amount
+    assert_equal [[300,'Dr Nic'],[500,'Banjo']], @data.map_amount_and_name
+  end
+  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: map_by_method
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2006-10-18 00:00:00 +02:00
+  version: 0.5.0
+date: 2006-10-26 00:00:00 +02:00
 summary: Replacement for Symbol.to_proc which is much cleaner and prettier
 require_paths: 
 - lib
@@ -32,10 +32,11 @@ files:
 - CHANGELOG
 - Rakefile
 - test/all_tests.rb
-- test/test_helper.rb
 - test/map_by_method_test.rb
-- lib/map_by_method.rb
+- test/multiple_methods_test.rb
+- test/test_helper.rb
 - lib/map_by_method
+- lib/map_by_method.rb
 - lib/map_by_method/version.rb
 test_files: []