simplecsv 0.1.2 → 0.1.3

data/CHANGELOG.txt

@@ -1,5 +1,6 @@
 2007-03-18 DATE Ken <itacchi@gmail.com>
 
+ * add SimpleCSV#on_field and SimpleCSV#on_row for parser cutomizing
  * fix bug: options parameter of SimpleCSV.new do not effect SimpleCSV#parser
  * implements SimpleCSV#options and SimpleCSV#options=
 

data/History.txt

@@ -1,3 +1,8 @@
+2007-03-18
+
+ * 0.1.3
+ * add new feature that can customize parsing behavior on subclass
+
 2007-03-18
 
  * 0.1.2

data/README.txt

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

data/TODO

@@ -1,4 +1,3 @@
 * stream input
 * refactoring (parse method)
-* subclass sutomizing by template method pattern
 * convenience method such as parse_file

data/ext/simplecsv/rb_simplecsv.c

@@ -33,6 +33,7 @@ struct csv_parser_object {
     }\
 }
 
+
 static void free_parser_object(struct csv_parser_object* parser_object)
 {
     if (parser_object){
@@ -44,7 +45,7 @@ static void free_parser_object(struct csv_parser_object* parser_object)
 }
 
 
-static void field_callback(char* s, size_t i, void* obj)
+static void default_field_callback(char* s, size_t i, void* obj)
 {
     VALUE row, str;
 
@@ -53,7 +54,8 @@ static void field_callback(char* s, size_t i, void* obj)
     rb_ary_push(row, str);
 }
 
-static void row_callback(char c, void* obj)
+
+static void default_row_callback(char c, void* obj)
 {
     VALUE row;
 
@@ -63,6 +65,32 @@ static void row_callback(char c, void* obj)
 }
 
 
+static void field_callback(char* s, size_t i, void* obj)
+{
+    VALUE str, len, proc;
+
+    str = rb_str_new(s, i);
+    proc = rb_ivar_get((VALUE)obj, rb_intern("'proc'"));
+
+    rb_funcall((VALUE)obj, rb_intern("on_field"), 2, str, proc);
+}
+
+
+static void row_callback(char c, void* obj)
+{
+    VALUE str, proc;
+    char row_delimiter[2];
+
+    row_delimiter[0] = c;
+    row_delimiter[1] = 0;
+
+    str = rb_str_new2(row_delimiter);
+    proc = rb_ivar_get((VALUE)obj, rb_intern("'proc'"));
+
+    rb_funcall((VALUE)obj, rb_intern("on_row"), 2, str, proc);
+}
+
+
 /*
  * call-seq:
  *   parse(str, options = nil){|row| ...}
@@ -144,7 +172,7 @@ static VALUE simplecsv_s_parse(int argc, VALUE* argv, VALUE klass)
     rb_ivar_set(klass, rb_intern("'row'"), rb_ary_new());
 
     len = RSTRING(str)->len;
-    if (csv_parse(parser, StringValuePtr(str), len, field_callback, row_callback, (void*)klass) != len) {
+    if (csv_parse(parser, StringValuePtr(str), len, default_field_callback, default_row_callback, (void*)klass) != len) {
         switch (csv_error(parser)) {
             case CSV_EPARSE:
                 rb_raise(eCSVParseError, "error while parsing by malformed data");
@@ -163,7 +191,7 @@ static VALUE simplecsv_s_parse(int argc, VALUE* argv, VALUE klass)
         }
     }
 
-    csv_fini(parser, field_callback, row_callback, (void*)klass);
+    csv_fini(parser, default_field_callback, default_row_callback, (void*)klass);
     csv_free(parser);
 
     return Qnil;
@@ -343,14 +371,23 @@ static VALUE simplecsv_set_options(VALUE self, VALUE opts)
  * [SimpleCSV::ParseError] failed to parse.
  * [LocalJumpError] You must call this method with block.
  */
-static VALUE simplecsv_parse(VALUE self, VALUE str)
+static VALUE simplecsv_parse(int argc, VALUE* argv, VALUE self)
 {
+    VALUE str, proc;
     struct csv_parser_object* parser_object;
     struct csv_parser* parser;
     int len;
 
+    rb_scan_args(argc, argv, "1&", &str, &proc);
+
     Check_Type(str, T_STRING);
 
+    if (CLASS_OF(self) == cSimpleCSV) {
+        rb_need_block();
+    }
+
+    rb_ivar_set(self, rb_intern("'proc'"), proc);
+
     Get_Parser(self, parser_object, parser);
 
     len = RSTRING(str)->len;
@@ -380,6 +417,53 @@ static VALUE simplecsv_parse(VALUE self, VALUE str)
 
 
 
+/*
+ * call-seq:
+ *   on_field(str, pr)
+ *
+ * This method is called when processing each field.
+ * You can write "pr.call(some_val)" for pass value to block of `parse' method.
+ *
+ * ==== Parameters
+ * [str] <code>String</code> : field text.
+ * [pr] <code>Proc</code> : a block, passing by `parse' method
+ */
+static VALUE simplecsv_on_field(VALUE self, VALUE str, VALUE proc)
+{
+    VALUE row;
+
+    row = rb_ivar_get(self, rb_intern("'row'"));
+    rb_ary_push(row, str);
+
+    return Qnil;
+}
+
+
+
+/*
+ * call-seq:
+ *   on_row(str, pr)
+ *
+ * This method is called when processing each row.
+ * You can write "pr.call(some_val)" for pass value to block of `parse' method.
+ *
+ * ==== Parameters
+ * [str] <code>String</code> : row delimitor (\n).
+ * [pr] <code>Proc</code> : a block, passing by `parse' method
+ */
+static VALUE simplecsv_on_row(VALUE self, VALUE str, VALUE proc)
+{
+    VALUE row;
+
+    row = rb_ivar_get(self, rb_intern("'row'"));
+    rb_funcall(proc, rb_intern("call"), 1, row);
+    rb_ivar_set(self, rb_intern("'row'"), rb_ary_new());
+
+    return Qnil;
+}
+
+
+
 void Init_simplecsv(void)
 {
     cSimpleCSV = rb_define_class("SimpleCSV", rb_cObject);
@@ -399,6 +483,8 @@ void Init_simplecsv(void)
     rb_define_method(cSimpleCSV, "initialize", simplecsv_initialize, -1);
     rb_define_method(cSimpleCSV, "options", simplecsv_get_options, 0);
     rb_define_method(cSimpleCSV, "options=", simplecsv_set_options, 1);
-    rb_define_method(cSimpleCSV, "parse", simplecsv_parse, 1);
+    rb_define_method(cSimpleCSV, "parse", simplecsv_parse, -1);
     rb_define_method(cSimpleCSV, "write", simplecsv_s_write, 1);
+    rb_define_method(cSimpleCSV, "on_field", simplecsv_on_field, 2);
+    rb_define_method(cSimpleCSV, "on_row", simplecsv_on_row, 2);
 }

data/lib/simplecsv/version.rb

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

data/test/simplecsv/simplecsv_test.rb

@@ -194,7 +194,9 @@ _CSV_
       simplecsv.parse(''){}
     end
 
-    assert_nil simplecsv.parse('')
+    assert_raise(LocalJumpError) do
+      assert_nil simplecsv.parse('')
+    end
 
     simplecsv.parse(<<_CSV_) do |row|
 test
@@ -285,6 +287,16 @@ _CSV_
 _CSV_
     end
 
+    rows = 0
+    simplecsv = SimpleCSV.new(SimpleCSV::REPALL_NL)
+    simplecsv.parse(<<_CSV_) do |row|
+
+
+
+_CSV_
+      rows += 1
+    end
+    assert_equal 3, rows
   end
 
   def test_write
@@ -311,4 +323,49 @@ _CSV_
       simplecsv.write([1, 2, 3])
     end
   end
+
+  def test_options
+    simplecsv = SimpleCSV.new
+    assert_equal 0, simplecsv.options
+
+    simplecsv = SimpleCSV.new(SimpleCSV::STRICT)
+    assert_equal SimpleCSV::STRICT, simplecsv.options
+
+    simplecsv = SimpleCSV.new(SimpleCSV::REPALL_NL)
+    assert_equal SimpleCSV::REPALL_NL, simplecsv.options
+
+    simplecsv = SimpleCSV.new(SimpleCSV::STRICT | SimpleCSV::REPALL_NL)
+    assert_equal SimpleCSV::STRICT | SimpleCSV::REPALL_NL, simplecsv.options
+
+    simplecsv = SimpleCSV.new
+    simplecsv.options = SimpleCSV::STRICT
+    assert_equal SimpleCSV::STRICT, simplecsv.options
+
+    simplecsv = SimpleCSV.new(SimpleCSV::STRICT)
+    simplecsv.options = nil
+    assert_equal 0, simplecsv.options
+  end
+
+  class FirstLetter < SimpleCSV
+    def initialize
+      @ary = []
+    end
+
+    def on_field(str, pr)
+      @ary << str[0, 1]
+    end
+
+    def on_row(str, pr)
+      pr.call(@ary)
+      @ary = []
+    end
+  end
+
+  def test_subclass_customizing
+    FirstLetter.new.parse(<<_CSV_) do |row|
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+_CSV_
+      assert_equal ["L", "c"], row
+    end
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: simplecsv
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 date: 2007-03-18 00:00:00 +09:00
 summary: SimpleCSV privides simple csv reading/writing api.
 require_paths: