jruby · Sep 25, 2015 · Sep 25, 2015
Showing with 38 additions and 29 deletions.

+38 −26 lib/ruby/stdlib/csv.rb

+0 −3 test/mri/excludes/TestCSV/Encodings.rb

0 test/mri/excludes/TestCSV/{ → Encodings}/DifferentOFS.rb
diff --git a/lib/ruby/stdlib/csv.rb b/lib/ruby/stdlib/csv.rb
@@ -944,29 +944,35 @@ class MalformedCSVError < RuntimeError; end
   # To add a combo field, the value should be an Array of names.  Combo fields
   # can be nested with other combo fields.
   #
-  Converters  = { integer:   lambda { |f|
-                    Integer(f.encode(ConverterEncoding)) rescue f
-                  },
-                  float:     lambda { |f|
-                    Float(f.encode(ConverterEncoding)) rescue f
-                  },
+  converter_methods = Module.new do
+    def self.integer(f)
+      Integer(f.encode(ConverterEncoding)) rescue f
+    end
+    def self.float(f)
+      Float(f.encode(ConverterEncoding)) rescue f
+    end
+    def self.date(f)
+      begin
+        e = f.encode(ConverterEncoding)
+        e =~ DateMatcher ? Date.parse(e) : f
+      rescue  # encoding conversion or date parse errors
+        f
+      end
+    end
+    def self.date_time(f)
+      begin
+        e = f.encode(ConverterEncoding)
+        e =~ DateTimeMatcher ? DateTime.parse(e) : f
+      rescue  # encoding conversion or date parse errors
+        f
+      end
+    end
+  end
+  Converters  = { integer:   converter_methods.method(:integer),
+                  float:     converter_methods.method(:float),
                   numeric:   [:integer, :float],
-                  date:      lambda { |f|
-                    begin
-                      e = f.encode(ConverterEncoding)
-                      e =~ DateMatcher ? Date.parse(e) : f
-                    rescue  # encoding conversion or date parse errors
-                      f
-                    end
-                  },
-                  date_time: lambda { |f|
-                    begin
-                      e = f.encode(ConverterEncoding)
-                      e =~ DateTimeMatcher ? DateTime.parse(e) : f
-                    rescue  # encoding conversion or date parse errors
-                      f
-                    end
-                  },
+                  date:      converter_methods.method(:date),
+                  date_time: converter_methods.method(:date_time),
                   all:       [:date_time, :numeric] }
 
   #
@@ -989,12 +995,18 @@ class MalformedCSVError < RuntimeError; end
   # To add a combo field, the value should be an Array of names.  Combo fields
   # can be nested with other combo fields.
   #
-  HeaderConverters = {
-    downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
-    symbol:   lambda { |h|
+  header_converters = Module.new do
+    def self.downcase(h)
+      h.encode(ConverterEncoding).downcase
+    end
+    def self.symbol(h)
       h.encode(ConverterEncoding).downcase.strip.gsub(/\s+/, "_").
                                                  gsub(/\W+/, "").to_sym
-    }
+    end
+  end
+  HeaderConverters = {
+    downcase: header_converters.method(:downcase),
+    symbol:   header_converters.method(:symbol)
   }
 
   #

diff --git a/test/mri/excludes/TestCSV/Encodings.rb b/test/mri/excludes/TestCSV/Encodings.rb
@@ -1,5 +1,2 @@
-exclude :test_auto_line_ending_detection, "needs investigation"
-exclude :test_can_write_csv_in_any_encoding, "needs investigation"
-exclude :test_read_with_default_encoding, "needs investigation"
 exclude :test_reading_with_most_encodings, "needs investigation"
 exclude :test_regular_expression_escaping, "needs investigation"
diff --git a/test/mri/excludes/TestCSV/DifferentOFS.rb → ...xcludes/TestCSV/Encodings/DifferentOFS.rb b/test/mri/excludes/TestCSV/DifferentOFS.rb → ...xcludes/TestCSV/Encodings/DifferentOFS.rb