quandl_format 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d570d30030c6efc98ca36991c9f7bd696ef1b06
-  data.tar.gz: a3055d3a66e3189abdee26cc3cd30454c78919aa
+  metadata.gz: 5f454dd17f3f3d71afa6ecda800df054fcc52f27
+  data.tar.gz: 04b4dab5f31e57b2f7c6e6af810e952fe25524ae
 SHA512:
-  metadata.gz: 65deb544f8ff59f3cb623cfa0672319c48b39a5243e20837d196ce8057eb3523a7908d4bbd801a14b796de6d47ba88a7c09e82c97a507357774018c7b6a92d1a
-  data.tar.gz: cd66e027d2cbfa58b0e6e23b1b1369891101053715fe046de229c4202f8ac5a39d6737629a4954d97eba5bf1d23f217345cc4a071b30cfeafb4ed896416dcab9
+  metadata.gz: 75af0ccda893f85cc46719d1fadf2ddfa65b6abef92075ecddcc098ba4f7c1ed7ea1ba5b031223f523921293639b5d313ace67ec55a28bf0c132bad20f11d78e
+  data.tar.gz: cb56897d0c1ec4b625708a85917ecc88efba46d6576d4576812679822b466d436736542944890303d44741f1f04f502da709adce8ecbcff45b0a9509326b8a2f

data/UPGRADE.md

@@ -1,3 +1,8 @@
+## 0.1.7
+
+* Accept tabular data
+
+
 ## 0.1.6
 
 * refactor errors to include specific line numbers

data/lib/quandl/format/dataset/load.rb

@@ -60,7 +60,7 @@ class Quandl::Format::Dataset::Load
         # we cant continue unless attributes are present
         next if node[:attributes].blank?
         # parse data as csv
-        node[:attributes][:data] = CSV.parse(node[:data])
+        node[:attributes][:data] = Quandl::Data::Format.csv_to_array(node[:data])
         # onwards
         output << node
       end

data/lib/quandl/format/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Format
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end
 end

data/spec/fixtures/data/tabular.qdf

@@ -0,0 +1,8 @@
+code: TABULAR
+name: This is tabular
+description: This data is tabular!
+-
+Date	First	Second	Third	Fourth
+2013	10	20	30	40
+2012	20	30	40	50
+2011	30	40	50	60

data/spec/lib/quandl/format/dataset/{errors_spec.rb → load/errors_spec.rb}

@@ -5,11 +5,11 @@ describe Quandl::Format::Dataset do
   expected_errors = [
     { file: 'invalid_data',       error: /Date/ },
     { file: 'unknown_attribute',  error: /this_attribute_does_not_exist/ },
-    { file: 'mismatched_columns', error: /column_names had 4 columns/ },
-    { file: 'mismatched_rows',    error: /had 3 columns/ },
+    { file: 'mismatched_columns', error: /Expected 4 but found 5/ },
+    { file: 'mismatched_rows',    error: /Expected 3 but found 4/ },
     { file: 'invalid_yaml',       error: /could not find expected ':'/ },
     { file: 'missing_dashes',     error: /Attribute parse error at line 6 column 1/ },
-    { file: 'missing_dashes',     error: /Data delimiter '-' is missing/ },
+    { file: 'missing_dashes',     error: /Did you forget to delimit the meta data section/ },
   ]
   # run each expectation
   expected_errors.each do |pair|

data/spec/lib/quandl/format/dataset/{valid_data_spec.rb → load/valid_spec.rb}

@@ -40,4 +40,22 @@ describe Quandl::Format::Dataset do
     end
   end
   
+  context "tabular.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['tabular'] ) }
+    
+    it{ should be_a Array }
+    its(:count){ should eq 1 }
+    
+    describe "#first" do
+      subject{ data.first }
+      its(:code){ should eq 'TABULAR' }
+      its(:column_names){ should eq ['Date','First','Second','Third','Fourth']}
+      its(:data){ should eq [
+        [Date.parse('2013-12-31'),10.0,20.0,30.0,40.0],
+        [Date.parse('2012-12-31'),20.0,30.0,40.0,50.0],
+        [Date.parse('2011-12-31'),30.0,40.0,50.0,60.0],
+      ]}
+    end
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_format
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,15 +170,16 @@ files:
 - spec/fixtures/data/mismatched_columns.qdf
 - spec/fixtures/data/mismatched_rows.qdf
 - spec/fixtures/data/missing_dashes.qdf
+- spec/fixtures/data/tabular.qdf
 - spec/fixtures/data/unknown_attribute.qdf
 - spec/fixtures/data/valid.qdf
 - spec/fixtures/format.rb
 - spec/lib/quandl/client/dataset_spec.rb
 - spec/lib/quandl/format/dataset/attributes_spec.rb
 - spec/lib/quandl/format/dataset/client_spec.rb
-- spec/lib/quandl/format/dataset/errors_spec.rb
+- spec/lib/quandl/format/dataset/load/errors_spec.rb
+- spec/lib/quandl/format/dataset/load/valid_spec.rb
 - spec/lib/quandl/format/dataset/load_spec.rb
-- spec/lib/quandl/format/dataset/valid_data_spec.rb
 - spec/lib/quandl/format/dataset_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
@@ -214,14 +215,15 @@ test_files:
 - spec/fixtures/data/mismatched_columns.qdf
 - spec/fixtures/data/mismatched_rows.qdf
 - spec/fixtures/data/missing_dashes.qdf
+- spec/fixtures/data/tabular.qdf
 - spec/fixtures/data/unknown_attribute.qdf
 - spec/fixtures/data/valid.qdf
 - spec/fixtures/format.rb
 - spec/lib/quandl/client/dataset_spec.rb
 - spec/lib/quandl/format/dataset/attributes_spec.rb
 - spec/lib/quandl/format/dataset/client_spec.rb
-- spec/lib/quandl/format/dataset/errors_spec.rb
+- spec/lib/quandl/format/dataset/load/errors_spec.rb
+- spec/lib/quandl/format/dataset/load/valid_spec.rb
 - spec/lib/quandl/format/dataset/load_spec.rb
-- spec/lib/quandl/format/dataset/valid_data_spec.rb
 - spec/lib/quandl/format/dataset_spec.rb
 - spec/spec_helper.rb