quandl_operation 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f793e84f6b1444296a2139214ac181e0a3175db5
-  data.tar.gz: 1e07e11fac0532a64bb51a61227b76d33ba20ff6
+  metadata.gz: 8bc77362c57fff96b7d468ed11ecf3ced455cbcc
+  data.tar.gz: d63f23908949e9bd62b909772167c0569d146e66
 SHA512:
-  metadata.gz: 72f3392d5646b4fac36ac7d83b11c0d53481b1bb4ed12c237b40c7acdb554f35450e9376ff6000fa3cb80fe3dd3c52116011301090bdf4dc7c2273ba0e5ab341
-  data.tar.gz: 8bd50d06f6f8b57789694840594b9ff34e3326052cb05d4bc2f881e302c8432819d587e78217c85ade3866f34d417e14e6786a8c3bf2f98744e659bb342399f3
+  metadata.gz: d865104a72d0e0f9b01805489adbdd9ba1c96415e668191ce403c85e3766d497abd5276ade91eb504433f5e3f28e6757aa89f78010d6d397e3602ab5ebfea858
+  data.tar.gz: 5679b97f828bad24bdf8b53db30d01f6be47cb88f5429aba204d752c1d47e5b7d47f97e7b875d9128fe53da1ef217c1b4e7ac01afae7618a8879bec2171541d2

data/UPGRADE.md

@@ -1,3 +1,9 @@
+## 0.2.1
+
+* assert valid arguments for collapse and transform
+* fix parse_date_string jd
+
+
 ## 0.2.0
 
 * rename Parse methods to be more informative

data/lib/quandl/operation/collapse.rb

@@ -8,22 +8,29 @@ class Collapse
 
   class << self
   
-    def perform(data, frequency)
-      return data unless data.is_a?(Array) && data.compact.present?
-      # source order
-      order = Parse.sort_order?(data)
+    def perform(data, type)
+      assert_valid_arguments!(data, type)
+      # nothing to do with an empty array
+      return data unless data.compact.present?
       # ensure data is in expected format
       data = Parse.to_jd(data)
+      # source order
+      order = Parse.sort_order?(data)
       # operations expect data in ascending order
       data = Parse.sort( data, :asc )
       # collapse
-      data = collapse(data, frequency)
+      data = collapse(data, type)
       # return to original order
       data = Parse.sort( data, :desc ) if order == :desc
       # onwards
       data
     end
     
+    def assert_valid_arguments!(data, type)
+      raise ArgumentError, "data must be an Array. Received: #{data.class}" unless data.is_a?(Array)
+      raise ArgumentError, "frequency must be one of #{valid_collapses}. Received: #{type}" unless valid?(type)
+    end
+    
     def valid_collapse?(type)
       valid?(type)
     end

data/lib/quandl/operation/parse.rb

@@ -133,7 +133,9 @@ class Parse
       # otherwise cast string jds to int
       output = []
       data.each_with_index do |row, index|
-        output << parse_date_string(row).jd rescue raise_date_format_error!( row, index, :date_strings_to_jd )
+        row = parse_date_string(row) rescue raise_date_format_error!( row, index, :date_strings_to_jd )
+        row[0] = row[0].jd
+        output << row
       end
       output
     end

data/lib/quandl/operation/transform.rb

@@ -6,7 +6,9 @@ class Transform
   class << self
     
     def perform( data, type )
-      return data unless data.is_a?(Array) && data.compact.present?
+      assert_valid_arguments!(data, type)
+      # nothing to do with an empty array
+      return data unless data.compact.present? 
       # original order
       order = Parse.sort_order?(data)
       # operations expect data in ascending order
@@ -21,6 +23,11 @@ class Transform
       data
     end
     
+    def assert_valid_arguments!(data, type)
+      raise ArgumentError, "data must be an Array. Received: #{data.class}" unless data.is_a?(Array)
+      raise ArgumentError, "frequency must be one of #{valid_transformations}. Received: #{type}" unless valid?(type)
+    end
+    
     def valid_transformation?(type)
       valid?(type)
     end

data/lib/quandl/operation/version.rb

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

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

@@ -46,10 +46,10 @@ describe Quandl::Operation::Collapse do
   describe ".perform" do
   
     let(:data){
-      [[2456537, 56.2, nil, nil], 
+      Quandl::Operation::Parse.to_date([[2456537, 56.2, nil, nil], 
        [2456518, 55.7, nil, nil], [2456506, nil, 136133.0, nil], 
        [2456487, 55.4, nil, nil], [2456475, nil, 135964.0, nil], 
-       [2456457, 50.9, nil, nil], [2456445, nil, 135860.0, nil]]
+       [2456457, 50.9, nil, nil], [2456445, nil, 135860.0, nil]])
     }
     
     it "should collapse data with nils" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_operation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Blake Hilscher