quandl_client 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf0070f8faa49f7f0c8d37861dda9dffb18dea7
-  data.tar.gz: 1d4dbd6dbb1b4bf94c49186cb844527e5ea06693
+  metadata.gz: 30cfb6f556fd81ee4c6f6b0ed1ba51404e924c10
+  data.tar.gz: 9728c368e51fcb51fcb4cafb7774d73d9e873260
 SHA512:
-  metadata.gz: 6a1eae0d8c8dcbff92ee02ad5b200f7102d3ba259970da50dce72d738c657bfeb65e1df04f61ad4ddc6d799f1d8bd7dd7d201c4237b8eaa4efca52952260d254
-  data.tar.gz: 8cb7c9a46f8c6e10f88ef161c2503a11646c5afef7aeeec4ac95e5873b437946132770b69281738a8d8097cc673981398e217ca2878529f12b944f3e9e0bc33e
+  metadata.gz: 5afdf7eaa1d4a948fd2821fc8551b8b3111b89eb8a3422555f8f7b077e39c42da40062e57caac23268354d787737812518bb4f3a6cf20a59e9b9347f0827939c
+  data.tar.gz: 8c2b4941f33058a13cb0a7d9381ef1ececd39a12d15650b49dd26ac724202386e669bf9e1b6b0cf83f43e21d7b43cd76e4705f82cf27faeff0558c111b8940f8

data/Gemfile

@@ -1,2 +1,9 @@
 source "https://rubygems.org"
 gemspec
+
+use_local_gems = ENV['BUNDLE_LOCAL_GEMS'] == "true" && ENV['BUNDLE_LOCAL_DIR']
+local_gem_dir = ENV['BUNDLE_LOCAL_DIR']
+
+if use_local_gems
+  gem 'her', path: "#{local_gem_dir}/her"
+end

data/UPGRADE.md

@@ -1,3 +1,15 @@
+## 2.2.0
+
+* add specs for Dataset.query
+* Dataset.query.all.metadata should pass
+
+
+## 2.1.4
+
+* add specs for Dataset.query(term).all; make specs pass
+
+
+
 ## 2.1.3
 
 * add specs for data scopes

data/examples/{client.rb → create.rb}

@@ -7,7 +7,7 @@ require 'securerandom'
 
 include Quandl::Client
 
-Quandl::Client.use 'http://quandl.com/api/'
+Quandl::Client.use ENV['QUANDL_API_HOST']
 Quandl::Client.token = ENV['QUANDL_USER_TOKEN']
 
 # create dataset

data/examples/search.rb

@@ -0,0 +1,14 @@
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require 'pry'
+require "quandl/client"
+
+include Quandl::Client
+
+Quandl::Client.use ENV['QUANDL_API_HOST']
+# Quandl::Client.use 'http://staging.quandl.com/api/'
+Quandl::Client.token = ENV['QUANDL_USER_TOKEN']
+
+datasets = Dataset.query('water').all
+
+binding.pry

data/lib/quandl/client/base/search.rb

@@ -16,7 +16,7 @@ module Search
     has_scope_composer
 
     scope :with_id,      ->(value)   { where( id: value.to_i )}
-    scope_helper :all, ->{ connection.where(attributes).fetch }
+    scope_helper :all, ->{ connection.where(attributes_with_scopes).fetch }
     scope_helper :connection, -> { self.class.parent }
     
     scope.class_eval do
@@ -28,16 +28,19 @@ module Search
       end
     
       def fetch
-        find(attributes[:id])
+        find(attributes_with_scopes[:id])
       end
     
       def find(id)
-        attrs = attributes.merge(scope_attributes)
-        result = self.class.parent.where( attrs ).find(id)
+        result = self.class.parent.where( attributes_with_scopes ).find(id)
         result = self.class.parent.new(id: id) if result.nil?
         result
       end
-    
+      
+      def attributes_with_scopes
+        attributes.merge(scope_attributes)
+      end
+      
     end
   
   end

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

@@ -12,9 +12,13 @@ class ParseJSON < Faraday::Response::Middleware
       parse(env[:body], env)
     end
   end
-
+  
   def parse(body, env)
     json = parse_json(body, env)
+    json.has_key?(:docs) ? format_collection( json, env ) : format_record( json, env )
+  end
+  
+  def format_record(json, env)
     errors = json.delete(:errors) || {}
     metadata = json.delete(:metadata) || {}
     # collect some response data
@@ -31,6 +35,25 @@ class ParseJSON < Faraday::Response::Middleware
     env[:status] = 200
     object
   end
+  
+  def format_collection(json, env)
+    errors = json.delete(:errors) || {}
+    metadata = json.delete(:metadata) || {}
+    docs = json.delete(:docs)
+    # collect some response data
+    metadata.merge!(json).merge!({
+      status:                 env[:status],
+      headers:                env[:response_headers],
+      })
+    # return object
+    object = {
+      :data => docs,
+      :errors => errors,
+      :metadata => metadata
+    }
+    env[:status] = 200
+    object
+  end
 
   def parse_json(body = nil, env)
     body ||= '{}'

data/lib/quandl/client/models/dataset.rb

@@ -1,6 +1,9 @@
 class Quandl::Client::Dataset < Quandl::Client::Base
   
   require 'quandl/client/models/dataset/data'
+
+  # parse_root_in_json true
+  # root_element :docs
   
   ##########  
   # SCOPES #

data/lib/quandl/client/version.rb

@@ -1,6 +1,6 @@
 module Quandl
 module Client
-  VERSION = '2.1.4'
+  VERSION = '2.2.0'
   API_VERSION = 'v2'
   
   class << self

data/quandl_client.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry"
 
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "her", "0.6.7"
+  s.add_runtime_dependency "her", "~> 0.6"
   s.add_runtime_dependency "yajl-ruby", "~> 1.1.0"
   s.add_runtime_dependency 'json', '~> 1.7.7'
   
   s.add_runtime_dependency "scope_composer", "~> 0.3"
-  s.add_runtime_dependency "quandl_data", "~> 1.1"
+  s.add_runtime_dependency "quandl_data", "~> 1.2"
   
 end

data/spec/lib/quandl/client/dataset/data_spec.rb

@@ -63,10 +63,10 @@ describe Quandl::Client::Dataset::Data do
   describe "#delete_rows" do
     subject{ Dataset.find( dataset.id ) }
     
-    let(:dates_slice){ dataset.data.to_h.keys[5..8] }
+    let(:dates_slice){ dataset.data.to_date.to_h.keys[5..8] }
     
     it "should have the dates" do
-      dates = Dataset.find( dataset.id ).data.to_h.keys
+      dates = Dataset.find( dataset.id ).data.to_date.to_h.keys
       dates_slice.each{|date| dates.include?(date).should be_true }
     end
     
@@ -74,7 +74,7 @@ describe Quandl::Client::Dataset::Data do
     
       before(:each){ subject.delete_rows(dates_slice) }
       
-      it "data count should be 16" do
+      it "data count should be 6" do
         Dataset.find( dataset.id ).data.count.should eq 6
       end
     

data/spec/lib/quandl/client/dataset_spec.rb

@@ -8,10 +8,26 @@ describe Dataset do
   describe ".touch_existing(:id)" do
     it "should touch the dataset" do
       dataset.updated_at
-      sleep(0.75)
+      sleep(1)
       Dataset.touch_existing(subject.id).should eq true
       Dataset.find(subject.id).updated_at.should_not eq dataset.updated_at
     end
   end
   
+  describe ".query" do
+    let(:datasets){ Quandl::Client::Dataset.query('oil').all }
+    subject{ datasets }
+
+    its(:first){ should be_a Quandl::Client::Dataset }
+    
+    describe "#metadata" do
+      subject{ OpenStruct.new(datasets.metadata) }
+      its(:total_count){ should > 1 }
+      its(:per_page){ should eq 20 }
+      its(:sources){ should be_present }
+      its(:status){ should eq 200 }
+      its(:current_page){ should eq 1 }
+    end
+  end
+  
 end

data/spec/spec_helper.rb

@@ -11,11 +11,11 @@ require "quandl/client"
 require "quandl/fabricate"
 
 include Quandl::Client
+Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
 Quandl::Client.use ENV['QUANDL_API_HOST']
 # Quandl::Client.use 'http://staging.quandl.com/api/'
 # Quandl::Client.use 'http://67.202.27.116:8080/api/'
 # Quandl::Client.use 'http://quandl.com/api/'
-Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_client
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,16 +98,16 @@ dependencies:
   name: her
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: An orm for the cassinatra rest interface.
 email:
 - blake@hilscher.ca
@@ -180,7 +180,8 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
-- examples/client.rb
+- examples/create.rb
+- examples/search.rb
 - examples/trims.rb
 - lib/quandl/client.rb
 - lib/quandl/client/base.rb