quandl_client 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1aa6dec90e010ea28015ad8d64597bd4f62740
-  data.tar.gz: d7a7ab62d300cc027c55cc448299ec2b30df5bcf
+  metadata.gz: 157ba17ffc15b48c794cabd8eac6fc849345f125
+  data.tar.gz: 0d880279cca152565a9cc2b396328d49a02c8557
 SHA512:
-  metadata.gz: e198ce8a28d9501a8e2b384aab223f888688bf35fcb5a13356254c4d9abf1fc405699d40e1eec555ad672880fe837f0b482736017f227aef10589251716b6caf
-  data.tar.gz: 827642e483201531124d368852a2d473b760d715e2951404488facc5867bc713e6f023b83b5aacd39f1a549997b84623ee8a3afd6f8b16ebba9e6c820262081d
+  metadata.gz: dd2ba5539f6be665dcead9aafcc35cb5574379852061d7726e137a1ef8f35d16587a11d0fed704b67cd70f911be3a6e71c7370928600f7b40e4bbf1f6767a75a
+  data.tar.gz: 9eea7027c039f62c5bfc9850376b1c18c796a3f7cc5455e2b245d8ada84b769bbddbaa5578efb95771dde159f71770154311147e8e49f875f742ece70286e428

data/UPGRADE.md

@@ -1,3 +1,9 @@
+## 2.1.3
+
+* add specs for data scopes
+* fix failing data scope specs
+
+
 ## 2.1.2
 
 * bump quandl_data, operation, logger

data/examples/client.rb

@@ -3,10 +3,22 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'pry'
 require "quandl/client"
 require "quandl/fabricate"
+require 'securerandom'
 
 include Quandl::Client
 
 Quandl::Client.use 'http://quandl.com/api/'
-Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
+Quandl::Client.token = ENV['QUANDL_USER_TOKEN']
+
+# create dataset
+d = Dataset.new
+d.code = "TEST_#{SecureRandom.hex[0..10]}".upcase
+d.name = 'Blake Test Dataset'
+d.save
+
+# update dataset's data
+new_data = Quandl::Fabricate::Data.rand( rows: 10, columns: 2, nils: false ).to_date.to_csv
+d.data = new_data
+d.save
 
 binding.pry

data/examples/trims.rb

@@ -0,0 +1,16 @@
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require 'pry'
+require "quandl/client"
+
+include Quandl::Client
+
+Quandl::Client.use 'http://quandl.com/api/'
+Quandl::Client.token = ENV['QUANDL_USER_TOKEN']
+
+# create dataset
+d = Dataset.find('NSE/OIL')
+
+data = d.data.trim_start( 3.weeks.ago ).limit(10)
+
+binding.pry

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

@@ -20,7 +20,7 @@ module Search
     scope_helper :connection, -> { self.class.parent }
     
     scope.class_eval do
-    
+
       delegate *Array.forwardable_methods.reject{|m| [:find, :fetch].include?(m) }, to: :all
       
       def fetch_once
@@ -32,7 +32,9 @@ module Search
       end
     
       def find(id)
-        result = self.class.parent.where(attributes).find(id)
+        attrs = attributes.merge(scope_attributes)
+        puts attrs
+        result = self.class.parent.where( attrs ).find(id)
         result = self.class.parent.new(id: id) if result.nil?
         result
       end

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

@@ -4,16 +4,32 @@ class Quandl::Client::Dataset::Data < Quandl::Client::Base
   
   has_scope_composer
   
-  scope *[:row, :rows, :limit, :offset, :accuracy, :column, :order, 
-    :trim_start, :trim_end, :transform, :collapse, :exclude_headers]
-  
-  scope_helper :to_table, -> { fetch_once.data }
-  
   scope.class_eval do
     delegate *Quandl::Client::Dataset::Data.forwardable_scope_methods, :to_h, to: :to_table, allow_nil: true
     delegate *Quandl::Data.forwardable_methods, to: :to_table, allow_nil: true
   end
-    
+  
+  scope *[:row, :rows, :limit, :offset, :accuracy, :column, :order, 
+    :transform, :collapse, :exclude_headers]
+
+  scope :trim_start,  ->(date){ date = parse_date(date); where( trim_start: date ) if date }
+  scope :trim_end,    ->(date){ date = parse_date(date); where( trim_end:   date ) if date }
+  
+  scope_helper :parse_date, ->( value ){ 
+    begin
+      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.to_s
+    rescue
+      nil
+    end
+  }
+  
+  scope_helper :to_table, -> { fetch_once.data }
+
   attributes :id, :limit, :collapse, :transformation, :trim_start, :trim_end, 
     :rows, :row, :frequency, :data, :from_date, :to_date
 

data/lib/quandl/client/version.rb

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

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

@@ -1,12 +1,30 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Dataset do
+describe Quandl::Client::Dataset::Data do
 
   let(:dataset){ 
     create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data.rand( rows: 10, columns: 4 ) )
   }
-
+  
+  describe ".with_id" do
+    subject{ Quandl::Client::Dataset::Data.with_id(6668) }
+    let(:data){ Quandl::Client::Dataset::Data.with_id(6668).to_table }
+    
+    let(:beginning_of_last_week){ Date.today.jd - Date.today.beginning_of_week.jd }
+    
+    it("data"){ data.count.should > 100 }
+    it(".row(:beginning_of_last_week)"){ subject.row( beginning_of_last_week ).to_table.count.should eq 1 }
+    it(".rows(5)"){ subject.rows(5).to_table.count.should eq 5 }
+    it(".limit(2)"){ subject.limit(2).to_table.count.should eq 2 }
+    it(".column(2)"){ subject.column(2).to_table.first.count.should eq 2 }
+    it(".order('asc')"){ subject.order('asc').to_table.first.first.should eq data.sort_ascending!.first.first }
+    it(".order('desc')"){ subject.order('desc').to_table.first.first.should eq data.sort_descending!.first.first }
+    it(".trim_start().trim_end()"){ subject.trim_start( data[11].first ).trim_end(data[10].first).to_table.first.first.should eq data[10].first }
+    it(".collapse('monthly')"){ subject.collapse('monthly').to_table.frequency.should eq :monthly }
+    it(".transform('rdiff')"){ subject.transform('rdiff').to_table[0][1].should_not eq data[0][1] }
+  end
+  
   describe "#data" do
     subject{ Dataset.find( dataset.id ).data }
     its(:count){ should eq 10 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_client
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -181,6 +181,7 @@ files:
 - Rakefile
 - UPGRADE.md
 - examples/client.rb
+- examples/trims.rb
 - lib/quandl/client.rb
 - lib/quandl/client/base.rb
 - lib/quandl/client/base/attributes.rb