map_by_method 0.7.0 → 0.8.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.0 2007-09-05
+
+* Works in Rails - respond_to? must return true or false, or rather, cannot return MatchData [thx Mislav Marohnić]
+* Additional mapper methods: sort_by, and group_by, index_by (in activesupport gem)
+
 == 0.7.0 2007-08-11
 
 * ActiveRecord AssociationProxy support (company.users.map_by_name now works)

data/lib/map_by_method.rb

@@ -1,50 +1,38 @@
 module MapByMethod
-  module ClassMethods
-    def map_by_method_regex
-      /(map|collect|select|each|reject)(_by)?_([\w\_]+\??)/
+  MAP_BY_METHOD_FORMAT = /^(map|collect|select|each|reject|sort_by|group_by|index_by)(?:_by)?_(\w+[?!]?)$/
+  
+  module InstanceMethods
+    alias_method :respond_to_before_map_by_method?, :respond_to?
+    
+    def respond_to?(method)
+      respond_to_before_map_by_method?(method) or
+        !!method.to_s.match(MAP_BY_METHOD_FORMAT)
     end
-  end
 
-  module InstanceMethods
+    protected
+    
     alias_method :method_missing_before_map_by_method, :method_missing
     
     def method_missing(method, *args, &block)
-      method_missing_before_map_by_method(method, *args, &block)
-    rescue NoMethodError
-      error = $!
-      begin
-        if (match = method.to_s.match(self.class.map_by_method_regex))
-          iterator, callmethod = match[1], match[3]
-          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
+      if !respond_to_before_map_by_method?(method) and
+          (matches = method.to_s.match(MAP_BY_METHOD_FORMAT))
+        iterator, callmethod = matches[1..2]
+        # map by multiple stuff
+        result = callmethod.split('_and_').collect do |method|
+          self.send(iterator) { |item| item.send method }
         end
-        method_name = method.to_s
-        @@support_singularize ||= method_name.methods.include? "singularize"
-        return self.map {|item| item.send method_name.singularize.to_sym} if @@support_singularize
-      rescue NoMethodError
-        nil
+        
+        return result.length > 1 ? result.transpose : result.first
+      else
+        method_missing_before_map_by_method(method, *args, &block)
       end
-      raise error
-    end
-
-    alias_method :"respond_to_before_map_by_method?", :"respond_to?"
-    def respond_to?(method)
-      return true if respond_to_before_map_by_method?(method)
-      method.to_s.match(self.class.map_by_method_regex)
     end
   end
   
   def self.included(base)
     super
-    base.extend(ClassMethods)
-    base.send(:include, InstanceMethods)
+    base.send :include, InstanceMethods
   end
-  
 end
 
-Array.send :include, MapByMethod
+Array.send :include, MapByMethod

data/lib/map_by_method/version.rb

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

data/test/test_helper.rb

@@ -1,2 +1,10 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/map_by_method'
+
+begin
+  require 'active_support'
+rescue LoadError
+  require 'rubygems'
+  gem 'activesupport'
+  require 'active_support'
+end

data/test/test_map_by_method.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
+require 'ostruct'
 
 class TestMapByMethod < Test::Unit::TestCase
 
@@ -27,4 +28,31 @@ class TestMapByMethod < Test::Unit::TestCase
     assert_equal ['1','3'], ['1','','3'].select_any?
     assert_equal ['1','3'], ['1','','3'].select_by_any?
   end
+  
+  def test_sort_by
+    original = [OpenStruct.new(:name => "ZZZ"), OpenStruct.new(:name => "AAA")]
+    expected = [OpenStruct.new(:name => "AAA"), OpenStruct.new(:name => "ZZZ")]
+    assert_equal expected, original.sort_by_name
+  end
+  
+  def test_group_by
+    original = [
+      OpenStruct.new(:name => "ZZZ", :group => "letters"), 
+      OpenStruct.new(:name => "AAA", :group => "letters")
+    ]
+    expected = {"letters" => original.clone}
+    assert_equal expected, original.group_by_group
+  end
+
+  def test_index_by
+    original = [
+      OpenStruct.new(:name => "ZZZ"), 
+      OpenStruct.new(:name => "AAA")
+    ]
+    expected = {
+      "ZZZ" => OpenStruct.new(:name => "ZZZ"), 
+      "AAA" => OpenStruct.new(:name => "AAA")
+    }
+    assert_equal expected, original.index_by_name
+  end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1 class=primary>Map By Method</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/drnicutilities"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/drnicutilities" class="numbers">0.7.0</a>
+      <a href="http://rubyforge.org/projects/drnicutilities" class="numbers">0.8.0</a>
     </div>
     <h1><code>["1","2","3"]. map_by_to_i =&gt; [1,2,3]</code></h1>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.3
 specification_version: 1
 name: map_by_method
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2007-08-12 00:00:00 +02:00
+  version: 0.8.0
+date: 2007-09-05 00:00:00 +02:00
 summary: Replacement for map {|obj| obj.action} and Symbol.to_proc which is much cleaner and prettier NOW WORKS with ActiveRecord Associations!!
 require_paths: 
 - lib