quandl_client 0.0.13 → 0.0.14

data/.gitignore

@@ -2,4 +2,6 @@
 /pkg
 /tmp
 quandl_client-*
-.rvmrc
+.rvmrc
+*.gem
+*.log

data/lib/quandl/client.rb

@@ -5,6 +5,7 @@ require "active_support/inflector"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 
+require 'quandl/client/middleware'
 require 'quandl/client/her'
 require 'quandl/client/concerns'
 require 'quandl/client/base'

data/lib/quandl/client/concerns.rb

@@ -8,7 +8,7 @@ require 'quandl/client/concerns/properties'
 
 module Quandl
 module Client
-  
+
 module Concerns
 
 end

data/lib/quandl/client/her.rb

@@ -11,7 +11,7 @@ module Client
     
     def token
       @token
-    end    
+    end
     def token=(token)
       @token = token
       reload_models
@@ -23,7 +23,8 @@ module Client
       api.setup url: rest_url do |c|
         c.use TokenAuthentication
         c.use Faraday::Request::UrlEncoded
-        c.use Parser
+        # c.use Her::Middleware::DefaultParseJSON
+        c.use Quandl::Client::Middleware::ParseJSON
         c.use Faraday::Adapter::NetHttp
       end
     end

data/lib/quandl/client/middleware.rb

@@ -0,0 +1,10 @@
+require 'faraday'
+require 'quandl/client/middleware/parse_json'
+
+module Quandl
+module Client
+module Middleware
+
+end
+end
+end

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

@@ -0,0 +1,52 @@
+module Quandl
+module Client
+module Middleware
+
+class ParseJSON < Faraday::Response::Middleware
+
+  def on_complete(env)
+    env[:body] = case env[:status]
+    when 204
+      parse('{}', env)
+    else
+      parse(env[:body], env)
+    end
+  end
+
+  def parse(body, env)
+    json = parse_json(body)
+    errors = json.delete(:errors) || {}
+    metadata = json.delete(:metadata) || {}
+    # collect some response data
+    metadata.merge!({
+      status:                 env[:status],
+      headers:                env[:response_headers],
+      })
+    # return object
+    {
+      :data => json,
+      :errors => errors,
+      :metadata => metadata
+    }
+  end
+
+  def parse_json(body = nil)
+    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
+      raise Her::Errors::ParseError, message
+    end
+
+    raise Her::Errors::ParseError, message unless json.is_a?(Hash) or json.is_a?(Array)
+
+    json
+  end
+
+end
+
+end
+end
+end

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

@@ -36,8 +36,8 @@ class Dataset
   # VALIDATIONS #
   ###############
    
-  validates :source_code, presence: true, length: { minimum: 2 }, format: { with: /([A-Z][A-Z0-9_]+)/ }
-  validates :code, presence: true, length: { minimum: 2 }, format: { with: /([A-Z][A-Z0-9_]+)/ }
+  validates :source_code, presence: true, length: { minimum: 2 }, format: { with: /([A-Z0-9_]+)/ }
+  validates :code, presence: true, length: { minimum: 2 }, format: { with: /([A-Z0-9_]+)/ }
   validates :name, presence: true
   
   

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

@@ -28,7 +28,7 @@ class Source
   # VALIDATIONS #
   ###############
    
-  validates :code, presence: true, length: { minimum: 2 }, format: { with: /([A-Z][A-Z0-9_]+)/ }
+  validates :code, presence: true, length: { minimum: 2 }, format: { with: /([A-Z0-9_]+)/ }
   validates :host, :name, presence: true
   
 

data/lib/quandl/client/version.rb

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

data/lib/quandl/her/patch.rb

@@ -8,23 +8,4 @@ module Her
       remove_method :data=
     end
   end
-  module Middleware
-    class ParseJSON < Faraday::Response::Middleware
-      # @private
-      def parse_json(body = nil)
-        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 MultiJson::LoadError
-          raise Her::Errors::ParseError, message
-        end
-
-        raise Her::Errors::ParseError, message unless json.is_a?(Hash) or json.is_a?(Array)
-
-        json
-      end
-    end
-  end
 end

metadata

@@ -2,14 +2,14 @@
 name: quandl_client
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Blkae Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -193,6 +193,8 @@ files:
 - lib/quandl/client/concerns/properties.rb
 - lib/quandl/client/concerns/search.rb
 - lib/quandl/client/her.rb
+- lib/quandl/client/middleware.rb
+- lib/quandl/client/middleware/parse_json.rb
 - lib/quandl/client/models.rb
 - lib/quandl/client/models/dataset.rb
 - lib/quandl/client/models/sheet.rb