quandl_format 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a154e15469886cd35f5722374918456c299200
-  data.tar.gz: f5b673bb2619677b9610bd0820feac55c1969bba
+  metadata.gz: 20078bc556c8155d90a29be038f3963b31167767
+  data.tar.gz: 3b13078bacc4f36a41cb841d7badb831d34738b7
 SHA512:
-  metadata.gz: 4dd7857d5d4d3b62ef46e2fbd5951f9e4106c7e47b0b24ff20c19caf66e04b2cecae1a4c39ecbb6fa485badb23262e9b761616596047d38781b4efb0fdd0220d
-  data.tar.gz: 2b3b289b1db9c084e4edf2b6d00e320c65c5ce4193e1cd7b286aa1fb6adeb6d5d6fb7a50c3006776783a4f7dd0215665a2463f2b8eb886f0f07d8f241b592a6e
+  metadata.gz: 88f642d299a714d1b72d8047ee11fbf4f453e0dfd14ebec20d6a0dd92b9d9be45fd0b47c905b1eeae99373d226a96fceb2d6d0f2aa8bd28645959a724fd2d0b3
+  data.tar.gz: b5a488472d4b176a89c71ec0462fe2ac5522cae40854323b543ab119ae859499d440af1633934d67018fd76a41601c008b8269943aec5c64750bcf5f3ae35565

data/UPGRADE.md

@@ -1,3 +1,11 @@
+## 0.1.4
+
+* Add quandl_babelfish as a runtime_dependency
+* add spec for annual data using Babelfish.clean
+* refactor errors to be general to Quandl::Error
+* switch incoming data to use babelfish. column_names come from babelfish.headers
+
+
 ## 0.1.2
 
 * mismatched columns should raise ColumnCountMismatch

data/lib/quandl/error/column_count_mismatch.rb

@@ -0,0 +1,7 @@
+module Quandl
+module Error
+  
+  class ColumnCountMismatch < StandardError; end
+  
+end
+end

data/lib/quandl/error/unknown_attribute.rb

@@ -0,0 +1,7 @@
+module Quandl
+module Error
+  
+  class UnknownAttribute < StandardError; end
+  
+end
+end

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

@@ -59,8 +59,8 @@ module Attributes
   end
 
   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 = Quandl::Babelfish::Data.new(rows).to_date
+    self.column_names = @data.headers if @data.headers.present?
     data_row_count_should_match_column_count!
     data_rows_should_have_equal_columns!
     @data
@@ -104,17 +104,17 @@ module Attributes
   
   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    
+    raise Quandl::Error::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
+    raise Quandl::Error::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
+    raise Quandl::Error::UnknownAttribute, m
   end
 
 

data/lib/quandl/format/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Format
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 end

data/lib/quandl/format.rb

@@ -5,13 +5,16 @@ require "quandl/format/version"
 require 'csv'
 
 require 'quandl/client'
+require 'quandl/babelfish'
 
 require "active_support"
 require "active_support/inflector"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 
-require 'quandl/format/errors'
+require 'quandl/error/column_count_mismatch'
+require 'quandl/error/unknown_attribute'
+
 require 'quandl/format/dataset'
 require 'quandl/client/dataset/to_qdf'
 

data/quandl_format.gemspec

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

data/spec/fixtures/data/annual.qdf

@@ -0,0 +1,10 @@
+code: "ANNUAL_DATA"
+name: "A new title"
+description: "Annual Data"
+private: false
+-
+Date,Open,High
+2013,1252.0,454.95
+2012,452.25,457.75
+2011,452.25,457.75
+2010,452.25,457.75

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

@@ -3,6 +3,7 @@ require 'spec_helper'
 
 describe Quandl::Format::Dataset do
   subject{ data }
+
   context "valid.qdf" do
     let(:data){ Quandl::Format::Dataset.load( fixtures_data['valid'] ) }
     
@@ -18,6 +19,27 @@ describe Quandl::Format::Dataset do
       its(:data){ should eq Quandl::Data.new([['2013-11-22','1252.0','454.95','448.2','450.0','450.0','1354405.0','6099.41'],['2013-11-21','452.25','457.75','449.1','451.2','451.0','218881.0','992.94']]) }
     end
   end
+  
+  context "annual.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['annual'] ) }
+    
+    it{ should be_a Array }
+    its(:count){ should eq 1 }
+    
+    describe "#first" do
+      subject{ data.first }
+      its(:code){ should eq 'ANNUAL_DATA' }
+      its(:name){ should eq 'A new title' }
+      its(:description){ should eq 'Annual Data'}
+      its(:column_names){ should eq ['Date','Open','High']}
+      its(:data){ should eq [
+        [ Date.parse('2013-12-31'), 1252.0, 454.95 ],
+        [ Date.parse('2012-12-31'), 452.25, 457.75 ],
+        [ Date.parse('2011-12-31'), 452.25, 457.75 ],
+        [ Date.parse('2010-12-31'), 452.25, 457.75 ],
+      ]}
+    end
+  end
 
   expected_errors = [
     { file: 'invalid_data',       error: /Date/ },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_format
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Blake Hilscher
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: quandl_babelfish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: quandl_client
   requirement: !ruby/object:Gem::Requirement
@@ -138,17 +152,19 @@ files:
 - UPGRADE.md
 - examples/load.rb
 - lib/quandl/client/dataset/to_qdf.rb
+- lib/quandl/error/column_count_mismatch.rb
+- lib/quandl/error/unknown_attribute.rb
 - lib/quandl/format.rb
 - lib/quandl/format/dataset.rb
 - lib/quandl/format/dataset/attributes.rb
 - lib/quandl/format/dataset/client.rb
 - lib/quandl/format/dataset/dump.rb
 - lib/quandl/format/dataset/load.rb
-- lib/quandl/format/errors.rb
 - lib/quandl/format/version.rb
 - quandl_format.gemspec
 - spec/config/client.rb
 - spec/config/logger.rb
+- spec/fixtures/data/annual.qdf
 - spec/fixtures/data/invalid_data.qdf
 - spec/fixtures/data/invalid_yaml.qdf
 - spec/fixtures/data/mismatched_columns.qdf
@@ -190,6 +206,7 @@ summary: Quandl Data Format
 test_files:
 - spec/config/client.rb
 - spec/config/logger.rb
+- spec/fixtures/data/annual.qdf
 - spec/fixtures/data/invalid_data.qdf
 - spec/fixtures/data/invalid_yaml.qdf
 - spec/fixtures/data/mismatched_columns.qdf

data/lib/quandl/format/errors.rb

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