bamfcsv 0.1.4 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bamfcsv (0.1.3)
+    bamfcsv (0.1.4)
 
 GEM
   remote: http://rubygems.org/

data/ext/bamfcsv/bamfcsv_ext.c

@@ -1,124 +1,49 @@
+#include <ruby/ruby.h>
 #include <stdlib.h>
-#include "bamfcsv_ext.h"
+#include <stdio.h>
 
-struct bamfcsv_Cell *bamfcsv_alloc_cell(struct bamfcsv_Row *row, struct bamfcsv_Cell *prev_cell) {
+VALUE BAMFCSV_module;
+VALUE BAMFCSV_MalformedCSVError_class;
 
-  struct bamfcsv_Cell *new_cell = malloc(sizeof(struct bamfcsv_Cell));
+VALUE bamfcsv_finalize_cell(char *cell_start, char *cell_end, int quote_count) {
+  if (*cell_end == '\r')
+    cell_end--;
 
-  new_cell -> start = NULL;
-  new_cell -> len = 0;
-  new_cell -> next_cell = NULL;
-  new_cell -> has_quotes = 0;
-  row->cell_count++;
-  if (prev_cell != NULL) prev_cell->next_cell = new_cell;
+  if (cell_end < cell_start)
+    return Qnil;
 
-  return new_cell;
-
-}
-
-struct bamfcsv_Row *bamfcsv_alloc_row(struct bamfcsv_Row *prev_row) {
-
-  struct bamfcsv_Row *new_row = malloc(sizeof(struct bamfcsv_Row));
-
-  new_row -> next_row = NULL;
-  new_row -> cell_count = 0;
-  new_row -> first_cell = bamfcsv_alloc_cell(new_row, NULL);
-  if (prev_row != NULL) prev_row->next_row = new_row;
-
-  return new_row;
-
-}
-
-void bamfcsv_free_rows(struct bamfcsv_Row *row) {
-
-  struct bamfcsv_Row *cur_row = row;
-  while (cur_row != NULL) {
-    struct bamfcsv_Cell *cur_cell = cur_row->first_cell;
-    while (cur_cell != NULL) {
-      struct bamfcsv_Cell *next_cell = cur_cell->next_cell;
-      free(cur_cell);
-      cur_cell = next_cell;
-    }
-    struct bamfcsv_Row *next_row = cur_row->next_row;
-    free(cur_row);
-    cur_row = next_row;
-  }
-
-}
-
-VALUE bamfcsv_build_matrix_from_pointer_tree(struct bamfcsv_Row *first_row, unsigned long num_rows) {
-  VALUE matrix;
-  VALUE row;
-  VALUE new_string;
-  unsigned long i,j;
-  struct bamfcsv_Row *cur_row;
-  struct bamfcsv_Cell *cur_cell;
-
-  cur_row = first_row;
-  matrix = rb_ary_new2(num_rows);
-
-  ID gsub = rb_intern("gsub!");
-  VALUE dquote = rb_str_new2("\"\""), quote = rb_str_new2("\"");
-
-  for (i = 0; i < num_rows; i++) {
-
-    cur_cell = cur_row->first_cell;
-    row = rb_ary_new2(cur_row->cell_count);
-    rb_ary_store(matrix,i,row);
-    if (cur_row->cell_count > 1 || cur_cell->len) {
-      for (j = 0; j < cur_row->cell_count; j++) {
-        if (cur_cell->has_quotes) {
-          new_string = rb_str_new(cur_cell->start+1, cur_cell->len-2);
-          rb_funcall(new_string, gsub, 2, dquote, quote);
-        } else {
-          if (cur_cell->len)
-            new_string = rb_str_new(cur_cell->start, cur_cell->len);
-          else
-            new_string = Qnil; /* Empty, unquoted cells are nil, for default ruby CSV compatibility */
-        }
-        rb_ary_store(row, j, new_string);
-        cur_cell = cur_cell->next_cell;
-      }
-    }
-    cur_row = cur_row->next_row;
+  if (quote_count) {
+    cell_start++;
+    cell_end--;
   }
 
-  return matrix;
-}
+  VALUE cell_str = rb_str_new(cell_start, cell_end-cell_start+1);
 
-void bamfcsv_finalize_cell(struct bamfcsv_Cell *cell, char *cur, int quote_count) {
-  if (*(cur-1) == '\r') 
-    cell->len = (int)(cur-(cell->start)-1);
-  else
-    cell->len = (int)(cur-(cell->start));
-
-  if (quote_count) cell->has_quotes = 1;
+  return cell_str;
 }
 
-VALUE bamfcsv_build_matrix(char *buf, int bufsize) {
-  int str_start = 0;
-  int num_rows = 1;
+VALUE bamfcsv_build_matrix(char *buf, unsigned long bufsize) {
+  unsigned long num_rows = 1, cell_count = 1;
   int quote_count = 0, quotes_matched = 1;
 
-  struct bamfcsv_Row *first_row = bamfcsv_alloc_row(NULL);
-  struct bamfcsv_Row *cur_row = first_row;
-  struct bamfcsv_Cell *cur_cell = cur_row->first_cell;
-  cur_cell->start = buf;
-
-  VALUE matrix;
+  VALUE matrix = rb_ary_new();
+  VALUE row = rb_ary_new();
 
-  char *cur;
+  char *cur = buf, *cell_start = buf;
 
   if (bufsize > 0 && *(buf+bufsize-1) == '\n') {
     *(buf+bufsize-1) = 0;
     --bufsize;
   }
+
+  VALUE dbl_dquote = rb_str_new("\"\"", 2), dquote = rb_str_new("\"", 1);
+  ID gsub_bang = rb_intern("gsub!");
   
-  for (cur = buf; cur < buf+bufsize; cur++) {
+  for (; cur < buf+bufsize; cur++) {
 
     if (*cur == '"') {
-      if (0 == quote_count && cur_cell->start != cur) /* Quotes begin past opening of cell */
-        rb_raise(BAMFCSV_MalformedCSVError_class, "Illegal quoting on line %d, cell %d: Quoted cell must open with '\"'", num_rows, cur_row->cell_count);
+      if (0 == quote_count && cell_start != cur) /* Quotes begin past opening of cell */
+        rb_raise(BAMFCSV_MalformedCSVError_class, "Illegal quoting on line %lu, cell %lu: Quoted cell must open with '\"'", num_rows, cell_count);
       else
         ++quote_count;
     }
@@ -130,43 +55,56 @@ VALUE bamfcsv_build_matrix(char *buf, int bufsize) {
       if (*cur == ',') {
         
         if (quote_count && *(cur-1) != '"')
-          rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %d, cell %d.", num_rows, cur_row->cell_count);
+          rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %lu, cell %lu.", num_rows, cell_count);
+
+        VALUE cell_str = bamfcsv_finalize_cell(cell_start, cur-1, quote_count);
+        if (quote_count)
+          rb_funcall(cell_str, gsub_bang, 2, dbl_dquote, dquote);
+
+        rb_ary_push(row, cell_str);
+        cell_start = cur+1;
 
-        bamfcsv_finalize_cell(cur_cell, cur, quote_count);
-        cur_cell = bamfcsv_alloc_cell(cur_row, cur_cell);
-        cur_cell->start = cur+1;
         quote_count = 0;
+        ++cell_count;
 
       } else if (*cur == '\n') {
         
         if (quote_count && !(*(cur-1) == '"' || *(cur-1) == '\r' && *(cur-2) == '"'))
-            rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %d, cell %d: EOL", num_rows, cur_row->cell_count);
-
-        bamfcsv_finalize_cell(cur_cell, cur, quote_count);
-        cur_row = bamfcsv_alloc_row(cur_row);
-        cur_cell = cur_row->first_cell;
-        cur_cell->start = cur+1;
-        quote_count = 0;
+            rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %lu, cell %lu: EOL", num_rows, cell_count);
+
+        VALUE cell_str = bamfcsv_finalize_cell(cell_start, cur-1, quote_count);
+        if (quote_count)
+          rb_funcall(cell_str, gsub_bang, 2, dbl_dquote, dquote);
+        /* Completely blank lines don't even get a nil. This matches CSV's behavior. */
+        if (cell_count > 1 || cell_str != Qnil)
+          rb_ary_push(row, cell_str);
+        rb_ary_push(matrix, row);
+        row = rb_ary_new();
+        cell_start = cur+1;
         
-        num_rows++;
+        quote_count = 0;
+        ++num_rows;
+        cell_count = 0;
 
       } else if (quote_count && *cur != '\r' && *cur != '"')
-        rb_raise(BAMFCSV_MalformedCSVError_class, "Illegal quoting on line %d, cell %d", num_rows, cur_row->cell_count);
+        rb_raise(BAMFCSV_MalformedCSVError_class, "Illegal quoting on line %lu, cell %lu", num_rows, cell_count);
       
     }
 
   }
 
   if (!quotes_matched) /* Reached EOF without matching quotes */
-    rb_raise(BAMFCSV_MalformedCSVError_class, "Illegal quoting on line %d, cell %d: File ends without closing '\"'", num_rows, cur_row->cell_count);
+    rb_raise(BAMFCSV_MalformedCSVError_class, "Illegal quoting on line %lu, cell %lu: File ends without closing '\"'", num_rows, cell_count);
   else if (quote_count && *(cur-1) != '"') /* Quotes closed before end of final cell */
-    rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %d, cell %d: EOF", num_rows, cur_row->cell_count);
-
-  bamfcsv_finalize_cell(cur_cell, cur, quote_count);
-
-  matrix = bamfcsv_build_matrix_from_pointer_tree(first_row, num_rows);
+    rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %lu, cell %lu: EOF", num_rows, cell_count);
 
-  bamfcsv_free_rows(first_row);
+  VALUE cell_str = bamfcsv_finalize_cell(cell_start, cur-1, quote_count);
+  if (quote_count)
+    rb_funcall(cell_str, gsub_bang, 2, dbl_dquote, dquote);
+  /* Completely blank lines don't even get a nil. This matches CSV's behavior. */
+  if (cell_count > 1 || cell_str != Qnil)
+    rb_ary_push(row, cell_str);
+  rb_ary_push(matrix, row);
 
   return matrix;
 
@@ -174,7 +112,7 @@ VALUE bamfcsv_build_matrix(char *buf, int bufsize) {
 
 VALUE bamfcsv_parse_string(VALUE self, VALUE string) {
 
-  return bamfcsv_build_matrix(RSTRING_PTR(string), NUM2INT(rb_str_length(string)));
+  return bamfcsv_build_matrix(RSTRING_PTR(string), NUM2ULONG(rb_str_length(string)));
 
 }
 

data/lib/bamfcsv/version.rb

@@ -1,3 +1,3 @@
 module BAMFCSV
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,60 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bamfcsv
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Jon Distad
 - Alex Redington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-15 00:00:00.000000000 -04:00
+
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &23846180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
-  prerelease: false
-  version_requirements: *23846180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: fuubar
-  requirement: &23845680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.2
   type: :development
-  prerelease: false
-  version_requirements: *23845680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &23845220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.7.1
   type: :development
-  prerelease: false
-  version_requirements: *23845220
+  version_requirements: *id003
 description: BAMFCSV parses csv like a BAMF. BAMF!!
-email:
+email: 
 - jon@thinkrelevance.com
 - lovemachine@thinkrelevance.com
 executables: []
-extensions:
+
+extensions: 
 - ext/bamfcsv/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -63,7 +66,6 @@ files:
 - Rakefile
 - bamfcsv.gemspec
 - ext/bamfcsv/bamfcsv_ext.c
-- ext/bamfcsv/bamfcsv_ext.h
 - ext/bamfcsv/extconf.rb
 - lib/bamfcsv.rb
 - lib/bamfcsv/table.rb
@@ -82,27 +84,39 @@ files:
 has_rdoc: true
 homepage: https://github.com/jondistad/bamfcsv
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: bamfcsv
-rubygems_version: 1.6.1
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: BAMF!!! Your csv is parsed.
-test_files: []
+test_files: 
+- spec/fixtures/bamf-comma-comma.csv
+- spec/fixtures/double-quotes.csv
+- spec/fixtures/empty.csv
+- spec/fixtures/escapes.csv
+- spec/fixtures/one-column.csv
+- spec/fixtures/terminated-with-cr.csv
+- spec/fixtures/test.csv
+- spec/lib/bamfcsv_spec.rb
+- spec/spec_helper.rb

data/ext/bamfcsv/bamfcsv_ext.h

@@ -1,24 +0,0 @@
-#ifndef _BAMFCSV_EXT_H
-#define _BAMFCSV_EXT_H
-
-#include <ruby/ruby.h>
-
-VALUE BAMFCSV_module;
-VALUE BAMFCSV_MalformedCSVError_class;
-
-struct bamfcsv_Row {
-  struct bamfcsv_Cell *first_cell;
-  struct bamfcsv_Row *next_row;
-  unsigned long cell_count;
-};
-
-struct bamfcsv_Cell {
-  char *start;
-  int len;
-  int has_quotes;
-  struct bamfcsv_Cell *next_cell;
-};
-
-void Init_bamfcsv();
-
-#endif