quandl_format 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3832ba8c845b964918c1fbb0db97aa2b1c6d65
-  data.tar.gz: bf04d0d7c58742f9919cd6299bb4a4127c3043ed
+  metadata.gz: d82a7ccd02fbe5b8359fd3906eb6c7b2598d3d72
+  data.tar.gz: 04d70cbdc92e2bc1be083ed81e4ccc79df33b631
 SHA512:
-  metadata.gz: bf602fb5d34d66077ca55c2202c267580e4d9bca78bad7b53e8b212fa7b07f00d5604cacb630c4735992d3efb8ba5c63f4f134ddd1e6e502f20e6a2a8a4751d8
-  data.tar.gz: 00dcfaae4b866d13ed4855650cac709fdbad29a706886515b5c5c7d5e2d8ceafc82c52d7a937dc386d2001c83b204d1ee4f22635f1564d64bf1f58f213487c84
+  metadata.gz: e0260e134f074a1b908a7e6995f54d21aacdffea30ae3faf7da1484d7b74a611d180ad8b399c08c431b3a6a78a2a43d072a3d7d6f7f0eba0ac6d1c13edacb9f6
+  data.tar.gz: d9eaba2e40f27ba8a1897c1afe107bfa983a38e47af7978106f7bdcfd4d0b8281c3b5e7bebe468ec91de9c356a8a8e6bf9f1d0d34e75880fd3cc1730326732dd

data/UPGRADE.md

@@ -1,3 +1,10 @@
+## 0.1.2
+
+* mismatched columns should raise ColumnCountMismatch
+* revise specs to take reference_url instead of display_url
+* revise attribute display_url to reference_url
+
+
 ## 0.1.0
 
 * only update client attrs before upload

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

@@ -8,7 +8,7 @@ module Attributes
 
   module ClassMethods
 
-    META_ATTRIBUTES = :source_code, :code, :name, :description, :private, :display_url
+    META_ATTRIBUTES = :source_code, :code, :name, :description, :private, :reference_url
     DATA_ATTRIBUTES = :column_names, :data
 
     def attribute_names
@@ -61,6 +61,9 @@ module Attributes
   def data=(rows)
     self.column_names = rows.shift unless rows.first.collect{|r| r.to_s.numeric? }.include?(true)
     @data = Quandl::Data.new(rows).to_date
+    data_row_count_should_match_column_count!
+    data_rows_should_have_equal_columns!
+    @data
   end
 
   def column_names=(names)
@@ -90,8 +93,36 @@ module Attributes
     %Q{<##{self.class.name} #{attrs.join(', ')}>}
   end
 
+  protected
+  
+  def data_rows_should_have_equal_columns!
+    row_count = data[0].count
+    data.each_with_index do |row, index|
+      raise_row_column_mismatch!(row, index) unless row.count == row_count
+    end
+  end
+  
+  def data_row_count_should_match_column_count!
+    return if column_names.blank?
+    column_count = column_names.count
+    data.each_with_index do |row, index|
+      raise_column_count_mismatch!(row, index) unless row.count == column_count
+    end
+  end
+  
+
   private
   
+  def raise_row_column_mismatch!(row, index)
+    m = "ColumnCountMismatch #{full_code} data[0] had #{data[0].count} columns, but data[#{index}] had #{row.count} #{row}"
+    raise Quandl::Format::Errors::ColumnCountMismatch, m    
+  end
+  
+  def raise_column_count_mismatch!(row, index)
+    m = "ColumnCountMismatch #{full_code} column_names had #{column_names.count} columns, but data[#{index}] had #{row.count} #{row}"
+    raise Quandl::Format::Errors::ColumnCountMismatch, m
+  end
+  
   def raise_unknown_attribute_error!(key)
     m = "UnknownAttribute #{key} recognized attributes are: #{self.class.attribute_names}"
     raise Quandl::Format::Errors::UnknownAttribute, m

data/lib/quandl/format/errors.rb

@@ -1,7 +1,10 @@
 module Quandl
 module Format
 module Errors
+  
   class UnknownAttribute < StandardError; end
+  class ColumnCountMismatch < StandardError; end
+  
 end
 end
 end

data/lib/quandl/format/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Format
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 end

data/quandl_format.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
   
-  s.add_runtime_dependency "quandl_client", "~> 2.2"
+  s.add_runtime_dependency "quandl_client", "~> 2.3"
   
 end

data/spec/fixtures/data/mismatched_columns.qdf

@@ -0,0 +1,9 @@
+code: "BLAKE_TEST_1"
+name: "A new title"
+description: "The description Date, Open, High"
+private: false
+-
+Date,Open,High,Low
+2013-11-22,10,20,30
+2013-11-21,10,20,30,40
+2013-11-20,10,20,30

data/spec/fixtures/data/mismatched_rows.qdf

@@ -0,0 +1,7 @@
+code: "BLAKE_TEST_2"
+name: "A new title"
+description: "The description Date, Open, High"
+-
+2013-11-22,10,20
+2013-11-22,10,20,30
+2013-11-22,10,20,30

data/spec/fixtures/format.rb

@@ -43,7 +43,7 @@ def qdf_attributes
     description:    "Here is a description with multiple lines.\n This is the second line.",
     column_names:   ['Date', 'Value', 'High', 'Low'],
     private:        false,
-    display_url:    'http://test.com/',
+    reference_url:    'http://test.com/',
     data:           Quandl::Data.new([["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"],["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]]),
   }
 end
@@ -56,7 +56,7 @@ description: |-
   Here is a description with multiple lines.
    This is the second line.
 private: false
-display_url: http://test.com/
+reference_url: http://test.com/
 -
 Date,Value,High,Low
 2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353

data/spec/lib/quandl/client/dataset_spec.rb

@@ -4,15 +4,15 @@ require 'spec_helper'
 describe Quandl::Client::Dataset do
   
   let(:attributes) { {
-    code:           'DATASET_CODE_2',
-    source_code:    'SOURCE_CODE',
-    name:           'Test Dataset Name 2',
-    description:    "Here is a description with multiple lines.\n This is the second line.",
-    column_names:   ['Date', 'Value', 'High', 'Low'],
-    private:        false,
-    display_url:    'http://test.com/',
-    data:           [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
-                    ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]], 
+    code:             'DATASET_CODE_2',
+    source_code:      'SOURCE_CODE',
+    name:             'Test Dataset Name 2',
+    description:      "Here is a description with multiple lines.\n This is the second line.",
+    column_names:     ['Date', 'Value', 'High', 'Low'],
+    private:          false,
+    reference_url:    'http://test.com/',
+    data:             [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
+                      ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]], 
   }}
   
   subject{ Quandl::Client::Dataset.new( attributes ) }

data/spec/lib/quandl/format/dataset/errors_spec.rb

@@ -29,4 +29,14 @@ describe Quandl::Format::Dataset do
     it{ expect{data}.to raise_error Quandl::Format::Errors::UnknownAttribute, /this_attribute_does_not_exist/ }
   end
   
+  context "mismatched_columns.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['mismatched_columns'] ) }
+    it{ expect{data}.to raise_error Quandl::Format::Errors::ColumnCountMismatch, /column_names had 4 columns/ }
+  end
+  
+  context "mismatched_rows.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['mismatched_rows'] ) }
+    it{ expect{data}.to raise_error Quandl::Format::Errors::ColumnCountMismatch, /had 3 columns/ }
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_format
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 description: Data will be loaded and dumped.
 email:
 - blake@hilscher.ca
@@ -149,6 +149,8 @@ files:
 - spec/config/client.rb
 - spec/config/logger.rb
 - spec/fixtures/data/invalid_data.qdf
+- spec/fixtures/data/mismatched_columns.qdf
+- spec/fixtures/data/mismatched_rows.qdf
 - spec/fixtures/data/unknown_attribute.qdf
 - spec/fixtures/data/valid.qdf
 - spec/fixtures/format.rb
@@ -187,6 +189,8 @@ test_files:
 - spec/config/client.rb
 - spec/config/logger.rb
 - spec/fixtures/data/invalid_data.qdf
+- spec/fixtures/data/mismatched_columns.qdf
+- spec/fixtures/data/mismatched_rows.qdf
 - spec/fixtures/data/unknown_attribute.qdf
 - spec/fixtures/data/valid.qdf
 - spec/fixtures/format.rb