quandl_client 2.10.0 → 2.10.1

data/UPGRADE.md

@@ -1,3 +1,9 @@
+## 2.10.1 
+
+
+
+
+
 ## 2.10.0 
 
 * add Quandl::Client::Job

data/VERSION

@@ -1 +1 @@
-2.10.0
+2.10.1

data/lib/quandl/client/base.rb

@@ -4,6 +4,7 @@ require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 
 require 'quandl/client/base/model'
+require 'quandl/client/base/benchmark'
 require 'quandl/client/base/attributes'
 require 'quandl/client/base/validation'
 require 'quandl/client/base/search'
@@ -51,6 +52,7 @@ class Quandl::Client::Base
       # include model behaviour
       subclass.class_eval do
         include Quandl::Client::Base::Model
+        include Quandl::Client::Base::Benchmark
         include Quandl::Client::Base::Attributes
         include Quandl::Client::Base::Validation
         include Quandl::Client::Base::Search

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

@@ -0,0 +1,46 @@
+class Quandl::Client::Base
+module Benchmark
+  
+  extend ActiveSupport::Concern
+  
+  included do
+    benchmark(:save)
+  end
+  
+  module ClassMethods
+    def benchmark(*names)
+      names.each do |name|
+        def_benchmark(name)
+      end
+    end
+    
+    private
+    
+    def def_benchmark(name)
+      define_method(name) do |*args, &block|
+        benchmark(name) do
+          super(*args, &block) if defined?(super)
+        end
+      end
+    end
+  end
+  
+  def human_benchmarks
+    benchmarks.sort_by{|k,v| v }.reverse.collect{|k,v| "#{k}: #{v.microseconds}ms" }.join(' | ')
+  end
+  
+  def benchmarks
+    @benchmarks ||= {}
+  end
+    
+  private
+  
+  def benchmark(name, &block)
+    timer = Time.now
+    result = block.call
+    self.benchmarks[name.to_sym] ||= timer.elapsed
+    result
+  end
+  
+end
+end

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

@@ -26,7 +26,7 @@ module Model
     return nil unless request_finished_at.is_a?(Time) && request_started_at.is_a?(Time)
     @elapsed_request_time ||= (request_finished_at - request_started_at)
   end
-  
+
   private
   
   def touch_request_started_at

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

@@ -1,6 +1,11 @@
 class Quandl::Client::Dataset < Quandl::Client::Base
   
   require 'quandl/client/models/dataset/data'
+  require 'quandl/client/models/dataset/validations'
+  require 'quandl/client/models/dataset/benchmark'
+  
+  include Quandl::Client::Dataset::Validations
+  include Quandl::Client::Dataset::Benchmark
   
   ##########  
   # SCOPES #
@@ -51,17 +56,6 @@ class Quandl::Client::Dataset < Quandl::Client::Base
   # VALIDATIONS #
   ###############
     
-  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 :dataset_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!
-  validate :ambiguous_code_requires_source_code!
-  
-  validate :source_code_should_exist!
-  
   
   ##############
   # PROPERTIES #
@@ -73,10 +67,6 @@ class Quandl::Client::Dataset < Quandl::Client::Base
     :display_url, :column_spec, :import_spec, :import_url,
     :locations_attributes, :availability_delay, :refreshed_at
     
-  before_save :enforce_required_formats
-  
-  after_save :save_dataset_data
-  
   alias_method :locations, :locations_attributes
   alias_method :locations=, :locations_attributes=
   
@@ -156,115 +146,4 @@ class Quandl::Client::Dataset < Quandl::Client::Base
     @full_code = nil
   end
   
-  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 dataset_data_should_be_valid!
-    if dataset_data? && !dataset_data.valid?
-      dataset_data.errors.each{|k,v| self.errors.add( k,v ) }
-      return false
-    end
-    true
-  end
-  
-  def source_code_should_exist!
-    if source_code.present?
-      Quandl::Client::Source.cached[source_code] = Quandl::Client::Source.find(source_code) unless Quandl::Client::Source.cached.has_key?(source_code)
-      source = Quandl::Client::Source.cached[source_code]
-      self.errors.add( :source_code, "Could not find a source with the source_code '#{source_code}'" ) if source.blank? || source.code.blank?
-      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}}
-      self.errors.add( :data, message )
-      return false
-    end
-    true 
-  end
-  
-  def data_columns_should_not_exceed_column_names!
-    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
-    true 
-  end
-  
-  def data_rows_should_have_equal_columns!
-    # skip validation unless data is present
-    return true unless data? && data.present?
-    # use first row as expected column count
-    column_count = data[0].count
-    # check each row
-    data.each_with_index do |row, index|
-      # the row is valid if it's count matches the first row's count
-      next if row.count == column_count
-      # the row is invalid if the count is mismatched
-      self.errors.add( :data, "Unexpected number of points in this row:\n#{row.join(',')}\nFound #{row.size-1} but expected #{data[0].size-1} based on precedent from the first row (#{data[0].join(',')})" )
-      # return validation failure
-      return false
-    end
-    true
-  end
-  
-  def data_row_count_should_match_column_count!
-    # skip validation unless data and 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
-    data.each_with_index do |row, index|
-      # the row is valid if it's count matches the first row's count
-      next if row.count == column_count
-      # the row is invalid if the count is mismatched
-      self.errors.add( :data, "Unexpected number of points in this row:\n#{row.join(',')}\nFound #{row.size-1} but expected #{column_names.count-1} based on precedent from the header row (#{column_names.join(',')})" )
-      # return validation failure
-      return false
-    end
-    true
-  end
-  
-  def save_dataset_data
-    return if (!saved? && id.blank?)
-    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) }
-    # update dataset errors with dataset_data
-    @metadata[:status] = dataset_data.status unless dataset_data.saved?
-    # inherit_errors(dataset_data) unless dataset_data.saved?
-  end
-  
-  def inherit_errors(object)
-    return unless object.respond_to?(:response_errors) && object.response_errors.respond_to?(:each)
-    object.response_errors.each do |key, messages|
-      if messages.respond_to?(:each)
-        messages.each{|message| errors.add(key, message) }
-      end
-    end
-    @metadata[:status] = object.status
-    object
-  end
-  
-  def enforce_required_formats
-    # self.data = Quandl::Data.new(data).to_csv
-    self.source_code = self.source_code.to_s.upcase
-    self.code = self.code.to_s.upcase
-    self.locations_attributes = locations_attributes.to_json if locations_attributes.respond_to?(:to_json) && !locations_attributes.kind_of?(String)
-  end
-  
 end

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

@@ -0,0 +1,11 @@
+class Quandl::Client::Dataset
+module Benchmark
+  
+  extend ActiveSupport::Concern
+  
+  included do
+    benchmark :data_should_be_valid!, :source_code_should_exist!, :save_dataset_data, :enforce_required_formats, :valid?
+  end
+  
+end
+end

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

@@ -0,0 +1,133 @@
+class Quandl::Client::Dataset
+module Validations
+  
+  extend ActiveSupport::Concern
+  
+  included do
+    
+    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 :dataset_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!
+    validate :ambiguous_code_requires_source_code!
+  
+    validate :source_code_should_exist!
+    
+    before_save :enforce_required_formats
+    after_save :save_dataset_data
+  
+  end
+  
+  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 dataset_data_should_be_valid!
+    if dataset_data? && !dataset_data.valid?
+      dataset_data.errors.each{|k,v| self.errors.add( k,v ) }
+      return false
+    end
+    true
+  end
+  
+  def source_code_should_exist!
+    if source_code.present?
+      Quandl::Client::Source.cached[source_code] = Quandl::Client::Source.find(source_code) unless Quandl::Client::Source.cached.has_key?(source_code)
+      source = Quandl::Client::Source.cached[source_code]
+      self.errors.add( :source_code, "Could not find a source with the source_code '#{source_code}'" ) if source.blank? || source.code.blank?
+      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}}
+      self.errors.add( :data, message )
+      return false
+    end
+    true
+  end
+  
+  def data_columns_should_not_exceed_column_names!
+    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
+    true 
+  end
+  
+  def data_rows_should_have_equal_columns!
+    # skip validation unless data is present
+    return true unless data? && data.present?
+    # use first row as expected column count
+    column_count = data[0].count
+    # check each row
+    data.each_with_index do |row, index|
+      # the row is valid if it's count matches the first row's count
+      next if row.count == column_count
+      # the row is invalid if the count is mismatched
+      self.errors.add( :data, "Unexpected number of points in this row:\n#{row.join(',')}\nFound #{row.size-1} but expected #{data[0].size-1} based on precedent from the first row (#{data[0].join(',')})" )
+      # return validation failure
+      return false
+    end
+    true
+  end
+  
+  def data_row_count_should_match_column_count!
+    # skip validation unless data and 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
+    data.each_with_index do |row, index|
+      # the row is valid if it's count matches the first row's count
+      next if row.count == column_count
+      # the row is invalid if the count is mismatched
+      self.errors.add( :data, "Unexpected number of points in this row:\n#{row.join(',')}\nFound #{row.size-1} but expected #{column_names.count-1} based on precedent from the header row (#{column_names.join(',')})" )
+      # return validation failure
+      return false
+    end
+    true
+  end
+  
+  def save_dataset_data
+    return if (!saved? && id.blank?)
+    return if !data? || data.blank?
+    dataset_data.id = id
+    dataset_data.data = benchmark('data.to_csv'){ data.to_csv }
+    benchmark('dataset_data.save'){ 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) }
+    # update dataset errors with dataset_data
+    @metadata[:status] = dataset_data.status unless dataset_data.saved?
+    # inherit_errors(dataset_data) unless dataset_data.saved?
+  end
+  
+  
+  def inherit_errors(object)
+    return unless object.respond_to?(:response_errors) && object.response_errors.respond_to?(:each)
+    object.response_errors.each do |key, messages|
+      if messages.respond_to?(:each)
+        messages.each{|message| errors.add(key, message) }
+      end
+    end
+    @metadata[:status] = object.status
+    object
+  end
+  
+  def enforce_required_formats
+    self.source_code = self.source_code.to_s.upcase
+    self.code = self.code.to_s.upcase
+    self.locations_attributes = locations_attributes.to_json if locations_attributes.respond_to?(:to_json) && !locations_attributes.kind_of?(String)
+  end
+  
+end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_client
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quandl_data
@@ -240,13 +240,16 @@ files:
 - lib/quandl/client.rb
 - lib/quandl/client/base.rb
 - lib/quandl/client/base/attributes.rb
+- lib/quandl/client/base/benchmark.rb
 - lib/quandl/client/base/model.rb
 - lib/quandl/client/base/search.rb
 - lib/quandl/client/base/validation.rb
 - lib/quandl/client/middleware.rb
 - lib/quandl/client/middleware/parse_json.rb
 - lib/quandl/client/models/dataset.rb
+- lib/quandl/client/models/dataset/benchmark.rb
 - lib/quandl/client/models/dataset/data.rb
+- lib/quandl/client/models/dataset/validations.rb
 - lib/quandl/client/models/job.rb
 - lib/quandl/client/models/location.rb
 - lib/quandl/client/models/report.rb
@@ -294,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 608725837555586379
+      hash: -2575708082673469562
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 608725837555586379
+      hash: -2575708082673469562
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23