quandl_data 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ac5c5c76af7dbfef791ad7aacf52abfea27db2
-  data.tar.gz: 5edaf32984dd620b88f44a3cfb8a7ee04c649e9f
+  metadata.gz: fa65494367e714daf18edb29fb3fc3e216c265a9
+  data.tar.gz: 4def3b647bd730baefd225c93a4468810629ba94
 SHA512:
-  metadata.gz: c149657dabceec4bb7864aafc533bf77482d171625a5290f3788073665994b6a0c42850aa2a72c4dc6bdfc18c0b8bc0ffe40041e328b2bcb30fcdf679874eaaf
-  data.tar.gz: c505d9aa00e19436832d2521a12bfed8fdc6447e9de495ec35394e3babefa3709d66c92e17b14d378f156a369696be54ee597f7b31b30816b78e797d409fa71c
+  metadata.gz: 7b597c31ad9d69bbdd77452e762aeec79f51706f283b3d267d5f7abd7d797d62f4b7747dcb5938e8d40ed6957a29eaaa1cd93f3878d71a26f9c679b47b5662a1
+  data.tar.gz: ab90dcb57829b15f69b798c947b770e10fcf56e836f3a8eba8defbc603dd9d7171560d12ebd9fe7e3d7da6c0bfb552249a734f7d4b1b201340470ca42f292da8

data/Gemfile

@@ -5,5 +5,6 @@ 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_babelfish', path: "#{local_gem_dir}/quandl/babelfish"
   gem 'quandl_operation', path: "#{local_gem_dir}/quandl/operation"
 end

data/UPGRADE.md

@@ -1,3 +1,9 @@
+## 1.3.2
+
+* readd quandl_babelfish as a dependency
+* Add Quandl::Babelfish::Data
+
+
 ## 1.3.1
 
 * add .with_type to Data

data/lib/quandl/babelfish/data.rb

@@ -0,0 +1,37 @@
+module Quandl
+module Babelfish
+
+class Data < Quandl::Data
+  
+  def initialize(*args)
+    super(*args)
+    # clean data on initialize
+    self.data_array
+  end
+  
+  
+  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
+
+end
+end

data/lib/quandl/data.rb

@@ -7,6 +7,9 @@ require "active_support/core_ext/object"
 
 require "quandl/operation"
 
+require 'quandl/babelfish'
+require 'quandl/babelfish/data'
+
 require 'quandl/error/unknown_date_format'
 
 require 'quandl/data/attributes'

data/lib/quandl/data/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 class Data
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end
 end

data/quandl_data.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "quandl_operation", "~> 0.3.1"
+  s.add_runtime_dependency "quandl_babelfish", "~> 0.0"
   
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.13"

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

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Quandl::Babelfish::Data do
+  
+  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" }
+  
+  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 }
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_data
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quandl_operation
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
+- lib/quandl/babelfish/data.rb
 - lib/quandl/data.rb
 - lib/quandl/data/attributes.rb
 - lib/quandl/data/cleaning.rb
@@ -152,6 +167,7 @@ files:
 - lib/quandl/fabricate/data.rb
 - quandl_data.gemspec
 - spec/lib/fabricate/data_spec.rb
+- spec/lib/quandl/babelfish/data_spec.rb
 - spec/lib/quandl/data/enumerator_spec.rb
 - spec/lib/quandl/data/format_spec.rb
 - spec/lib/quandl/data/operations_spec.rb
@@ -183,6 +199,7 @@ specification_version: 4
 summary: For interfacing with data
 test_files:
 - spec/lib/fabricate/data_spec.rb
+- spec/lib/quandl/babelfish/data_spec.rb
 - spec/lib/quandl/data/enumerator_spec.rb
 - spec/lib/quandl/data/format_spec.rb
 - spec/lib/quandl/data/operations_spec.rb