simplecsv 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,8 @@
+2007-04-01
+
+ * 0.1.4
+ * add SimpleCSV.parse_file and SimpleCSV#parse_file
+
 2007-03-18
 
  * 0.1.3

data/Manifest.txt

@@ -11,6 +11,10 @@ ext/simplecsv/extconf.rb
 ext/simplecsv/rb_simplecsv.c
 ext/simplecsv/rb_simplecsv.h
 lib/simplecsv.rb
+lib/simplecsv/extension.rb
 lib/simplecsv/version.rb
 setup.rb
+test/data/01.csv
+test/data/02.csv
+test/data/03.csv
 test/simplecsv/simplecsv_test.rb

data/README.txt

@@ -1,4 +1,4 @@
-SimpleCSV 0.1.3 README
+SimpleCSV 0.1.4 README
 
 What is:
  SimpleCSV provides simple api to read/write csv.

data/Rakefile

@@ -52,7 +52,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.extra_deps     - An array of rubygem dependencies.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 
-  p.rdoc_pattern = /^(bin|ext)|txt$/
+  p.rdoc_pattern = /^(lib|bin|ext)|txt$/
   p.spec_extras = {
     :extensions => ['ext/simplecsv/extconf.rb']
   }

data/lib/simplecsv/extension.rb

@@ -0,0 +1,23 @@
+class SimpleCSV
+  # All methods of module SimpleCSV::Extension are 
+  # extended & included by SimpleCSV.
+  # For example, you can use SimpleCSV.parse_file SimpleCSV#parse_file.
+  module Extension
+    # Parse csv file.
+    # See SimpleCSV.parse for details. 
+    # 
+    # ==== Parameters
+    # [file_name] <code>String</code> : csv file name.
+    # [options] <code>Integer</code> : parser options.
+    # [row] <code>Array</code> of <code>String</code>s : parsed data.
+    def parse_file(file_name, options = nil, &block)
+      File.foreach(file_name, options) do |line|
+        parse(line, &block)
+      end
+    end
+  end
+
+  extend(Extension)
+  include(Extension)
+end
+

data/lib/simplecsv/version.rb

@@ -1,8 +1,8 @@
-class SimpleCSV #:nodoc:
+class SimpleCSV
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/data/01.csv

@@ -0,0 +1 @@
+0, 1, 2, 3

data/test/data/02.csv

@@ -0,0 +1,2 @@
+ab, cde, fg
+hijk, lmn

data/test/data/03.csv

@@ -0,0 +1,5 @@
+1
+
+
+
+5

data/test/simplecsv/simplecsv_test.rb

@@ -1,4 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', 'ext', 'simplecsv'))
+$:.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 
 require 'simplecsv'
 require 'test/unit'
@@ -368,4 +369,66 @@ _CSV_
       assert_equal ["L", "c"], row
     end
   end
+
+  class DefaultParser < SimpleCSV
+    def initialize
+      @row = []
+    end
+
+    def on_field(str, pr)
+      @row << str
+    end
+
+    def on_row(str, pr)
+      pr.call(@row)
+      @row = []
+    end
+  end
+
+  def test_parse_file
+    csv_file = File.join(data_path, '01.csv')
+    SimpleCSV.parse_file(csv_file) do |row|
+      assert_equal ["0", "1", "2", "3"], row
+    end
+
+    simplecsv = SimpleCSV.new
+    simplecsv.parse_file(csv_file) do |row|
+      assert_equal ["0", "1", "2", "3"], row
+    end
+
+    DefaultParser.parse_file(csv_file) do |row|
+      assert_equal ["0", "1", "2", "3"], row
+    end
+
+    csv_file = File.join(data_path, '02.csv')
+    rows = []
+    SimpleCSV.parse_file(csv_file) do |row|
+      rows << row
+    end
+    assert_equal [ ["ab", "cde", "fg"], ["hijk", "lmn"] ], rows
+
+    rows = []
+    DefaultParser.parse_file(csv_file) do |row|
+      rows << row
+    end
+    assert_equal [ ["ab", "cde", "fg"], ["hijk", "lmn"] ], rows
+
+    csv_file = File.join(data_path, '03.csv')
+    rows = []
+    SimpleCSV.parse_file(csv_file) do |row|
+      rows << row
+    end
+    assert_equal [ ["1"], ["5"] ], rows
+
+    rows = []
+    DefaultParser.parse_file(csv_file) do |row|
+      rows << row
+    end
+    assert_equal [ ["1"], ["5"] ], rows
+  end
+
+  private
+  def data_path
+    File.join(File.dirname(__FILE__), '..', 'data')
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: simplecsv
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-03-18 00:00:00 +09:00
+  version: 0.1.4
+date: 2007-04-01 00:00:00 +09:00
 summary: SimpleCSV privides simple csv reading/writing api.
 require_paths: 
 - lib
@@ -42,8 +42,12 @@ files:
 - ext/simplecsv/rb_simplecsv.c
 - ext/simplecsv/rb_simplecsv.h
 - lib/simplecsv.rb
+- lib/simplecsv/extension.rb
 - lib/simplecsv/version.rb
 - setup.rb
+- test/data/01.csv
+- test/data/02.csv
+- test/data/03.csv
 - test/simplecsv/simplecsv_test.rb
 test_files: 
 - test/simplecsv/simplecsv_test.rb