quandl_client 0.1.14 → 0.1.15

data/UPGRADE.md

@@ -1,3 +1,8 @@
+## 0.1.15
+
+* revise parse_json to respond with more informative error
+* validation errors should return 422
+
 ## 0.1.14
 
 * add Dataset#locations spec to test that location data is returned in the same order as it is sent.

data/lib/quandl/client/middleware/parse_json.rb

@@ -14,7 +14,7 @@ class ParseJSON < Faraday::Response::Middleware
   end
 
   def parse(body, env)
-    json = parse_json(body)
+    json = parse_json(body, env)
     errors = json.delete(:errors) || {}
     metadata = json.delete(:metadata) || {}
     # collect some response data
@@ -32,19 +32,23 @@ class ParseJSON < Faraday::Response::Middleware
     object
   end
 
-  def parse_json(body = nil)
+  def parse_json(body = nil, env)
     body ||= '{}'
-    message = "Response from the API must behave like a Hash or an Array (last JSON response was #{body.inspect})"
-
     json = begin
       Yajl.load(body, :symbolize_keys => true)
     rescue Yajl::ParseError
-      { id: 1, errors: { parse_error: message } }
-      
-      # raise Her::Errors::ParseError, message
+      nil
+    end
+    # invalid json body?
+    if json.blank?
+      # fallback to error message
+      json = { 
+        id: 1, 
+        errors: {
+          parse_error:  "Quandl::Client::ParseJSON error. status: #{env[:status]}, body: #{body.inspect}"
+        }
+      }
     end
-    # raise Her::Errors::ParseError, message unless json.is_a?(Hash) or json.is_a?(Array)
-
     json
   end
 

data/lib/quandl/client/version.rb

@@ -1,6 +1,6 @@
 module Quandl
 module Client
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
   API_VERSION = 'v1'
   
   class << self

data/spec/quandl/client/dataset/location_spec.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dataset do
+  
+  subject{
+    build(:dataset, source_code: create(:source).code )
+  }
+  
+  describe "#availability_delay" do
+    context "given valid input" do
+      it "saves the delay" do
+        delay = '02:00:10'
+        subject.availability_delay = delay
+        subject.save
+        Dataset.find(subject.id).availability_delay.should eq delay
+      end
+      
+    end
+  end
+
+  describe "#locations" do
+    context "with navigation" do      
+      it "should return the data in the right order" do
+        locations = [
+          {
+            category:     'js_http',
+            url:      "http://test-#{(Time.now.to_f * 1000).to_i}.com/data",
+            navigation: [
+              {:id => 'id303', :type => 'link'},
+              {:name => 'selectionname', :type => 'text', :value => 'cd' },
+              {:name => 'auswaehlen', :type => 'button'},
+              {:id => "id#cd", :type => 'link'},
+              {:name => 'werteabruf', :type => 'button'}
+            ]
+          }
+        ]
+        subject.locations = locations
+        subject.save
+        dataset = Dataset.find(subject.id)
+        dataset.locations[0][:category].should eq locations[0][:category]
+        dataset.locations[0][:url].should eq locations[0][:url]
+        dataset.locations[0][:navigation].should eq locations[0][:navigation]
+      end
+    end
+    context "datasets sharing location" do
+      
+      let(:location){ [{ category: "http", url: "http://www.bankofcanada.ca/rates/price-indexes/cpi/"}] }
+      let(:dataset1){ create(:dataset, source_code: create(:source).code, locations: location ) }
+      let(:dataset2){ create(:dataset, source_code: create(:source).code, locations: location ) }
+      
+      it "should share the location" do
+        Dataset.find(dataset1.id).locations.should eq Dataset.find(dataset2.id).locations
+      end
+      
+      it "should update the dataset" do
+        d = Dataset.find(dataset1.id)
+        d.data = [[ Date.today, 42, 68 ]]
+        d.save
+        d.status.should eq 200
+      end
+      
+    end
+  end
+  
+end

data/spec/quandl/client/{models/dataset → dataset}/persistence_spec.rb

@@ -37,11 +37,12 @@ describe Dataset do
   context "when updated" do
 
     let(:source){ create(:source) }
-    let(:dataset){ create(:dataset, source_code: source.code, data: Quandl::Data::Random.table(rows: 20, columns: 2).to_csv ) }
-        
-    it "should change data" do
+    let(:dataset){ create(:dataset, source_code: source.code, data: Quandl::Data::Random.table(rows: 20, columns: 2, nils: false).to_csv ) }
+    subject{ Dataset.find(dataset.id) }
+    
+    
+    it "should update data" do
       # update the dataset
-      subject = Dataset.find(dataset.id)
       new_row = [ subject.data_table[0][0], 1.0, 2.0]
       subject.data = [ new_row ]
       subject.save
@@ -49,13 +50,33 @@ describe Dataset do
       Dataset.find(dataset.id).data_table.sort_descending[0].should eq new_row
     end
     
-    it "should change column_spec" do
-      subject = Dataset.find(dataset.id)
+    it "should update column_spec" do
       subject.column_spec = "[0,[\"Date \\n\",{}],[\"Column 1 \",{}],[\"New Column Name \",{}]]"
       subject.save
       Dataset.find(dataset.id).column_spec.should eq subject.column_spec
     end
     
+    context "with new rows" do
+      
+      it "should include new row" do
+        new_data = 10.times.collect{|i| [Date.parse(subject.to_date) + i + 1, rand(12), rand(12) ] }
+        new_data = Quandl::Data::Table.new(new_data).sort_descending
+        subject.data = new_data
+        subject.save
+        updated_dataset = Dataset.find(subject.id)
+        updated_dataset.data_table.to_date[0].should eq new_data.to_date[0]
+      end
+      
+      it "should include old rows" do
+        new_data = 10.times.collect{|i| [Date.parse(subject.to_date) + i + 2, rand(12), rand(12) ] }
+        new_data = Quandl::Data::Table.new(new_data).sort_descending
+        subject.data = new_data
+        subject.save
+        updated_dataset = Dataset.find(subject.id)
+        updated_dataset.data_table.count.should eq 30
+      end
+    end
+    
   end
   
 end

data/spec/quandl/client/dataset/trim_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dataset do
+  
+  let(:source){ create(:source) }
+  subject{ build(:dataset, source_code: source.code, data: Quandl::Data::Random.table(rows: 20, columns: 2) ) }
+  
+  describe "#from_date" do
+    context "before_save" do
+      it "should be nil" do
+        subject.from_date.should be_nil
+      end
+    end
+    context "after_save" do
+      before(:each){ subject.save }
+      it "should equal the last date" do
+        subject.from_date.should eq subject.data_table.to_date[-1][0].to_s
+      end
+    end
+  end
+  
+  describe "#to_date" do
+    context "before_save" do
+      it "should be nil" do
+        subject.to_date.should be_nil
+      end
+    end
+    context "after_save" do
+      before(:each){ subject.save }
+      it "should equal the first date" do
+        subject.to_date.should eq subject.data_table.to_date[0][0].to_s
+      end
+    end
+  end
+  
+end

data/spec/quandl/client/dataset/validation_spec.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dataset do
+  
+  describe "#code" do
+
+    before(:all){ Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN'] }
+    
+    let(:source){ create(:source) }
+    let(:dataset){ create(:dataset, source_code: source.code ) }
+    let(:invalid_dataset){ create(:dataset, source_code: source.code, code: dataset.code ) }
+    subject{ invalid_dataset }
+    
+    it "should create the dataset" do
+      dataset.status.should eq 201
+    end
+    
+    its(:saved?){ should be_false }
+    its(:status){ should eq 422 }
+    
+  end
+  
+
+end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ require "quandl/client"
 
 include Quandl::Client
 Quandl::Client.use 'http://localhost:3000/api/'
+# Quandl::Client.use 'http://staging.quandl.com/api/'
 Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_client
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -252,10 +252,12 @@ files:
 - quandl_client.gemspec
 - spec/factories/dataset.rb
 - spec/factories/source.rb
-- spec/quandl/client/models/dataset/location_spec.rb
-- spec/quandl/client/models/dataset/persistence_spec.rb
-- spec/quandl/client/models/dataset/search_spec.rb
-- spec/quandl/client/models/source_spec.rb
+- spec/quandl/client/dataset/location_spec.rb
+- spec/quandl/client/dataset/persistence_spec.rb
+- spec/quandl/client/dataset/search_spec.rb
+- spec/quandl/client/dataset/trim_spec.rb
+- spec/quandl/client/dataset/validation_spec.rb
+- spec/quandl/client/source_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
 licenses:
@@ -285,8 +287,10 @@ summary: Client rest orm.
 test_files:
 - spec/factories/dataset.rb
 - spec/factories/source.rb
-- spec/quandl/client/models/dataset/location_spec.rb
-- spec/quandl/client/models/dataset/persistence_spec.rb
-- spec/quandl/client/models/dataset/search_spec.rb
-- spec/quandl/client/models/source_spec.rb
+- spec/quandl/client/dataset/location_spec.rb
+- spec/quandl/client/dataset/persistence_spec.rb
+- spec/quandl/client/dataset/search_spec.rb
+- spec/quandl/client/dataset/trim_spec.rb
+- spec/quandl/client/dataset/validation_spec.rb
+- spec/quandl/client/source_spec.rb
 - spec/spec_helper.rb

data/spec/quandl/client/models/dataset/location_spec.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Dataset do
-  
-  subject{
-    build(:dataset, source_code: create(:source).code )
-  }
-  
-  describe "#availability_delay" do
-    context "given valid input" do
-      it "saves the delay" do
-        delay = '02:00:10'
-        subject.availability_delay = delay
-        subject.save
-        Dataset.find(subject.id).availability_delay.should eq delay
-      end
-      
-    end
-  end
-
-  describe "#locations" do
-    it "should save and return the location data" do
-      locations = [
-        {
-          category:     'js_http',
-          url:      "http://test-#{(Time.now.to_f * 1000).to_i}.com/data",
-          navigation: [
-            {:id => 'id303', :type => 'link'},
-            {:name => 'selectionname', :type => 'text', :value => 'cd' },
-            {:name => 'auswaehlen', :type => 'button'},
-            {:id => "id#cd", :type => 'link'},
-            {:name => 'werteabruf', :type => 'button'}
-          ]
-        }
-      ]
-      subject.locations = locations
-      subject.save
-      dataset = Dataset.find(subject.id)
-      dataset.locations[0][:category].should eq locations[0][:category]
-      dataset.locations[0][:url].should eq locations[0][:url]
-      dataset.locations[0][:navigation].should eq locations[0][:navigation]
-    end
-  end
-  
-end