Breaking change (fixes #25): rename DelimitedParser into CsvParser to…

… avoid confusion. This parser uses FasterCSV under the hood, which means it can choke on faulty data. Renaming it makes it clearer to the end-user and I will emphasize this in the documentation.
activewarehouse · Jun 19, 2011 · 7a64fb2 · 7a64fb2
1 parent 8699ac4
commit 7a64fb2
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 24 deletions.
diff --git a/lib/etl/parser/delimited_parser.rb → lib/etl/parser/csv_parser.rb b/lib/etl/parser/delimited_parser.rb → lib/etl/parser/csv_parser.rb
@@ -1,7 +1,7 @@
 module ETL #:nodoc:
   module Parser #:nodoc:
-    # Parses delimited files
-    class DelimitedParser < ETL::Parser::Parser
+    # Parses CSV files
+    class CsvParser < ETL::Parser::Parser
       # Initialize the parser
       # * <tt>source</tt>: The Source object
       # * <tt>options</tt>: Hash of options for the parser, defaults to an empty hash

diff --git a/test/delimited.ctl b/test/delimited.ctl
@@ -1,7 +1,7 @@
 source :in, {
   :file => 'data/delimited.txt',
   :parser => {
-    :name => :delimited
+    :name => :csv
   }
 }, 
 [ 

diff --git a/test/delimited_absolute.ctl b/test/delimited_absolute.ctl
@@ -1,9 +1,7 @@
-# puts "executing delimited.ctl"
-
 source :in, {
   :file => '/tmp/delimited_abs.txt',
   :parser => {
-    :name => :delimited
+    :name => :csv
   }
 }, 
 [ 

diff --git a/test/delimited_destination_db.ctl b/test/delimited_destination_db.ctl
@@ -1,8 +1,6 @@
-# puts "executing delimited.ctl"
-
 source :in, {
   :file => 'data/delimited.txt',
-  :parser => :delimited
+  :parser => :csv
 }, 
 [ 
   :id,

diff --git a/test/delimited_excel.ctl b/test/delimited_excel.ctl
@@ -1,7 +1,7 @@
 source :in, {
   :file => 'data/delimited.txt',
   :parser => {
-    :name => :delimited
+    :name => :csv
   }
 }, 
 [ 

diff --git a/test/delimited_insert_update.ctl b/test/delimited_insert_update.ctl
@@ -1,7 +1,7 @@
 source :in, {
   :file => 'data/delimited.txt',
   :parser => {
-    :name => :delimited
+    :name => :csv
   }
 }, 
 [ 

diff --git a/test/delimited_update.ctl b/test/delimited_update.ctl
@@ -1,7 +1,7 @@
 source :in, {
   :file => 'data/delimited.txt',
   :parser => {
-    :name => :delimited
+    :name => :csv
   }
 }, 
 [ 

diff --git a/test/delimited_with_bulk_load.ctl b/test/delimited_with_bulk_load.ctl
@@ -4,7 +4,7 @@ outfile = 'output/people.txt'
 source :in, {
   :file => infile,
   :parser => {
-    :name => :delimited
+    :name => :csv
   }
 }, 
 [ 

diff --git a/test/multiple_delimited.ctl b/test/multiple_delimited.ctl
@@ -2,7 +2,7 @@
 
 source :in, {
   :file => 'data/multiple_delimited_*.txt',
-  :parser => :delimited
+  :parser => :csv
 }, 
 [ 
   :first_name,

diff --git a/test/multiple_source_delimited.ctl b/test/multiple_source_delimited.ctl
@@ -2,7 +2,7 @@
 
 source :source1, {
   :file => 'data/multiple_delimited_*.txt',
-  :parser => :delimited
+  :parser => :csv
 }, 
 [ 
   :first_name,
@@ -16,7 +16,7 @@ source :source1, {
 
 source :source2, {
   :file => 'data/multiple_delimited_*.txt',
-  :parser => :delimited
+  :parser => :csv
 }, 
 [ 
   :first_name,

diff --git a/test/parser_test.rb b/test/parser_test.rb
@@ -3,9 +3,9 @@
 # Test the flat text parsers
 class ParserTest < Test::Unit::TestCase
   # Test parsing delimited data
-  def test_delimited_parser
+  def test_csv_parser
     control = ETL::Control::Control.resolve(File.dirname(__FILE__) + '/delimited.ctl')
-    parser = ETL::Parser::DelimitedParser.new(control.sources.first)
+    parser = ETL::Parser::CsvParser.new(control.sources.first)
     rows = parser.collect { |row| row }
     assert_equal 3, rows.length
     assert_equal({:first_name=>"Chris", :last_name=>"Smith", :ssn=>"111223333", :age=>"24", :sex => 'M'}, rows.first)

diff --git a/test/performance/delimited.ctl b/test/performance/delimited.ctl
@@ -2,7 +2,7 @@
 
 source :in, {
   :file => 'delimited.txt',
-  :parser => :delimited
+  :parser => :csv
 }, 
 [ 
   :first_name,

diff --git a/test/scd_test_type_1.ctl b/test/scd_test_type_1.ctl
@@ -1,6 +1,6 @@
 source :in, {
   :file => "scd/#{ENV['run_number']}.txt",
-  :parser => :delimited
+  :parser => :csv
 },
 [
   :first_name,

diff --git a/test/scd_test_type_2.ctl b/test/scd_test_type_2.ctl
@@ -1,6 +1,6 @@
 source :in, {
   :file => "scd/#{ENV['run_number']}.txt",
-  :parser => :delimited
+  :parser => :csv
 },
 [
   :first_name,

diff --git a/test/source_test.rb b/test/source_test.rb
@@ -24,7 +24,7 @@ class SourceTest < Test::Unit::TestCase
         control = ETL::Control::Control.parse(File.dirname(__FILE__) + '/delimited.ctl')
         configuration = {
           :file => 'data/delimited.txt',
-          :parser => :delimited
+          :parser => :csv
         }
         definition = self.definition + [:sex]
 
@@ -42,7 +42,7 @@ class SourceTest < Test::Unit::TestCase
       control = ETL::Control::Control.parse(File.dirname(__FILE__) + '/multiple_delimited.ctl')
       configuration = {
         :file => 'data/multiple_delimited_*.txt',
-        :parser => :delimited
+        :parser => :csv
       }
 
       source = ETL::Control::FileSource.new(control, configuration, definition)
@@ -61,7 +61,7 @@ class SourceTest < Test::Unit::TestCase
         '/delimited_absolute.ctl')
       configuration = {
         :file => '/tmp/delimited_abs.txt',
-        :parser => :delimited
+        :parser => :csv
       }
       definition = self.definition + [:sex]