quandl_operation 0.1.23 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24dc5a778c39638babaa1bb5640e042a26ffba1c
-  data.tar.gz: c4f5211b7f4425f872939e7bb08c12a955af4691
+  metadata.gz: f793e84f6b1444296a2139214ac181e0a3175db5
+  data.tar.gz: 1e07e11fac0532a64bb51a61227b76d33ba20ff6
 SHA512:
-  metadata.gz: d12d77624a61d51560f2d214189b826174a8bc291460a2651d8075fe398418925fc4e6fb1bda4155d7f566ce70932edc8858330c477f4c2d8191f420f70e5f85
-  data.tar.gz: 60f8fdb3179b09437abe62f09dd720d43167ce3bab8ca5ad567c56450aba674c870738f9410f926d63be54bd559e0e042465720b719a080d8cb8bcc3ae1d501e
+  metadata.gz: 72f3392d5646b4fac36ac7d83b11c0d53481b1bb4ed12c237b40c7acdb554f35450e9376ff6000fa3cb80fe3dd3c52116011301090bdf4dc7c2273ba0e5ab341
+  data.tar.gz: 8bd50d06f6f8b57789694840594b9ff34e3326052cb05d4bc2f881e302c8432819d587e78217c85ade3866f34d417e14e6786a8c3bf2f98744e659bb342399f3

data/UPGRADE.md

@@ -1,7 +1,20 @@
+## 0.2.0
+
+* rename Parse methods to be more informative
+* add qdate
+* reject dates that preceed time
+* add Quandl::Operation::Errors
+* add Quandl::Operation::Errors::UnknownDateFormat
+* Quandl::Operation::Parse.perform(data)
+* outputs dates as Date instead of Integer
+* invalid dates raise date_format_error with informative message
+
+
 ## 0.1.22
 
 * refactor QDFormat to support full yaml. metadata and data are seperated by a
 
+
 ## 0.1.21
 
 * QDFormat should handle new lines in attributes

data/lib/quandl/operation.rb

@@ -2,6 +2,8 @@ require 'quandl/logger'
 
 require "quandl/operation/version"
 
+require 'csv'
+
 require "active_support"
 require "active_support/inflector"
 require "active_support/core_ext/hash"
@@ -11,6 +13,8 @@ require 'quandl/operation/core_ext'
 require 'quandl/operation/collapse'
 require 'quandl/operation/transform'
 require 'quandl/operation/parse'
+require 'quandl/operation/errors'
+require 'quandl/operation/qdate'
 
 module Quandl
   module Operation

data/lib/quandl/operation/collapse.rb

@@ -12,23 +12,18 @@ class Collapse
       return data unless data.is_a?(Array) && data.compact.present?
       # source order
       order = Parse.sort_order?(data)
+      # ensure data is in expected format
+      data = Parse.to_jd(data)
       # operations expect data in ascending order
       data = Parse.sort( data, :asc )
       # collapse
-      data = collapse_and_log(data, frequency)
+      data = collapse(data, frequency)
       # return to original order
       data = Parse.sort( data, :desc ) if order == :desc
       # onwards
       data
     end
     
-    def collapse_and_log(data, frequency)
-      t1 = Time.now
-      r = collapse(data, frequency)
-      Quandl::Logger.debug "#{self.name}.perform(#{data.try(:count)} rows, #{frequency}) (#{t1.elapsed.microseconds}ms)" if t1.elapsed.microseconds > 1
-      r
-    end
-    
     def valid_collapse?(type)
       valid?(type)
     end

data/lib/quandl/operation/collapse/guess.rb

@@ -7,15 +7,12 @@ class Guess
   
     def frequency(data)
       return :annual unless data && data[0] && data[0][0]
-      t1 = Time.now
       # find the smallest point of difference between dates
       gap = find_average_gap(data)
       # ensure gap is not negative
       gap = ensure_positive_gap(gap)
       # determine the freq from the size of the smallest gap
-      freq = frequency_from_gap(gap)
-      Quandl::Logger.debug "#{self.name}.perform (#{t1.elapsed.microseconds}ms)" if t1.elapsed.microseconds > 1
-      freq
+      frequency_from_gap(gap)
     end
   
     def find_smallest_gap(data)

data/lib/quandl/operation/core_ext/array.rb

@@ -1,6 +1,17 @@
 class Array
   def self.forwardable_methods
-    [:reject, :keep_if, :permutation, :to_a, :cycle, :drop, :take_while, :map, :rotate, :each_slice, :pack, :select!, :combination, :repeated_combination, :shift, :select, :reverse!, :==, :clear, :rotate!, :inspect, :iter_for_each, :sort_by!, :compact!, :|, :copy_data_simple, :nitems, :zip, :take, :rassoc, :flatten!, :join, :compact, :[]=, :frozen?, :slice!, :drop_while, :reverse_each, :shuffle, :slice, :reverse, :insert, :uniq, :first, :count, :fetch, :hash, :to_ary, :find_index, :replace, :-, :product, :iter_for_reverse_each, :pop, :push, :sort, :fill, :uniq!, :length, :&, :flatten, :repeated_permutation, :[], :shuffle!, :sort!, :sample, :include?, :<<, :dimensions, :collect, :+, :rindex, :<=>, :eql?, :indices, :collect!, :iter_for_each_index, :iter_for_each_with_index, :index, :*, :indexes, :copy_data, :delete, :to_s, :assoc, :delete_at, :unshift, :delete_if, :empty?, :reject!, :last, :size, :concat, :map!, :at, :each_index, :transpose, :values_at, :each, :enum_cons, :group_by, :enum_with_index, :entries, :with_object, :chunk, :each_with_index, :min, :inject, :one?, :partition, :enum_slice, :none?, :max_by, :any?, :flat_map, :reduce, :each_entry, :find, :minmax_by, :collect_concat, :each_cons, :member?, :max, :sort_by, :detect, :all?, :minmax, :grep, :each_with_object, :find_all]
+    [:reject, :keep_if, :to_a, :cycle, :drop, :map, :rotate, :each_slice, :pack, :select!, 
+      :combination, :repeated_combination, :shift, :select, :reverse!, :==, :clear, :rotate!, :inspect, :iter_for_each, 
+      :sort_by!, :compact!, :|, :copy_data_simple, :nitems, :zip, :take, :rassoc, :flatten!, :join, :compact, :[]=, 
+      :frozen?, :slice!, :drop_while, :reverse_each, :shuffle, :slice, :reverse, :insert, :uniq, :first, :count, :fetch, 
+      :hash, :to_ary, :find_index, :replace, :-, :product, :iter_for_reverse_each, :pop, :push, :sort, :fill, :uniq!, 
+      :length, :&, :flatten, :repeated_permutation, :[], :shuffle!, :sort!, :sample, :include?, :<<, :dimensions, 
+      :collect, :+, :rindex, :<=>, :eql?, :indices, :collect!, :iter_for_each_index, :iter_for_each_with_index, :index, 
+      :*, :indexes, :copy_data, :delete, :to_s, :assoc, :delete_at, :unshift, :delete_if, :empty?, :reject!, :last, 
+      :size, :concat, :map!, :at, :each_index, :transpose, :values_at, :each, :enum_cons, :group_by, :enum_with_index, 
+      :entries, :with_object, :chunk, :each_with_index, :min, :inject, :one?, :partition, :enum_slice, :none?, :max_by, 
+      :any?, :flat_map, :reduce, :each_entry, :find, :minmax_by, :collect_concat, :each_cons, :member?, :max, :sort_by, 
+      :detect, :all?, :minmax, :grep, :each_with_object, :find_all]
   end
   def average
     self.sum / self.count

data/lib/quandl/operation/errors.rb

@@ -0,0 +1,5 @@
+module Quandl::Operation::Errors
+  
+  class UnknownDateFormat < StandardError; end
+  
+end

data/lib/quandl/operation/parse.rb

@@ -1,29 +1,25 @@
-require 'csv'
-
 module Quandl
 module Operation
-  
+
 class Parse
   
   class << self
   
     def perform(data)
       return [] if data.blank?
-      t1 = Time.now
-      data = hash(data)
-      data = csv(data)
-      data = unknown_date_format_to_julian(data)
-      # data = sort(data)
-      Quandl::Logger.debug "#{self.name}.perform (#{t1.elapsed.microseconds}ms)" if t1.elapsed.microseconds > 1
-      data
+      data = hash_to_array(data)
+      data = csv_to_array(data)
+      # data = to_jd(data)
+      data = to_date(data)
+      data.dup
     end
     
-    def hash(data)
+    def hash_to_array(data)
       data = data.collect{|k,v| [k] + v } if data.kind_of?(Hash)
       data
     end
   
-    def csv(data)
+    def csv_to_array(data)
       if data.is_a?(String)
         data = data.gsub('\n', "\n")
         data = CSV.parse( data )
@@ -54,62 +50,127 @@ class Parse
       data.sort_by{|r| r[0] }.reverse
     end
     
-    def unknown_date_format_to_julian(data)
+    def to_date(data)
       return data if data_missing_rows?(data)
-      date = data[0][0]
-      # formatted like: "2013-06-18"
-      return date_to_julian(data) if date.is_a?(String) && date =~ /[0-9]{4}-[0-9]{2}-[0-9]{2}/
-      # formatted like: "2456463"
-      return julian_string_to_integer(data)
+      # guess the current date format
+      format = date_format?(data)
+      # convert dates to Date
+      case 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] )
+      end
+      # return data
+      data
     end
     
-    def date_to_julian(data)
+    def to_jd(data)
+      return data if data_missing_rows?(data)
+      # guess the current date format
+      format = date_format?(data)
+      # convert dates to Date
+      case format
+      when :jd          then return data
+      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] )
+      end
+      # return data
+      data
+    end
+    
+    def date_format?(data)
+      value = data[0][0]
+      # julian date?
+      return :date          if value.is_a?(Date)
+      return :jd            if value.is_a?(Integer)
+      return :date_string   if value.is_a?(String) && value =~ /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/
+      return :jd_string     if value.kind_of?(String) && value.numeric?
+      return :unknown
+    end
+    
+    def dates_to_jd(data)
       return data if data_missing_rows?(data) || data[0][0].is_a?(Integer)
       # dont alter by reference
       result = []
       # for each row
       data.each_with_index do |row, index|
         # copy
-        nrow = row.dup
+        row = row.dup
         # string to date
-        date = nrow[0]
-        date = Date.parse(nrow[0]) if nrow[0].is_a?(String)
+        date = row[0]
+        date = Date.parse(row[0]) if row[0].is_a?(String)
         # date to julian
-        nrow[0] = date.jd if date.respond_to?(:jd)
+        row[0] = date.jd if date.respond_to?(:jd)
         # save result
-        result[index] = nrow
+        result[index] = row
       end
       # all done
       result
     end
-  
-    def julian_to_date(data)
+    
+    
+    ###################
+    # DATES TO JULIAN #
+    ###################
+
+    def jd_strings_to_jd(data)
+      # skip when already formatted correctly
+      return data if data_missing_rows?(data) || data[0][0].is_a?(Integer)
+      # 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 )
+      end
+      output
+    end
+    
+    def date_strings_to_jd(data)
+      # skip when already formatted correctly
       return data if data_missing_rows?(data) || data[0][0].is_a?(Date)
-      # dont alter by reference
-      result = []
-      # for each row
+      # otherwise cast string jds to int
+      output = []
       data.each_with_index do |row, index|
-        # copy
-        nrow = row.dup
-        # parse date
-        nrow[0] = Date.jd( nrow[0].to_i ) unless nrow[0].is_a?(Date)
-        # save result
-        result[index] = nrow
+        output << parse_date_string(row).jd rescue raise_date_format_error!( row, index, :date_strings_to_jd )
       end
-      # all done
-      result
+      output
+    end
+
+    
+    #################
+    # DATES TO DATE #
+    #################
+
+    def jds_to_date(data)
+      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 )
+      end
+      output
     end
   
-    def julian_string_to_integer(data)
+    def date_strings_to_date(data)
       # skip when already formatted correctly
-      return data if data_missing_rows?(data) || data[0][0].is_a?(Integer) || data[0][0].is_a?(Date)
+      return data if data_missing_rows?(data) || data[0][0].is_a?(Date)
       # otherwise cast string jds to int
-      data.collect{|r| r[0] = r[0].to_i; r  }
+      output = []
+      data.each_with_index do |row, index|
+        output << parse_date_string(row) rescue raise_date_format_error!( row, index, :date_strings_to_date )
+      end
+      output
     end
     
+    
+    ###################
+    # VALUES TO FLOAT #
+    ###################
+
     def values_to_float(data)
       # skip unless value is a string
-      return data if data_missing_rows?(data) || !data[0][1].is_a?(String)
+      return data if data_missing_rows?(data) || data[0][1].is_a?(Float)
       # cast values to float
       data.collect do |row|
         new_row = [row[0]]
@@ -121,6 +182,7 @@ class Parse
       end
     end
     
+    
     def data_missing_rows?(data)
       !data_has_rows?(data)
     end
@@ -129,6 +191,47 @@ class Parse
       data.is_a?(Array) && data[0].is_a?(Array) && data[0][0].present?
     end
     
+    
+    protected
+    
+    def parse_jd(row)
+      # parse jd_string
+      row = parse_jd_string(row)
+      # jd to date
+      row[0] = Date.jd( row[0] )
+      # onwards
+      row
+    end
+    
+    def parse_jd_string(row)
+      row = row.dup
+      row[0] = row[0].to_i
+      # dont allow dates that are before 0000
+      raise Errors::UnknownDateFormat if row[0] <= 1721058
+      row
+    end
+    
+    def parse_date_string(row)
+      row = row.dup
+      # extract date
+      date = row[0]
+      # split date into parts
+      date_values = date.split('-').collect(&:to_i)
+      # ensure date is valid
+      raise Errors::UnknownDateFormat unless date_values.count == 3
+      # add to row
+      row[0] = Date.new( *date_values )
+      row
+    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 Errors::UnknownDateFormat, message
+    end
+    
   end
   
 end

data/lib/quandl/operation/qdate.rb

@@ -0,0 +1,22 @@
+module Quandl
+module Operation
+
+class QDate
+
+  class << self
+    def parse(value)
+      date = Date.jd(value.to_i) if value.kind_of?(String) && value.numeric?
+      date = Date.jd(value) if value.is_a?(Integer)
+      date = Date.parse(value) if value.is_a?(String) && value =~ /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/
+      date = value if value.is_a?(Date)
+      date = value.to_date if value.respond_to?(:to_date)
+      date
+    rescue
+      nil
+    end
+  end
+
+end
+
+end
+end

data/lib/quandl/operation/transform.rb

@@ -1,9 +1,10 @@
 module Quandl
 module Operation
-  
+
 class Transform
+  
   class << self
-
+    
     def perform( data, type )
       return data unless data.is_a?(Array) && data.compact.present?
       # original order
@@ -13,20 +14,13 @@ class Transform
       # operations expect float values
       data = Parse.values_to_float(data)
       # transform
-      data = transform_and_log( data, type )
+      data = transform( data, type)
       # return to original order
       data = Parse.sort( data, :desc ) if order == :desc
       # onwards
       data
     end
     
-    def transform_and_log( data, type)
-      t1 = Time.now
-      r = transform( data, type)
-      Quandl::Logger.debug "#{self.name}.perform(#{data.try(:count)} rows, #{type}) (#{t1.elapsed.microseconds}ms)" if t1.elapsed.microseconds > 1
-      r
-    end
-    
     def valid_transformation?(type)
       valid?(type)
     end
@@ -164,6 +158,7 @@ class Transform
     end
     
   end
+  
 end
 end
 end

data/lib/quandl/operation/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Operation
-  VERSION = "0.1.23"
+  VERSION = "0.2.0"
 end
 end

data/spec/lib/quandl/operation/parse_spec.rb

@@ -4,39 +4,66 @@ require 'spec_helper'
 describe Quandl::Operation::Parse do
   subject{ Quandl::Operation::Parse }
   let(:escaped_csv){ '2444628,0.00385,0.001,0.123,0.00631,0.534\n2444627,0.00384,0.00159507,0.0056,0.00628948,0.009896' }
-  let(:data_array){ [[ 2444628,0.00385,0.001,0.123,0.00631,0.534], [ 2444627,0.00384,0.00159507,0.0056,0.00628948,0.009896 ]] }
-  
+  let(:data_array){ [[ Date.jd(2444628),0.00385,0.001,0.123,0.00631,0.534], [ Date.jd(2444627),0.00384,0.00159507,0.0056,0.00628948,0.009896 ]] }
+
   let(:csv_data){ "#{Date.today}, 1.0, 2.0" }
   let(:hash_data){ { Date.today.to_s => [ 1.0, 2.0 ] } }
   let(:array_data){ [[ Date.today.to_s, 1.0, 2.0 ]] }
   let(:julian_data){ [[ Date.today.jd, 1.0, 2.0 ]] }
+  let(:date_data){ [[ Date.today, 1.0, 2.0 ]] }
   
   it "#hash outputs array" do
-    subject.hash( hash_data ).should eq array_data
+    subject.hash_to_array( hash_data ).should eq array_data
   end
   
   it "#csv outputs array" do
-    subject.csv( csv_data ).should eq array_data
+    subject.csv_to_array( csv_data ).should eq array_data
   end
   
   describe "#perform" do
-    it "should handle csv_data" do
-      subject.perform( csv_data ).should eq julian_data
-    end
-    it "should handle julian_data" do
-      subject.perform( julian_data ).should eq julian_data
-    end
-    it "should handle hash_data" do
-      subject.perform( hash_data ).should eq julian_data
+  
+    [:csv, :hash, :array, :julian, :date].each do |type|
+      context "#{type} data" do
+        it "should eq date_data" do
+          subject.perform( self.send("#{type}_data") ).should eq date_data
+        end
+        it "values should be_a Float" do
+          subject.perform( self.send("#{type}_data") ).each{|r| r[1..-1].each{|v| v.should be_a Float } }
+        end
+      end
     end
-    it "should handle array_data" do
-      subject.perform( array_data ).should eq julian_data
+  
+  
+    let(:csv1){ "2012-12-31,20.0,10.0,35.0,35.0,20.0,28.0,30.0,25.0,0.0,0.0,27.5,25.0,18.0,33.99,0.0,25.0,0.0,10.0,22.0,34.0,10.0,20.0,26.0,0.0,18.5,25.0,33.0,30.0,20.0,27.5,10.0,19.0,25.0,29.0,23.0,25.0,21.0,30.0,28.0,24.5,33.33,0.0,29.48,10.0,20.0,31.0,0.0,35.0,16.5,19.0,20.0,32.45,25.0,12.5,0.0,25.0,31.4,33.33,38.01,0.0,14.0,20.0,30.0,24.2,15.0,15.0,20.0,12.5,15.0,28.8,12.0,10.0,30.0,25.0,35.0,15.0,30.0,9.0,32.0,34.0,25.0,28.0,30.0,28.0,12.0,35.0,25.0,30.0,10.0,30.0,30.0,19.0,25.0,10.0,16.0,20.0,0.0,27.0,20.0,10.0,17.0,19.0,18.0,34.55,30.0,28.0,0.0,34.5,35.0,26.3,21.17,28.0,17.0,30.0,23.0,25.0,30.0,20.0,30.0,21.0,55.0,24.0,40.0,25.0,0.0,34.0,25.0,20.0,35.0,25.75,29.02,33.0,22.89,20.5,28.3,28.6,22.6,25.25,24.43\n2011-12-31,20.0,10.0,35.0,35.0,20.0,28.0,30.0,25.0,0.0,0.0,27.5,25.0,24.0,33.99,0.0,0.0,0.0,10.0,22.0,34.0,10.0,20.0,28.0,0.0,20.0,25.0,33.0,30.0,20.0,34.5,10.0,19.0,25.0,29.0,24.0,20.0,21.0,0.0,28.0,26.0,33.33,0.0,29.37,10.0,20.0,31.0,0.0,35.0,16.5,19.0,20.0,32.44,25.0,12.5,0.0,24.0,31.4,33.33,40.69,0.0,14.0,20.0,0.0,22.0,15.0,15.0,20.0,12.5,15.0,28.8,12.0,10.0,0.0,25.0,35.0,15.0,30.0,9.0,32.0,34.0,25.0,28.0,30.0,28.0,12.0,35.0,25.0,30.0,10.0,30.0,30.0,19.0,25.0,10.0,16.0,20.0,0.0,27.0,20.0,10.0,17.0,19.0,20.0,34.55,30.0,28.0,0.0,34.5,35.0,26.3,21.17,28.0,17.0,30.0,30.0,0.0,30.0,20.0,30.0,25.0,55.0,26.0,40.0,25.0,0.0,34.0,25.0,20.0,35.0,25.75,28.55,34.0,23.1,20.88,29.02,28.6,22.8,25.5,24.52\n2010-12-31,20.0,10.0,35.0,35.0,20.0,28.0,30.0,25.0,0.0,0.0,27.5,25.0,24.0,33.99,0.0,25.0,0.0,10.0,25.0,34.0,10.0,20.0,31.0,0.0,17.0,25.0,33.0,30.0,20.0,0.0,10.0,19.0,25.0,25.0,25.0,20.0,21.0,0.0,28.0,26.0,33.33,0.0,29.41,22.0,24.0,31.0,0.0,25.0,16.5,19.0,18.0,33.99,25.0,12.5,0.0,25.0,31.4,33.33,40.69,0.0,14.0,20.0,0.0,24.2,15.0,15.0,40.0,0.0,15.0,28.59,12.0,10.0,0.0,25.0,35.0,15.0,30.0,9.0,32.0,0.0,25.5,30.0,30.0,28.0,12.0,35.0,27.5,30.0,10.0,30.0,30.0,19.0,25.0,10.0,16.0,20.0,0.0,27.0,20.0,10.0,17.0,19.0,20.0,34.55,30.0,35.0,0.0,0.0,15.0,26.3,21.17,28.0,17.0,30.0,30.0,0.0,30.0,20.0,30.0,25.0,55.0,28.0,40.0,25.0,0.0,34.0,25.0,35.0,35.0,25.75,28.38,35.5,23.96,21.52,27.52,29.0,23.04,25.79,24.71\n2009-12-31,20.0,10.0,35.0,35.0,20.0,28.0,30.0,25.0,0.0,0.0,27.5,25.0,24.0,33.99,0.0,0.0,0.0,10.0,25.0,34.0,10.0,0.0,33.0,0.0,17.0,25.0,33.0,30.0,20.0,0.0,10.0,20.0,25.0,25.0,25.0,20.0,21.0,0.0,29.0,26.0,33.33,0.0,29.44,27.0,25.0,31.0,0.0,30.0,16.5,16.0,15.0,33.99,28.0,12.5,0.0,26.0,31.4,33.33,40.69,0.0,25.0,20.0,0.0,24.2,15.0,15.0,40.0,0.0,20.0,28.59,12.0,10.0,0.0,25.0,35.0,15.0,28.0,9.0,32.0,0.0,25.5,30.0,30.0,28.0,12.0,35.0,30.0,30.0,10.0,30.0,30.0,19.0,25.0,35.0,16.0,20.0,0.0,27.0,20.0,10.0,18.0,19.0,21.0,34.55,30.0,35.0,0.0,0.0,15.0,26.3,21.17,28.0,25.0,30.0,30.0,0.0,30.0,20.0,30.0,25.0,55.0,28.0,40.0,25.0,0.0,34.0,25.0,35.0,35.0,30.9,28.75,36.5,25.73,21.7,27.96,29.2,23.22,25.73,25.4\n2008-12-31,20.0,10.0,35.0,35.0,20.0,28.0,30.0,25.0,0.0,0.0,30.0,25.0,24.0,33.99,0.0,0.0,0.0,10.0,25.0,34.0,10.0,0.0,33.5,0.0,17.0,25.0,33.0,30.0,20.0,0.0,10.0,21.0,25.0,25.0,25.0,20.0,21.0,0.0,31.0,26.0,33.33,0.0,29.51,33.0,25.0,31.0,0.0,30.0,16.5,16.0,15.0,33.99,30.0,12.5,0.0,27.0,31.4,33.33,40.69,0.0,25.0,30.0,0.0,27.5,55.0,15.0,40.0,0.0,15.0,29.63,12.0,10.0,0.0,26.0,35.0,15.0,28.0,9.0,32.0,0.0,25.5,30.0,30.0,28.0,12.0,35.0,30.0,30.0,10.0,30.0,35.0,19.0,25.0,35.0,16.0,24.0,0.0,27.0,20.0,10.0,18.0,19.0,22.0,34.55,30.0,35.0,0.0,0.0,15.0,28.0,21.17,28.0,25.0,0.0,30.0,0.0,30.0,20.0,30.0,25.0,55.0,30.0,40.0,25.0,0.0,34.0,28.0,35.0,35.0,30.9,28.65,36.75,27.99,22.0,27.96,29.6,23.29,26.08,26.12\n2007-12-31,20.0,20.0,35.0,35.0,20.0,28.0,30.0,25.0,0.0,0.0,30.0,25.0,24.0,33.99,0.0,0.0,0.0,10.0,25.0,34.0,10.0,0.0,36.1,0.0,17.0,33.0,34.0,30.0,20.0,0.0,10.0,24.0,25.0,25.0,25.0,20.0,22.0,0.0,31.0,26.0,33.33,0.0,38.36,35.0,25.0,31.0,0.0,30.0,17.5,16.0,18.0,33.99,30.0,12.5,0.0,29.0,37.25,33.33,40.69,0.0,25.0,30.0,0.0,27.5,55.0,15.0,40.0,0.0,15.0,29.63,12.0,12.0,0.0,27.0,35.0,22.5,28.0,9.0,32.0,0.0,25.5,33.0,30.0,28.0,12.0,35.0,30.0,30.0,10.0,30.0,35.0,19.0,25.0,35.0,16.0,24.0,0.0,27.0,20.0,10.0,20.0,19.0,23.0,36.89,32.5,35.0,0.0,0.0,30.0,28.0,21.32,28.0,25.0,0.0,30.0,0.0,30.0,20.0,30.0,25.0,55.0,30.0,40.0,30.0,0.0,34.0,28.0,35.0,35.0,30.9,30.56,38.05,28.46,23.01,28.3,30.2,24.11,27.08,26.96\n"}
+    let(:csv2){ "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" }
+
+    [:csv1, :csv2].each do |type|
+      context "#{type} data" do
+        it "dates should be_a Date" do
+          subject.perform( self.send(type) ).each{|r| r[0].should be_a Date }
+        end
+        
+        it "values should be_a Float" do
+          subject.perform( self.send(type) ).each do |row|
+            row[1..-1].each do |value|
+              next if value.nil?
+              value.should be_a Float
+            end
+          end
+        end
+        
+      end
     end
-    it "handles escaped csv_data" do
-      subject.perform( escaped_csv ).should eq data_array
+  
+    let(:invalid1){ "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(: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::Operation::Errors::UnknownDateFormat" do
+        expect { Quandl::Operation::Parse.perform( self.send(type) ) }.to raise_error Quandl::Operation::Errors::UnknownDateFormat
+      end
     end
+    
   end
   
-end
-
-
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_operation
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.2.0
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,7 +147,9 @@ files:
 - lib/quandl/operation/core_ext/float.rb
 - lib/quandl/operation/core_ext/string.rb
 - lib/quandl/operation/core_ext/time.rb
+- lib/quandl/operation/errors.rb
 - lib/quandl/operation/parse.rb
+- lib/quandl/operation/qdate.rb
 - lib/quandl/operation/transform.rb
 - lib/quandl/operation/version.rb
 - quandl_operation.gemspec