jeg2	2007-12-26 13:56:03 +0900 (Wed, 26 Dec 2007)

  New Revision: 14715

  Modified files:
    trunk/ChangeLog
    trunk/lib/csv.rb

  Log:
    * lib/csv.rb:  Cleaned up some code with Ruby 1.9 idioms.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14715&r2=14714
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/csv.rb?r1=14715&r2=14714

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14714)
+++ ChangeLog	(revision 14715)
@@ -1,3 +1,7 @@
+Wed Dec 26 13:55:02 2007  James Edward Gray II  <jeg2@r...>
+
+	* lib/csv.rb:  Cleaned up some code with Ruby 1.9 idioms.
+
 Wed Dec 26 13:29:35 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (tmpbuf): use rb_str_tmp_new().
Index: lib/csv.rb
===================================================================
--- lib/csv.rb	(revision 14714)
+++ lib/csv.rb	(revision 14715)
@@ -187,12 +187,10 @@
       @header_row = header_row
       
       # handle extra headers or fields
-      larger, smaller, transform = headers.size > fields.size ?
-                                   [headers, fields, :to_a]   :
-                                   [fields, headers, :reverse]
-      @row              = Array.new
-      larger.each_with_index do |e, i|
-        @row << [e, smaller[i]].send(transform)
+      @row = if headers.size > fields.size
+        headers.each_with_index.map { |header, i| [header, fields[i]] }
+      else
+        fields.each_with_index.map { |field, i| [headers[i], field] }
       end
     end
     
@@ -1814,8 +1812,7 @@
     # see if we are converting headers or fields
     converters = headers ? @header_converters : @converters
     
-    converted = Array.new
-    fields.each_with_index do |field, index|
+    fields.each_with_index.map do |field, index|  # map_with_index
       converters.each do |converter|
         field = if converter.arity == 1  # straight field converter
           converter[field]
@@ -1825,9 +1822,8 @@
         end
         break unless field.is_a? String  # short-curcuit pipeline for speed
       end
-      converted << field  # final state of each field, converted or original
+      field  # final state of each field, converted or original
     end
-    converted
   end
   
   # 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml