bamfcsv 0.1.3 → 0.1.4

data/ext/bamfcsv/bamfcsv_ext.c

@@ -1,62 +1,58 @@
 #include <stdlib.h>
 #include "bamfcsv_ext.h"
 
-struct s_Cell *alloc_cell(struct s_Row *row, struct s_Cell *prev_cell) {
+struct bamfcsv_Cell *bamfcsv_alloc_cell(struct bamfcsv_Row *row, struct bamfcsv_Cell *prev_cell) {
 
-  struct s_Cell *new_cell = malloc(sizeof(struct s_Cell));
+  struct bamfcsv_Cell *new_cell = malloc(sizeof(struct bamfcsv_Cell));
 
-  new_cell -> start = 0;
+  new_cell -> start = NULL;
   new_cell -> len = 0;
-  new_cell -> next_cell = 0;
+  new_cell -> next_cell = NULL;
   new_cell -> has_quotes = 0;
   row->cell_count++;
-  if (prev_cell) prev_cell->next_cell = new_cell;
+  if (prev_cell != NULL) prev_cell->next_cell = new_cell;
 
   return new_cell;
 
 }
 
-struct s_Row *alloc_row(struct s_Row *prev_row) {
+struct bamfcsv_Row *bamfcsv_alloc_row(struct bamfcsv_Row *prev_row) {
 
-  struct s_Row *new_row = malloc(sizeof(struct s_Row));
+  struct bamfcsv_Row *new_row = malloc(sizeof(struct bamfcsv_Row));
 
-  new_row -> next_row = 0;
+  new_row -> next_row = NULL;
   new_row -> cell_count = 0;
-  new_row -> first_cell = alloc_cell(new_row, 0);
-  if (prev_row) prev_row->next_row = new_row;
+  new_row -> first_cell = bamfcsv_alloc_cell(new_row, NULL);
+  if (prev_row != NULL) prev_row->next_row = new_row;
 
   return new_row;
 
 }
 
-void free_cell(struct s_Cell *cell) {
-
-  if (cell != 0) {
-    free_cell(cell->next_cell);
-    free(cell);
-  }
-
-}
-
-void free_row(struct s_Row *row) {
-
-  if (row != 0) {
-
-    free_row(row->next_row);
-    free_cell(row->first_cell);
-    free(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 build_matrix_from_pointer_tree(struct s_Row *first_row, int num_rows) {
+VALUE bamfcsv_build_matrix_from_pointer_tree(struct bamfcsv_Row *first_row, unsigned long num_rows) {
   VALUE matrix;
   VALUE row;
   VALUE new_string;
-  int i,j;
-  struct s_Row *cur_row;
-  struct s_Cell *cur_cell;
+  unsigned long i,j;
+  struct bamfcsv_Row *cur_row;
+  struct bamfcsv_Cell *cur_cell;
 
   cur_row = first_row;
   matrix = rb_ary_new2(num_rows);
@@ -90,7 +86,7 @@ VALUE build_matrix_from_pointer_tree(struct s_Row *first_row, int num_rows) {
   return matrix;
 }
 
-void finalize_cell(struct s_Cell *cell, char *cur, int quote_count) {
+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
@@ -99,14 +95,14 @@ void finalize_cell(struct s_Cell *cell, char *cur, int quote_count) {
   if (quote_count) cell->has_quotes = 1;
 }
 
-VALUE build_matrix(char *buf, int bufsize) {
+VALUE bamfcsv_build_matrix(char *buf, int bufsize) {
   int str_start = 0;
   int num_rows = 1;
   int quote_count = 0, quotes_matched = 1;
 
-  struct s_Row *first_row = alloc_row(0);
-  struct s_Row *cur_row = first_row;
-  struct s_Cell *cur_cell = cur_row->first_cell;
+  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;
@@ -136,8 +132,8 @@ VALUE build_matrix(char *buf, int bufsize) {
         if (quote_count && *(cur-1) != '"')
           rb_raise(BAMFCSV_MalformedCSVError_class, "Unclosed quoted field on line %d, cell %d.", num_rows, cur_row->cell_count);
 
-        finalize_cell(cur_cell, cur, quote_count);
-        cur_cell = alloc_cell(cur_row, cur_cell);
+        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;
 
@@ -146,8 +142,8 @@ VALUE build_matrix(char *buf, int bufsize) {
         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);
 
-        finalize_cell(cur_cell, cur, quote_count);
-        cur_row = alloc_row(cur_row);
+        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;
@@ -166,19 +162,19 @@ VALUE build_matrix(char *buf, int bufsize) {
   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);
 
-  finalize_cell(cur_cell, cur, quote_count);
+  bamfcsv_finalize_cell(cur_cell, cur, quote_count);
 
-  matrix = build_matrix_from_pointer_tree(first_row, num_rows);
+  matrix = bamfcsv_build_matrix_from_pointer_tree(first_row, num_rows);
 
-  free_row(first_row);
+  bamfcsv_free_rows(first_row);
 
   return matrix;
 
 }
 
-VALUE parse_string(VALUE self, VALUE string) {
+VALUE bamfcsv_parse_string(VALUE self, VALUE string) {
 
-  return build_matrix(RSTRING_PTR(string), NUM2INT(rb_str_length(string)));
+  return bamfcsv_build_matrix(RSTRING_PTR(string), NUM2INT(rb_str_length(string)));
 
 }
 
@@ -186,7 +182,7 @@ void Init_bamfcsv() {
 
   BAMFCSV_module = rb_define_module("BAMFCSV");
   VALUE bamfcsv_singleton_class = rb_singleton_class(BAMFCSV_module);
-  rb_define_private_method(bamfcsv_singleton_class, "__parse_string", parse_string, 1);
+  rb_define_private_method(bamfcsv_singleton_class, "__parse_string", bamfcsv_parse_string, 1);
 
   BAMFCSV_MalformedCSVError_class = rb_define_class_under(BAMFCSV_module, "MalformedCSVError", rb_eRuntimeError);
 }

data/ext/bamfcsv/bamfcsv_ext.h

@@ -6,17 +6,17 @@
 VALUE BAMFCSV_module;
 VALUE BAMFCSV_MalformedCSVError_class;
 
-struct s_Row {
-  struct s_Cell *first_cell;
-  struct s_Row *next_row;
-  int cell_count;
+struct bamfcsv_Row {
+  struct bamfcsv_Cell *first_cell;
+  struct bamfcsv_Row *next_row;
+  unsigned long cell_count;
 };
 
-struct s_Cell {
+struct bamfcsv_Cell {
   char *start;
   int len;
   int has_quotes;
-  struct s_Cell *next_cell;
+  struct bamfcsv_Cell *next_cell;
 };
 
 void Init_bamfcsv();

data/lib/bamfcsv/version.rb

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

metadata

@@ -1,63 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bamfcsv
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Jon Distad
 - Alex Redington
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 -04:00
+date: 2011-04-15 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &23846180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *23846180
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &23845680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *23845680
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &23845220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *23845220
 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
@@ -85,39 +82,27 @@ 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.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: BAMF!!! Your csv is parsed.
-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
+test_files: []