quandl_data 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08bf146b0c8eb0013154683227fb6490afbdcaca
-  data.tar.gz: a1d68b8e4933d8573dbe30bdd0bc591931ef4954
+  metadata.gz: ce1b13bea3abd317b83855932749d9b29836a838
+  data.tar.gz: dedc1c64c0354e3a1042a7662e8896090b45421a
 SHA512:
-  metadata.gz: 31545591417716667defb90d4c2c34db0c31e484bd9d3cbd2762cf19ab3ff06d6a0a391ed2bc9163ab098f9864e27cfffbe56bc6f123733e45401997372662da
-  data.tar.gz: 90ad18560130551a978b37819dcba6ae14069fc336ce5d279c07f0f0e15d6e6fbeb1be4a786a222c1819ccb94490b9873c8bcecf4cd5c17a5e0a0b12e2ed4150
+  metadata.gz: ea8568c09b7d551e35add9f272d7d48e7830b1ef2bda7aedbe54e76a4188dea0c939acf7862895e86a13a0b216b7fb757af993c0e5a72c8e45f1b9c155818cac
+  data.tar.gz: 4199b62dc28313abd1204de393dccdaf1aa4ffafc3512b340a32526d2859882020c096059b3bb0c47e1e90f65f2c74a97a9cd4d863eacd3e23ad052f98364ed5

data/UPGRADE.md

@@ -1,3 +1,10 @@
+## 1.3.5
+
+* add Validations, #valid? #errors
+* add Data#to_table that returns self. Useful in conjunction with search scopes
+* refactor format errors to be raised with line, context, row
+
+
 ## 1.3.4
 
 * add #to_precision(Integer)

data/lib/quandl/data/format.rb

@@ -35,7 +35,7 @@ class Format
       when :date            then return data
       when :date_string     then return date_strings_to_date( data )
       when :jd, :jd_string  then return jds_to_date( data )
-      when :unknown         then raise_date_format_error!( data[0] )
+      when :unknown         then raise_date_parse_error!( data[0] )
       end
       # return data
       data
@@ -51,7 +51,7 @@ class Format
       when :jd_string   then return jd_strings_to_jd( data )
       when :date        then return dates_to_jd( data )
       when :date_string then return date_strings_to_jd( data )
-      when :unknown     then raise_date_format_error!( data[0] )
+      when :unknown     then raise_date_parse_error!( data[0] )
       end
       # return data
       data
@@ -104,7 +104,7 @@ class Format
       # otherwise cast string jds to int
       output = []
       data.each_with_index do |row, index|
-        output << parse_jd_string(row) rescue raise_date_format_error!( row, index, :jd_strings_to_jd )
+        output << parse_jd_string(row, index)
       end
       output
     end
@@ -115,7 +115,7 @@ class Format
       # otherwise cast string jds to int
       output = []
       data.each_with_index do |row, index|
-        row = parse_date_string(row) rescue raise_date_format_error!( row, index, :date_strings_to_jd )
+        row = parse_date_string(row, index)
         row[0] = row[0].jd
         output << row
       end
@@ -131,7 +131,7 @@ class Format
       return data if data_missing_rows?(data) || data[0][0].is_a?(Date)
       output = []
       data.each_with_index do |row, index|
-        output << parse_jd(row) rescue raise_date_format_error!( row, index, :jds_to_date )
+        output << parse_jd(row, index)
       end
       output
     end
@@ -142,7 +142,7 @@ class Format
       # otherwise cast string jds to int
       output = []
       data.each_with_index do |row, index|
-        output << parse_date_string(row) rescue raise_date_format_error!( row, index, :date_strings_to_date )
+        output << parse_date_string(row, index)
       end
       output
     end
@@ -178,42 +178,63 @@ class Format
     
     protected
     
-    def parse_jd(row)
+    def parse_jd(row, index=nil)
       # parse jd_string
-      row = parse_jd_string(row)
+      row = parse_jd_string(row, index)
       # jd to date
       row[0] = Date.jd( row[0] )
       # onwards
       row
+    rescue => e
+      raise_jd_error!(row, index, e)
     end
     
-    def parse_jd_string(row)
+    def parse_jd_string(row, index=nil)
       row = row.dup
       row[0] = row[0].to_i
       # dont allow dates that are before 0000
-      raise Quandl::Error::UnknownDateFormat if row[0] <= 1721058
+      raise if row[0] <= 1721058
+      # onwards
       row
+    rescue => e
+      raise_jd_string_error!(row, index, e)
     end
     
-    def parse_date_string(row)
+    def parse_date_string(row, index=nil)
       row = row.dup
       # extract date
       date = row[0]
       # split date into parts
       date_values = date.split('-').collect(&:to_i)
-      # ensure date is valid
-      raise Quandl::Error::UnknownDateFormat unless date_values.count == 3
+      # ensure valid
+      raise unless date_values.count == 3
       # add to row
       row[0] = Date.new( *date_values )
       row
+    rescue => e
+      raise_date_string_error!(row, index, e)
     end
     
     
     private
     
-    def raise_date_format_error!(row, index = 0, type = :none)
-      message = "UnknownDateFormat: '#{row[0]}', index: data[#{index}][0], strategy: '#{type}', row: #{row}"
-      raise Quandl::Error::UnknownDateFormat, message
+    def raise_jd_error!(row, index, err)
+      raise Quandl::Error::DateParseError.new( line: index, context: 'parse_jd', row: row,  problem: err.message ), err.message
+    end
+    
+    def raise_jd_string_error!(row, index, err)
+      m = "Julian Date predates time. Expected <= 1721058 received '#{row[0]}'"
+      raise Quandl::Error::DateParseError.new( line: index, context: 'parse_jd_string', row: row, problem: m ), m
+    end
+    
+    def raise_date_string_error!(row, index, err)
+      m = "Invalid date segments. Expected yyyy-mm-dd received '#{row[0]}'"
+      raise Quandl::Error::DateParseError.new({ line: index, context: 'parse_date_string', row: row, problem: m }), m
+    end
+    
+    def raise_date_parse_error!(row, index = 0, type = :none)
+      m = "'#{row[0]}', index: data[#{index}][0] strategy: '#{type}', row: '#{row}'"
+      raise Quandl::Error::DateParseError.new({ line: index, context: 'date_parse_error', row: row, problem: m }), m
     end
     
   end

data/lib/quandl/data/operations.rb

@@ -38,6 +38,10 @@ module Operations
     return ''
   end
   
+  def to_table
+    self
+  end
+  
   def to_jd!
     @data_array = Quandl::Data::Format.to_jd( data_array ); self
   end

data/lib/quandl/data/validations.rb

@@ -0,0 +1,36 @@
+module Quandl
+class Data
+module Validations
+  
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    
+  end
+  
+  included do
+    ERROR_TYPES = [ 
+      Error::GuessDateFormat, Error::InvalidDate,
+      Error::UnknownDateFormat, Error::DateParseError ]
+  end
+  
+  def valid?
+    self.errors = []
+    self.data_array = pristine_data
+    true
+  rescue *ERROR_TYPES => error
+    self.errors << error
+    self.data_array = []
+    false
+  end
+  
+  def errors
+    @errors ||= []
+  end
+  def errors=(value)
+    @errors = value
+  end
+
+end
+end
+end

data/lib/quandl/data/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 class Data
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end
 end

data/lib/quandl/data.rb

@@ -9,13 +9,14 @@ require "quandl/operation"
 
 require 'quandl/babelfish'
 
-require 'quandl/error/unknown_date_format'
+require 'quandl/error/date_parse_error'
 
 require 'quandl/data/attributes'
 require 'quandl/data/cleaning'
 require 'quandl/data/enumerator'
 require 'quandl/data/operations'
 require 'quandl/data/format'
+require 'quandl/data/validations'
 require 'quandl/data/logging'
 
 module Quandl
@@ -24,6 +25,7 @@ class Data
   include Cleaning
   include Enumerator
   include Operations
+  include Validations
   include Logging if defined?(QUANDL_LOGGER) && QUANDL_LOGGER == true
 end
 end

data/lib/quandl/error/date_parse_error.rb

@@ -0,0 +1,8 @@
+require 'quandl/error/standard'
+
+module Quandl
+module Error
+  class DateParseError < Quandl::Error::Standard; end
+  
+end
+end

data/spec/lib/quandl/data/format_spec.rb

@@ -72,7 +72,7 @@ describe Quandl::Data::Format do
     
     [:invalid1, :invalid2].each do |type|
       it "#{type} should raise Quandl::Error::UnknownDateFormat" do
-        expect {  Quandl::Data::Format.parse( self.send(type) ) }.to raise_error Quandl::Error::UnknownDateFormat
+        expect {  Quandl::Data::Format.parse( self.send(type) ) }.to raise_error Quandl::Error::DateParseError
       end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_data
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quandl_operation
@@ -160,8 +160,9 @@ files:
 - lib/quandl/data/format.rb
 - lib/quandl/data/logging.rb
 - lib/quandl/data/operations.rb
+- lib/quandl/data/validations.rb
 - lib/quandl/data/version.rb
-- lib/quandl/error/unknown_date_format.rb
+- lib/quandl/error/date_parse_error.rb
 - lib/quandl/fabricate.rb
 - lib/quandl/fabricate/data.rb
 - quandl_data.gemspec

data/lib/quandl/error/unknown_date_format.rb

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