fasterer-csv 0.0.8 → 0.0.9

data/lib/fasterer_csv.rb

@@ -182,28 +182,26 @@ module FastererCSV
     end
   end
 
-  class NumConverter < Array
+  class NumericConversion < Array
 
     def initialize
-      @int = true
-      @float = true
+      @int = @float = true
       @dot = false
     end
 
     def clear
-      @int = true
-      @float = true
+      @int = @float = true
       @dot = false
       super
     end
 
     def <<(ch)
-      if (ch > ?9 || ch < ?0) && ch != ?.
-        @int = false
-        @float = false
+      if ch == ?-
+        @float = @int = size == 0
+      elsif (ch > ?9 || ch < ?0) && ch != ?.
+        @int = @float = false
       elsif ch == ?. && @dot
-        @int = false
-        @float = false
+        @int = @float = false
       elsif ch == ?.
         @int = false
         @dot = true
@@ -224,7 +222,7 @@ module FastererCSV
 
   end
 
-  class NoConverter < Array
+  class NoConversion < Array
 
     def <<(ch)
       super(ch.chr)
@@ -234,19 +232,23 @@ module FastererCSV
 
   class << self
 
-    def headers(file, quot = '~', sep = ',', fail_on_malformed = true, column = NumConverter.new, &block)
+    def headers(file, quot = '~', sep = ',', fail_on_malformed = true, column = NumericConversion.new, &block)
       parse_headers(File.open(file, 'r') {|io| io.gets }, quot, sep, fail_on_malformed, column, &block)
     end
 
-    def read(file, quot = '~', sep = ',', fail_on_malformed = true, column = NumConverter.new, &block)
+    def read(file, quot = '~', sep = ',', fail_on_malformed = true, column = NumericConversion.new, &block)
+      parse(File.open(file, 'r') { |io| io.sysread(File.size(file)) }, quot, sep, fail_on_malformed, column, &block)
+    end
+
+    def read_plain(file, quot = '~', sep = ',', fail_on_malformed = true, column = NoConversion.new, &block)
       parse(File.open(file, 'r') { |io| io.sysread(File.size(file)) }, quot, sep, fail_on_malformed, column, &block)
     end
 
-    def parse_headers(data, quot = '~', sep = ',', fail_on_malformed = true, column = NumConverter.new, &block)
+    def parse_headers(data, quot = '~', sep = ',', fail_on_malformed = true, column = NumericConversion.new, &block)
       parse(data, quot, sep, fail_on_malformed, column, &block).headers
     end
 
-    def parse(data, quot = '~', sep = ',', fail_on_malformed = true, column = NumConverter.new)
+    def parse(data, quot = '~', sep = ',', fail_on_malformed = true, column = NumericConversion.new)
       q, s, row, inquot, clean, maybe, table, field, endline = quot[0], sep[0], [], false, true, false, nil, true, false
 
       data.each_byte do |c|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fasterer-csv
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Mason
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -07:00
+date: 2010-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: []