simplecsv 0.0.2 → 0.1.0

data/CHANGELOG.txt

@@ -1,3 +1,11 @@
+2007-03-09 DATE Ken <itacchi@gmail.com>
+
+ * libcsv 1.0.0 support
+
+2007-03-02 DATE Ken <itacchi@gmail.com>
+
+ * modify rdoc
+
 2007-02-22 DATE Ken <itacchi@gmail.com>
 
  * SimpleCSV.write implemented

data/History.txt

@@ -1,3 +1,8 @@
+2007-03-09
+
+ * 0.1.0
+ * libcsv 1.0.0
+
 2007-02-23
 
  * 0.0.2 release

data/INSTALL.txt

@@ -2,9 +2,13 @@ SimpleCSV installation
 
 Requirements:
  - Ruby-1.8.x
- - libcsv 0.9.1 (you should install shared library)
+ - libcsv 1.0.0
 
 Installaion:
  $ ruby setup.rb config
  $ ruby setup.rb setup
  # ruby setup.rb install
+
+ or 
+
+ # gem install simplecsv

data/README.txt

@@ -6,6 +6,8 @@ What is:
 Requirements:
  - ruby-1.8.x: http://www.ruby-lang.org/
  - libcsv: http://sourceforge.net/projects/libcsv/
+  - 1.0.0 or later
+  - If you want to use libcsv 0.9.x, try to use simplecsv 0.0.2
 
 Installation:
  see INSTALL.*

data/TODO

@@ -0,0 +1,2 @@
+* stream input
+* OO I/F

data/ext/simplecsv/rb_simplecsv.c

@@ -6,9 +6,10 @@ VALUE eCSVError;
 VALUE eCSVParseError;
 VALUE eCSVNoMemError;
 VALUE eCSVTooBigError;
+VALUE eCSVInvalid;
 
 
-static void field_callback(char* s, size_t i) {
+static void field_callback(char* s, size_t i, void* data) {
     VALUE row, str;
 
     row = rb_ivar_get(mSimpleCSV, rb_intern("'row'"));
@@ -16,7 +17,7 @@ static void field_callback(char* s, size_t i) {
     rb_ary_push(row, str);
 }
 
-static void row_callback(char c) {
+static void row_callback(char c, void* data) {
     VALUE row;
 
     row = rb_ivar_get(mSimpleCSV, rb_intern("'row'"));
@@ -77,14 +78,14 @@ static void row_callback(char c) {
  *   SimpleCSV.parse(str, SimpleCSV::STRICT | SimpleCSV::REPALL_NL)
  *
  * ==== Parameters
- * [str] <code>String</code>: csv string.
- * [options] <code>Interger</code>: parser options. You can specify SimpleCSV::STRICT and/or SimpleCSVREPALL_NL.
- * [row] <code>Array</code> of <code>String</code>s: parsed data.
+ * [str] <code>String</code> : csv string.
+ * [options] <code>Interger</code> : parser options. You can specify SimpleCSV::STRICT and/or SimpleCSVREPALL_NL.
+ * [row] <code>Array</code> of <code>String</code>s : parsed data.
  *
  * ==== Exceptions
  * [TypeError] <i>options</i> isn't <code>Fixnum</code>/<code>nil</code>.
- * [eCSVError] failed to initialize csv parser.
- * [eCSVParseError] failed to parse.
+ * [SimpleCSV::Error] failed to initialize csv parser.
+ * [SimpleCSV::ParseError] failed to parse.
  * [LocalJumpError] You must call this method with block.
  */
 static VALUE simplecsv_parse(int argc, VALUE* argv, VALUE klass)
@@ -117,7 +118,7 @@ static VALUE simplecsv_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) != len) {
+    if (csv_parse(parser, StringValuePtr(str), len, field_callback, row_callback, (void*)klass) != len) {
         switch (csv_error(parser)) {
           case CSV_EPARSE:
               rb_raise(eCSVParseError, "error while parsing by malformed data");
@@ -128,12 +129,15 @@ static VALUE simplecsv_parse(int argc, VALUE* argv, VALUE klass)
           case CSV_ETOOBIG:
               rb_raise(eCSVTooBigError, "too large field data");
               break;
+          case CSV_EINVALID:
+              rb_raise(eCSVInvalid, csv_strerror(csv_error(parser)));
+              break;
           default:
             rb_raise(eCSVError, "failed to parse by unknown reason");
         }
     }
 
-    csv_fini(parser, field_callback, row_callback);
+    csv_fini(parser, field_callback, row_callback, (void*)klass);
     csv_free(parser);
 
     return Qnil;
@@ -156,10 +160,10 @@ static VALUE simplecsv_parse(int argc, VALUE* argv, VALUE klass)
  *   #=> """"
  *
  * ==== Parameters
- * [Array] <code>Array</code> of <code>String</code>s: source data
+ * [array] <code>Array</code> of <code>String</code>s: source data
  *
  * ==== Returns
- * [String] : quoted csv string.
+ * [csv-string] <code>String</code> : quoted csv string.
  *
  * ==== Exceptions
  * [TypeError] <i>array</i> isn't <code>Array</code> or each content of array isn't <code>String</code>.
@@ -207,6 +211,7 @@ void Init_simplecsv(void)
     eCSVParseError = rb_define_class_under(mSimpleCSV, "ParseError", rb_eStandardError);
     eCSVNoMemError = rb_define_class_under(mSimpleCSV, "NoMemoryError", rb_eStandardError);
     eCSVTooBigError = rb_define_class_under(mSimpleCSV, "TooBigError", rb_eStandardError);
+    eCSVInvalid = rb_define_class_under(mSimpleCSV, "InvalidError", rb_eStandardError);
 
     rb_define_const(mSimpleCSV, "STRICT", INT2FIX(CSV_STRICT));
     rb_define_const(mSimpleCSV, "REPALL_NL", INT2FIX(CSV_REPALL_NL));

data/lib/simplecsv/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: simplecsv
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-03-02 00:00:00 +09:00
+  version: 0.1.0
+date: 2007-03-09 00:00:00 +09:00
 summary: SimpleCSV privides simple csv reading/writing api.
 require_paths: 
 - lib