quandl_client 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc9ec02cb1388f49138706b129ff7bc167c7f2d
-  data.tar.gz: bd288e5d4da8564a686c33a3b7d5de505ab5e81d
+  metadata.gz: 143f4ec1982c74d12e16b00bb624f1b2002ce8dc
+  data.tar.gz: 79e557b77dfe07589dace275a5e15e676d267934
 SHA512:
-  metadata.gz: e722cb21f19e69ba316d45d8f658a8c3026c31134d6ca1fedd5cd42fca21a2543568cfc5b12c4bf3045ffe3dc6290a3af906bd898593ef4e99a32a8c63a4fd07
-  data.tar.gz: c6fb3cc83b31202cb0ddb8e398cc53110862587634f02280b2a6cdde2ae2d6a47f9cb3e547e671437238d47727d1783c52d7131fab182d16bf16446996735dd1
+  metadata.gz: 7a42782c545a694c737a9320c7492d6b19ec727fb463e955affaa19b3fcdf534c372dc584764915378bd80fe2a050fe25e52ae6f9d8c99d2bc3d9bfa9028c4a5
+  data.tar.gz: ff681713db7ec3b8bf1b6664a916f4ea5223df2ac72971ab7d3540141f62297371e33eacdddfd3ffb65e09742e40686ff2aa225560d8ab792e2cd56804769f9d

data/Rakefile

@@ -21,4 +21,12 @@ end
 
 task :console do |t, args|
   binding.pry
-end
+end
+
+require 'quandl/utility/rake_tasks'
+Quandl::Utility::Tasks.configure do |c|
+  c.name              = 'quandl_client'
+  c.version_path      = 'VERSION'
+  c.changelog_path    = 'UPGRADE.md'
+  c.changelog_matching  = ['^QUGC','^WIKI']
+end

data/UPGRADE.md

@@ -1,3 +1,10 @@
+## 2.6.0 
+
+* QUGC-104 Fixes when upload fails output is not json
+* QUGC-103 Fixes quandl upload test -F json does not include metadata
+
+
+
 # 2.5.2
 
 * WIKI-153 Add scrapers

data/VERSION

@@ -0,0 +1 @@
+2.6.0

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

@@ -46,6 +46,7 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   
   validates :code, presence: true, format: { with: Quandl::Pattern.code, message: "is invalid. Expected format: #{Quandl::Pattern.code.to_example}" }
   validates :display_url, allow_blank: true, url: true
+  validate :data_should_be_valid!
   validate :data_row_count_should_match_column_count!
   validate :data_columns_should_not_exceed_column_names!
   validate :data_rows_should_have_equal_columns!
@@ -88,11 +89,15 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   # DATA
   
   def data
-    dataset_data.data? ? dataset_data.data : data_scope
+    defined?(@data) ? @data : data_scope
   end
   
   def data=(value)
-    dataset_data.data = value
+    @data = Quandl::Data.new(value).sort_descending
+  end
+  
+  def data?
+    @data.is_a?(Quandl::Data)
   end
 
   def delete_data
@@ -127,6 +132,14 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   
   protected
   
+  def data_should_be_valid!
+    if data? && !data.valid?
+      data.errors.each{|k,v| self.errors.add( k,v ) }
+      return false
+    end
+    true
+  end
+  
   def ambiguous_code_requires_source_code!
     if code.to_s.numeric? && source_code.blank?
       message = %Q{Pure numerical codes like "#{code}" are not allowed unless you include a source code. Do this:\nsource_code: <USERNAME>\ncode: #{code}}
@@ -137,7 +150,7 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   end
   
   def data_columns_should_not_exceed_column_names!
-    if errors.size == 0 && dataset_data.data? && column_names.present? && data.first.count != column_names.count
+    if errors.size == 0 && data? && data.present? && column_names.present? && data.first.count != column_names.count
       self.errors.add( :data, "You may not change the number of columns in a dataset. This dataset has #{column_names.count} columns but you tried to send #{data.first.count} columns." )
       return false
     end
@@ -146,7 +159,7 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   
   def data_rows_should_have_equal_columns!
     # skip validation unless data is present
-    return true unless dataset_data.data?
+    return true unless data? && data.present?
     # use first row as expected column count
     column_count = data[0].count
     # check each row
@@ -163,7 +176,7 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   
   def data_row_count_should_match_column_count!
     # skip validation unless data and column_names present
-    return true unless dataset_data.data? && column_names.present?
+    return true unless data? && data.present? && column_names.present?
     # count the number of expected columns
     column_count = column_names.count
     # check each row
@@ -180,13 +193,14 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   
   def save_dataset_data
     return if (!saved? && id.blank?)
-    return if !dataset_data.data?
+    return if !data? || data.blank?
     
     dataset_data.id = id
+    dataset_data.data = data.to_csv
     dataset_data.save
     # update dataset's attributes with dataset_data's attributes
     attributes.each{|k,v| attributes[k] = dataset_data.attributes[k] if dataset_data.attributes.has_key?(k) }
-    @metadata[:status] = dataset_data.status
+    @metadata[:status] = dataset_data.status unless dataset_data.saved?
   end
   
   def enforce_required_formats

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

@@ -40,17 +40,17 @@ class Quandl::Client::Dataset::Data < Quandl::Client::Base
   def data
     read_data
   end
-  
+
   def data=(value)
     write_data(value)
   end
-  
+
   protected
-  
+
   def read_data
     Quandl::Data.new( read_attribute(:data) )
   end
-  
+
   def write_data(value )
     write_attribute(:data, Quandl::Data.new(value).to_csv )
   end

data/lib/quandl/client/version.rb

@@ -1,6 +1,6 @@
 module Quandl
 module Client
-  VERSION = '2.5.3'
+  VERSION = File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../../VERSION'))).strip.rstrip
   API_VERSION = 'v2'
   
   class << self

data/quandl_client.gemspec

@@ -17,6 +17,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency "quandl_data", "~> 1.4"
+  s.add_runtime_dependency "activesupport", ">= 3.0.0"
+  s.add_runtime_dependency "her", "~> 0.6"
+  s.add_runtime_dependency 'json', '~> 1.7.7'
+  s.add_runtime_dependency "scope_composer", "~> 0.3"
+
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.13"
   s.add_development_dependency "factory_girl_rails"
@@ -24,10 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
-
-  s.add_runtime_dependency "quandl_data", "~> 1.3"
-  s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "her", "~> 0.6"
-  s.add_runtime_dependency 'json', '~> 1.7.7'
-  s.add_runtime_dependency "scope_composer", "~> 0.3"
+  s.add_development_dependency "quandl_utility"
 end

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

@@ -43,7 +43,7 @@ describe Dataset do
       subject{ dataset }
       
       its(:saved?){ should be_true }
-      its(:status){ should eq 200 }
+      its(:status){ should eq 201 }
   
     end
   end

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

@@ -6,6 +6,15 @@ describe Dataset do
   let(:dataset){ build(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE" ) }
   subject{ dataset }
   
+  context "data='1980,10,20\nASDF,10,30'" do
+    before(:each){ 
+      dataset.data = '1980,10,20\nASDF,10,30'
+      dataset.valid?
+    }
+    its(:valid?){ should be_false }
+    its('errors.messages'){ should eq({ data: ["Invalid date 'ASDF'"] }) }
+  end
+  
   context "given ambiguous code" do
     before(:each){ 
       dataset.source_code = nil
@@ -22,7 +31,9 @@ describe Dataset do
       dataset.valid?
     }
     its(:valid?){ should be_false }
-    its('errors.messages'){ should eq({ data: ["Unexpected number of points in this row:\n2011-12-31,1.0,2.0,3.0\nFound 3 but expected 2 based on precedent from the first row (2012-12-31,1.0,2.0)"]}) }
+    its('errors.messages'){ should eq({ data: 
+      ["Unexpected number of points in this row:\n2011-12-31,1.0,2.0,3.0\nFound 3 but expected 2 based on precedent from the first row (2012-12-31,1.0,2.0)"]
+    })}
   end
   
   context "mismatch column_names count" do
@@ -32,7 +43,9 @@ describe Dataset do
       dataset.valid?
     }
     its(:valid?){ should be_false }
-    its('errors.messages'){ should eq({ data: ["Unexpected number of points in this row:\n2012-12-31,18.0,21.0\nFound 2 but expected 1 based on precedent from the header row (Date,Value)"]}) }
+    its('errors.messages'){ should eq({ data: 
+      ["Unexpected number of points in this row:\n2012-12-31,18.0,21.0\nFound 2 but expected 1 based on precedent from the header row (Date,Value)"]
+    })}
   end
   
   describe "#code" do

metadata

@@ -1,101 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: quandl_client
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: quandl_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: her
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
+        version: '0.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.7.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: fivemat
+  name: scope_composer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
+        version: '0.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,75 +123,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: quandl_data
+  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
+        version: '1.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: her
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: scope_composer
+  name: quandl_utility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 description: An orm for the cassinatra rest interface.
 email:
 - blake@hilscher.ca
@@ -195,6 +209,7 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
+- VERSION
 - examples/create.rb
 - examples/find.rb
 - examples/login.rb