Merge pull request #13 from theodi/feature-make-sure-streaming-works

Make sure streaming works
frictionlessdata · Oct 12, 2016 · cc87818 · cc87818
2 parents 8487aee + f52c874
commit cc87818
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/jsontableschema/infer.rb b/lib/jsontableschema/infer.rb
@@ -40,6 +40,7 @@ def infer!
       type_matches = []
       @rows.each_with_index do |row, i|
         break if @row_limit && i > @row_limit
+        row = row.fields if row.class == CSV::Row
 
         row_length = row.count
         headers_length = @headers.count

diff --git a/lib/jsontableschema/table.rb b/lib/jsontableschema/table.rb
@@ -14,8 +14,8 @@ def initialize(csv, descriptor, opts = {})
     end
 
     def parse_csv(csv)
-      csv_string = csv.is_a?(Array) ? array_to_csv(csv) : open(csv).read
-      CSV.parse(csv_string, csv_options)
+      csv = csv.is_a?(Array) ? StringIO.new(array_to_csv csv) : open(csv)
+      CSV.new(csv, csv_options)
     end
 
     def csv_options
@@ -41,7 +41,9 @@ def coverted_to_hash(headers, array)
       end
 
       def infer_schema(csv)
-        inferer = JsonTableSchema::Infer.new(csv.headers, csv.to_a)
+        headers = csv.first.to_h.keys
+        csv.rewind
+        inferer = JsonTableSchema::Infer.new(headers, csv)
         inferer.schema
       end
 

diff --git a/spec/table_spec.rb b/spec/table_spec.rb
@@ -121,7 +121,7 @@
           "name"=>"id",
           "title"=>"",
           "description"=>"",
-          "type"=>"string",
+          "type"=>"integer",
           "format"=>"default"
         },
         {