quandl_client 2.7.11 → 2.7.12

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

@@ -1,86 +1,88 @@
-require 'json'
-
-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, 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
-    metadata.merge!({
-      status:                 env[:status],
-      headers:                env[:response_headers],
-      })
-    # return object
-    object = {
-      :data => json,
-      :errors => errors,
-      :metadata => metadata
-    }
-    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],
-      })
-    # each doc metadata references metadata
-    docs.each{|d| d[:metadata] = metadata }
-    # return object
-    object = {
-      :data => docs,
-      :errors => errors,
-      :metadata => metadata
-    }
-    env[:status] = 200
-    object
-  end
-
-  def parse_json(body = nil, env)
-    body ||= '{}'
-    json = begin
-      JSON.parse(body).symbolize_keys!
-    rescue JSON::ParserError
-      nil
-    end
-    # invalid json body?
-    if json.blank?
-      # fallback to error message
-      json = { 
-        id: 1, 
-        errors: {
-          parse_errors:  [ "Quandl::Client::ParseJSON error. status: #{env[:status]}, body: #{body.inspect}" ]
-        }
-      }
-    end
-    json
-  end
-
-end
-
-end
-end
+require 'json'
+
+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, 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
+    metadata.merge!({
+      status:                 env[:status],
+      headers:                env[:response_headers],
+      method:                 env[:method],
+      })
+    # return object
+    object = {
+      :data => json,
+      :errors => errors,
+      :metadata => metadata
+    }
+    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],
+      method:                 env[:method],
+      })
+    # each doc metadata references metadata
+    docs.each{|d| d[:metadata] = metadata }
+    # return object
+    object = {
+      :data => docs,
+      :errors => errors,
+      :metadata => metadata
+    }
+    env[:status] = 200
+    object
+  end
+
+  def parse_json(body = nil, env)
+    body ||= '{}'
+    json = begin
+      JSON.parse(body).symbolize_keys!
+    rescue JSON::ParserError
+      nil
+    end
+    # invalid json body?
+    if json.blank?
+      # fallback to error message
+      json = { 
+        id: 1, 
+        errors: {
+          parse_errors:  [ "Quandl::Client::ParseJSON error. status: #{env[:status]}, body: #{body.inspect}" ]
+        }
+      }
+    end
+    json
+  end
+
+end
+
+end
+end
 end

data/lib/quandl/client/middleware.rb

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

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

@@ -1,58 +1,58 @@
-class Quandl::Client::Dataset::Data < Quandl::Client::Base
-  
-  @_her_resource_path = "datasets/:id/data"
-  
-  has_scope_composer
-  
-  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, -> { 
-    data = fetch_once.data
-    data.headers = fetch_once.column_names
-    data
-  }
-
-  attributes :id, :limit, :collapse, :transformation, :trim_start, :trim_end, 
-    :rows, :row, :frequency, :data, :from_date, :to_date, :column_names
-
-  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
-  
+class Quandl::Client::Dataset::Data < Quandl::Client::Base
+  
+  @_her_resource_path = "datasets/:id/data"
+  
+  has_scope_composer
+  
+  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, -> { 
+    data = fetch_once.data
+    data.headers = fetch_once.column_names
+    data
+  }
+
+  attributes :id, :limit, :collapse, :transformation, :trim_start, :trim_end, 
+    :rows, :row, :frequency, :data, :from_date, :to_date, :column_names
+
+  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
+  
 end