quandl_data 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e811fb881ccd062b98502cddce1c7a27d5f53ac2
-  data.tar.gz: 5f84494fdae5960ebb598c032da19cf9ce342b3d
+  metadata.gz: 94ac5c5c76af7dbfef791ad7aacf52abfea27db2
+  data.tar.gz: 5edaf32984dd620b88f44a3cfb8a7ee04c649e9f
 SHA512:
-  metadata.gz: 514a0425af0aa3af800bb8a0c2f06299bc9a2bce9b825cccc57ad84cd8469107d2da25a5a4be4900bcf6c4d78958edb34a5d496d528467f64489a8f5e8e9d8ac
-  data.tar.gz: 91ff9683ef3c984c2e7e679178b04848699ede82b7e54b6f36b883d19823697888258d2f9b67fdf2803e72bfbda6ec88c7eab526c39346c6f631321059866f42
+  metadata.gz: c149657dabceec4bb7864aafc533bf77482d171625a5290f3788073665994b6a0c42850aa2a72c4dc6bdfc18c0b8bc0ffe40041e328b2bcb30fcdf679874eaaf
+  data.tar.gz: c505d9aa00e19436832d2521a12bfed8fdc6447e9de495ec35394e3babefa3709d66c92e17b14d378f156a369696be54ee597f7b31b30816b78e797d409fa71c

data/Gemfile

@@ -6,5 +6,4 @@ local_gem_dir = ENV['BUNDLE_LOCAL_DIR']
 
 if use_local_gems
   gem 'quandl_operation', path: "#{local_gem_dir}/quandl/operation"
-  gem 'quandl_babelfish', path: "#{local_gem_dir}/quandl/babelfish"
 end

data/UPGRADE.md

@@ -1,3 +1,10 @@
+## 1.3.1
+
+* add .with_type to Data
+* revise errors to Error for consistency
+* refactor babelfish out of data, remove babelfisher
+
+
 ## 1.3.0
 
 * string_to_csv will not force values to float

data/lib/quandl/data.rb

@@ -6,11 +6,11 @@ require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 
 require "quandl/operation"
-require "quandl/babelfish"
 
-require 'quandl/errors/unknown_date_format'
+require 'quandl/error/unknown_date_format'
 
-require 'quandl/data/babelfisher'
+require 'quandl/data/attributes'
+require 'quandl/data/cleaning'
 require 'quandl/data/enumerator'
 require 'quandl/data/operations'
 require 'quandl/data/format'
@@ -18,7 +18,8 @@ require 'quandl/data/logging'
 
 module Quandl
 class Data
-  include Babelfisher
+  include Attributes
+  include Cleaning
   include Enumerator
   include Operations
   include Logging if defined?(QUANDL_LOGGER) && QUANDL_LOGGER == true

data/lib/quandl/data/attributes.rb

@@ -0,0 +1,51 @@
+module Quandl
+class Data
+module Attributes
+  
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+    
+    def with_type(type)
+      type = type.to_s.downcase.to_sym
+      case type
+      when :dirty, :babelfish then Quandl::Babelfish::Data
+      else 
+        Quandl::Data 
+      end
+    end
+    
+  end
+  
+  def initialize(*args)
+    self.pristine_data = args.first
+    self.attributes = args.extract_options!
+  end
+  
+  def headers=(value)
+    # only assign arrays
+    @headers = value.flatten if value.kind_of?(Array)
+  end
+  def headers
+    @headers
+  end
+  def headers?
+    headers.present?
+  end
+  
+  def attributes
+    @attributes ||= {}
+  end
+  def attributes=(attrs)
+    assign_attributes(attrs)
+    attributes
+  end
+  def assign_attributes(attrs)
+    attrs.each do |name, value|
+      self.send("#{name}=", value) if self.respond_to?("#{name}=")
+    end
+  end
+  
+end
+end
+end

data/lib/quandl/data/{babelfisher.rb → cleaning.rb}

@@ -1,19 +1,9 @@
 module Quandl
 class Data
-module Babelfisher
+module Cleaning
   
   extend ActiveSupport::Concern
   
-  def headers=(value)
-    @headers = value
-  end
-  def headers
-    @headers ||= data_array.respond_to?(:headers) ? data_array.headers : nil
-  end
-  def headers?
-    headers.present?
-  end
-  
   def cleaned
     @cleaned
   end
@@ -31,16 +21,10 @@ module Babelfisher
     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)
-    # Quandl::Babelfish::Data is already clean
-    return data if data.kind_of?(Quandl::Babelfish::Data)
     # Return empty array if given empty string, nil, etc.
     return [] if data.blank?
     # String needs conversion to array
-    data = Format.csv_to_array( data ) if data.kind_of?(String)
-    # Hash needs conversion to array
-    data = Format.hash_to_array( data ) if data.kind_of?(Hash)
-    # Array needs cleaning
-    data = Quandl::Babelfish.clean( data )
+    data = Format.parse( data )
     # mark data as clean
     cleaned!
     # return data

data/lib/quandl/data/enumerator.rb

@@ -9,11 +9,6 @@ module Quandl::Data::Enumerator
     attr_accessor :pristine_data
   end
   
-  def initialize(*args)
-    self.pristine_data = args.first
-    self.attributes = args.extract_options!
-  end
-  
   def data_array
     @data_array ||= clean( pristine_data )
   end
@@ -26,20 +21,4 @@ module Quandl::Data::Enumerator
     @data_array.present?
   end
 
-  def attributes
-    @attributes ||= {}
-  end
-
-  def attributes=(attrs)
-    assign_attributes(attrs)
-    attributes
-  end
-  
-  # mass assignment protection
-  def assign_attributes(attrs)
-    attrs.each do |name, value|
-      self.send("#{name}=", value) if self.respond_to?("#{name}=")
-    end
-  end
-  
 end

data/lib/quandl/data/format.rb

@@ -185,7 +185,7 @@ class Format
       row = row.dup
       row[0] = row[0].to_i
       # dont allow dates that are before 0000
-      raise Quandl::Errors::UnknownDateFormat if row[0] <= 1721058
+      raise Quandl::Error::UnknownDateFormat if row[0] <= 1721058
       row
     end
     
@@ -196,7 +196,7 @@ class Format
       # split date into parts
       date_values = date.split('-').collect(&:to_i)
       # ensure date is valid
-      raise Quandl::Errors::UnknownDateFormat unless date_values.count == 3
+      raise Quandl::Error::UnknownDateFormat unless date_values.count == 3
       # add to row
       row[0] = Date.new( *date_values )
       row
@@ -207,7 +207,7 @@ class Format
     
     def raise_date_format_error!(row, index = 0, type = :none)
       message = "UnknownDateFormat: '#{row[0]}', index: data[#{index}][0], strategy: '#{type}', row: #{row}"
-      raise Quandl::Errors::UnknownDateFormat, message
+      raise Quandl::Error::UnknownDateFormat, message
     end
     
   end

data/lib/quandl/data/version.rb

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

data/lib/quandl/{errors → error}/unknown_date_format.rb

@@ -1,5 +1,5 @@
 module Quandl
-module Errors
+module Error
   class UnknownDateFormat < StandardError; end
 end
 end

data/quandl_data.gemspec

@@ -18,7 +18,6 @@ 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/data/format_spec.rb

@@ -71,8 +71,8 @@ describe Quandl::Data::Format do
     let(:invalid2){ "2012-03-07,,69.75,69.75,69.75,0.0,0.0,0.0\nDate, Column 1, Column 2, C3, C4, C5, C6, C7\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" }
     
     [:invalid1, :invalid2].each do |type|
-      it "#{type} should raise Quandl::Errors::UnknownDateFormat" do
-        expect {  Quandl::Data::Format.parse( self.send(type) ) }.to raise_error Quandl::Errors::UnknownDateFormat
+      it "#{type} should raise Quandl::Error::UnknownDateFormat" do
+        expect {  Quandl::Data::Format.parse( self.send(type) ) }.to raise_error Quandl::Error::UnknownDateFormat
       end
     end
     

data/spec/lib/quandl/data_spec.rb

@@ -10,16 +10,6 @@ describe Quandl::Data do
   let(:data){ Quandl::Data.new(csv2) }
   subject{ data }
   
-  describe "#headers" do
-    subject{ Quandl::Data.new(csv3) }
-    let(:expectation){ ['Date', 'Column 1', 'Column 2', 'C3', 'C4', 'C5', 'C6', 'C7'] }
-    its(:headers){ should eq expectation }
-    
-    its('clone.headers'){ should eq expectation }
-    its('to_jd.headers'){ should eq expectation }
-
-  end
-  
   describe "#clone" do
     subject{ data.clone }
     it{ should be_a Quandl::Data }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_data
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Blake Hilscher
@@ -24,20 +24,6 @@ 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
@@ -154,13 +140,14 @@ files:
 - Rakefile
 - UPGRADE.md
 - lib/quandl/data.rb
-- lib/quandl/data/babelfisher.rb
+- lib/quandl/data/attributes.rb
+- lib/quandl/data/cleaning.rb
 - lib/quandl/data/enumerator.rb
 - lib/quandl/data/format.rb
 - lib/quandl/data/logging.rb
 - lib/quandl/data/operations.rb
 - lib/quandl/data/version.rb
-- lib/quandl/errors/unknown_date_format.rb
+- lib/quandl/error/unknown_date_format.rb
 - lib/quandl/fabricate.rb
 - lib/quandl/fabricate/data.rb
 - quandl_data.gemspec