gotascii-simple_importer 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.1 / 2008-06-11
+
+* tsv/csv now support an optional argument that indicates whether or not to ignore the header (first) line of the file
+
 == 1.0.0 / 2008-06-10
 
 * 1 major enhancement

data/lib/simple_importer.rb

@@ -13,30 +13,23 @@ module SimpleImporter
     file.close
   end
 
-  def csv(path, &block)
+  def csv(path, *args, &block)
     file(path) do |f|
       parsed_file = CSV::Reader.parse(f)
-      process_rows(parsed_file, &block)
-      # parsed_file.each do |row|
-      #   row.each {|v| v.trim! if v.respond_to? :trim! }
-      #   yield row if block_given?
-      # end
+      process_rows(parsed_file, !args.empty?, &block)
     end
   end
 
-  def tsv(path, &block)
+  def tsv(path, *args, &block)
     file(path) do |f|
       parsed_file = CSV::Reader.parse(f, "\t")
-      process_rows(parsed_file, &block)
-      # parsed_file.each do |row|
-      #   row.each {|v| v.trim! if v.respond_to? :trim! }
-      #   yield row if block_given?
-      # end
+      process_rows(parsed_file, !args.empty?, &block)
     end
   end
 
-  def process_rows(parsed_file, &block)
-    parsed_file.each do |row|
+  def process_rows(parsed_file, ignore_header, &block)
+    parsed_file.shift if ignore_header
+    parsed_file.each do |row|    
       row.each {|v| v.trim! if v.respond_to? :trim! }
       yield row if block_given?
     end
@@ -56,7 +49,7 @@ module SimpleImporter
   end
 
   # :stopdoc:
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/test/test_simple_importer.rb

@@ -6,13 +6,38 @@ end
 
 context "CrazyImporter" do
   specify "should parse a comma separated file" do
+    rows = []
     CrazyImporter.csv(File.join(File.dirname(__FILE__), 'csv.txt')) do |row|
       row.length.should.equal 3
+      rows << row
     end
+    rows.length.should.equal 2
   end
+
+  specify "should ignore header line in csv" do
+    rows = []
+    CrazyImporter.csv(File.join(File.dirname(__FILE__), 'csv.txt'), true) do |row|
+      row[0].should.equal "dude"
+      rows << row
+    end
+    rows.length.should.equal 1
+  end
+
   specify "should parse a tab separated file" do
+    rows = []
     CrazyImporter.tsv(File.join(File.dirname(__FILE__), 'tab.txt')) do |row|
       row.length.should.equal 4
+      rows << row
+    end
+    rows.length.should.equal 2
+  end
+
+  specify "should ignore header line in tsv" do
+    rows = []
+    CrazyImporter.tsv(File.join(File.dirname(__FILE__), 'tab.txt'), true) do |row|
+      row[0].should.equal "seriously"
+      rows << row
     end
+    rows.length.should.equal 1
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gotascii-simple_importer
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Justin Marney