quandl_babelfish 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa7214cd7f3c0541f0aefe31d983622065bea21
-  data.tar.gz: 442699776fdbd64183d877e962d564ce2c770664
+  metadata.gz: f1debf3ff5b2fc7468dc099a86ba4544eb44e771
+  data.tar.gz: ec8f27f490e9bd95558097bee0c463de870dd423
 SHA512:
-  metadata.gz: 5a577f380ce3771869c553ebb418c82aa5e9dccb1f493e5cfd06f93a3d804c102df3cd6bb38039a5ddc2630d7ed132c4e68fbb6186b60dab0492f73099bd06cf
-  data.tar.gz: ea13348aa261380045206aacadda5c8ef4915f7ea9c9210c00f17d1c75f41bee90ba243f240da73e0431c8a573e9ab42354fe2f55e91732f464c2beb7d0663d8
+  metadata.gz: 8e659bdbcca4591004cb0e5c7c906a6f27cb0d467000d610bfe14740142b3dcef46699e93d6dd056dd671cb4e486bfb52bd18ea6bf7d2cac923d42c003083b53
+  data.tar.gz: 7e490b25c6e5c8c7b28b64b918fffc31ae0a5ae9540101eaf108f25bdf5967fc570b2b589eeaea4b87d03cff164394392fd1b1fae09c7579e13fad9ec941fa42

data/Gemfile

@@ -1,2 +1,11 @@
 source "https://rubygems.org"
 gemspec
+
+
+use_local_gems = ENV['BUNDLE_LOCAL_GEMS'] == "true" && ENV['BUNDLE_LOCAL_DIR']
+local_gem_dir = ENV['BUNDLE_LOCAL_DIR']
+
+if use_local_gems
+  gem 'quandl_data', path: "#{local_gem_dir}/quandl/data"
+  gem 'quandl_operation', path: "#{local_gem_dir}/quandl/operation"
+end

data/UPGRADE.md

@@ -1,3 +1,10 @@
+## 0.0.3
+
+* Add Quandl::Data as a add_runtime_dependency
+* refactor Babelfish::Data to inherit from Quandl::Data
+* refactor specs
+
+
 ## 0.0.1
 
 * replace Cleaner.process return clean_array, header with Quandl::Babelfish::Data.new( clean_array, headers: header )

data/lib/quandl/babelfish/cleaner.rb

@@ -24,7 +24,7 @@ class Cleaner
         clean_array << new_row
       end
 
-      return Quandl::Babelfish::Data.new( clean_array, headers: header )
+      return clean_array, header
     end
   end
 end

data/lib/quandl/babelfish/data.rb

@@ -1,19 +1,34 @@
 module Quandl
 module Babelfish
 
-class Data < Array
+class Data < Quandl::Data
   
-  def initialize(*args, &block)
-    # do we have options?
-    options = args.pop if args && args.last.is_a?(Hash)
-    # set headers if given
-    @headers = options[:headers] if options && options.has_key?(:headers) && options[:headers].is_a?(Array)
-    # onwards and upwards
-    super(*args, &block)
+  def initialize(*args)
+    super(*args)
+    # clean data on initialize
+    self.data_array
   end
   
-  def headers
-    @headers ||= nil
+  
+  protected
+  
+  def clean(data)
+    # skip cleaning if already clean
+    return data if data.kind_of?(Array) && cleaned?
+    # Quandl::Data is already clean, but to avoid errors extract internal array
+    return data.data_array if data.kind_of?(Quandl::Data)
+    # Return empty array if given empty string, nil, etc.
+    return [] if data.blank?
+    # Hash needs conversion to array
+    data = Quandl::Data::Format.hash_to_array( data )
+    # String needs conversion to array
+    data = Quandl::Data::Format.csv_to_array( data )
+    # Babelfish cleaner
+    data, self.headers = Quandl::Babelfish.clean(data)
+    # mark data as clean
+    cleaned!
+    # return data
+    data
   end
   
 end

data/lib/quandl/babelfish/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Babelfish
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 end

data/lib/quandl/babelfish.rb

@@ -1,5 +1,7 @@
 require "quandl/babelfish/version"
 
+require 'quandl/data'
+
 require "quandl/babelfish/data"
 require "quandl/babelfish/cleaner"
 require "quandl/babelfish/date_maid"

data/quandl_babelfish.gemspec

@@ -15,7 +15,9 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-
+  
+  s.add_runtime_dependency "quandl_data", "~> 1.3"
+  
   s.add_development_dependency "rspec", "~> 2.13"
   s.add_development_dependency "pry"
 end

data/spec/lib/quandl/babelfish/cleaner_spec.rb

@@ -5,7 +5,9 @@ describe Cleaner do
 
   let(:input){ [] }
   let(:output){ Cleaner.process(input) }
-  subject{ output }
+  let(:data){ output[0] }
+  let(:headers){ output[1] }
+  subject{ data }
   
   context "garbage" do
     let(:input){ [[2456624, 10], [2456625, 20], [2456626, 30]] }
@@ -14,7 +16,7 @@ describe Cleaner do
   
   context "headers with whitespace" do
     let(:input){ [["   Date   ", " C1    ", "C2   ", "    C4"],[1990,1,2,3],[1991,4,5,6]] }
-    its(:headers){ should eq ["Date", "C1", "C2", "C4"] }
+    it{ headers.should eq ["Date", "C1", "C2", "C4"] }
   end
   
   context "annual" do
@@ -23,7 +25,7 @@ describe Cleaner do
     it{ should be_eq_at_index '[0][1]', 1 }
     it{ should be_eq_at_index '[1][0]', Date.new(1991,12,31) }
     it{ should be_eq_at_index '[1][3]', 6 }
-    its(:headers){ should be_nil }
+    it{ headers.should be_nil }
   end
   
   context "numeric date" do
@@ -32,7 +34,7 @@ describe Cleaner do
     it{ should be_eq_at_index '[0][1]', 1 }
     it{ should be_eq_at_index '[0][2]', 2.3 }
     it{ should be_eq_at_index '[0][3]', nil }
-    its(:headers){ should be_nil }
+    it{ headers.should be_nil }
   end
   
   context "data with headers" do
@@ -41,7 +43,7 @@ describe Cleaner do
     it{ should be_eq_at_index '[0][1]', 1 }
     it{ should be_eq_at_index '[0][2]', 2.3 }
     it{ should be_eq_at_index '[0][3]', nil }
-    its(:headers){ should eq ['Date','0','0','0'] }
+    it{ headers.should eq ['Date','0','0','0'] }
   end
 
 end

data/spec/lib/quandl/babelfish/data_spec.rb

@@ -1,33 +1,19 @@
 require 'spec_helper'
 
 describe Quandl::Babelfish::Data do
-  let(:data_args){ [] }
-  subject{ Quandl::Babelfish::Data.new(*data_args) }
   
-  its(:to_a){ should eq [] }
-  its(:headers){ should be_nil }
-    
-  context "given Array" do
-    let(:data_args){ [ [[1,2,3],[4,3,5]] ] }
-    its(:to_a){ should eq [[1,2,3],[4,3,5]] }
-    its(:headers){ should be_nil }
-  end
+  let(:csv) { "Date, Column 1, Column 2, C3, C4, C5, C6, C7\n 2012-03-07,,69.75,69.75,69.75,0.0,0.0,0.0\n2012-03-06,69.75,69.75,69.75,69.75,0.0,0.0,0.0\n2012-03-05,69.75,69.75,69.75,69.75,0.0,0.0,0.0\n2012-03-04,69.75,69.75,69.75,69.75,0.0,0.0,0.0\n2012-02-29,,69.75,69.75,69.75,0.0,0.0,0.0\n2012-02-28,69.75,69.75,69.75,69.75,0.0,0.0,0.0\n" }
   
-  context "given Array with :headers" do
-    let(:data_args){ [ [[1,2,3],[4,3,5]], { headers: ['Date', 'C1', 'C2'] } ] }
-    its(:to_a){ should eq [[1,2,3],[4,3,5]] }
-    its(:headers){ should eq ['Date', 'C1', 'C2'] }
-  end
+  let(:data){ Quandl::Babelfish::Data.new(csv) }
+  subject{ data }
+  
+  let(:expected_data){ [['2012-03-07',nil,69.75,69.75,69.75,0.0,0.0,0.0],['2012-03-06',69.75,69.75,69.75,69.75,0.0,0.0,0.0],['2012-03-05',69.75,69.75,69.75,69.75,0.0,0.0,0.0],['2012-03-04',69.75,69.75,69.75,69.75,0.0,0.0,0.0],['2012-02-29',nil,69.75,69.75,69.75,0.0,0.0,0.0],['2012-02-28',69.75,69.75,69.75,69.75,0.0,0.0,0.0]] }
+  let(:expected_headers){ ['Date', 'Column 1', 'Column 2', 'C3', 'C4', 'C5', 'C6', 'C7'] }
+  
+  its(:headers){ should eq expected_headers }  
+  its('clone.headers'){ should eq expected_headers }
+  its('to_jd.headers'){ should eq expected_headers }
+  
+  its(:to_date_str){ should eq expected_data }
   
-  context "given junk headers: Float" do
-    let(:data_args){ [ 2, { headers: 1.2 } ] }
-    its(:to_a){ should eq [nil,nil] }
-    its(:headers){ should be_nil }
-  end
-  context "given junk headers: String" do
-    let(:data_args){ [ 2, { headers: '1.2' } ] }
-    its(:to_a){ should eq [nil,nil] }
-    its(:headers){ should be_nil }
-  end
-    
 end

data/spec/lib/quandl/babelfish_spec.rb

@@ -5,7 +5,7 @@ describe Babelfish do
 
   it 'should run gem' do
     input=[[1990,1,2,3],[1991,4,5,6]]
-    output = Babelfish::clean input
+    output, headers = Babelfish::clean input
     output[0][0].should ==Date.new(1990,12,31)
     output[0][1].should ==1
     output[1][0].should ==Date.new(1991,12,31)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_babelfish
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sergei Ryshkevich
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: quandl_data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement