quandl_format 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88de117fd0aaa74d5aed80b7d34a77200409fa6e
-  data.tar.gz: 30fbd84655aedd481be97a672725aa173116bff9
+  metadata.gz: 321907cc4f59730ec0c37fd9bf0c5e67cd80fdc8
+  data.tar.gz: 8b272a1c2699e966ad6f96394725ea902cdcfce8
 SHA512:
-  metadata.gz: 9809fccf8d818791f6b000d44918a525836d32c3227f4156bd5f7fe098240e42e7179745ee78ffc411604f8164429760670e9da8e0f02e778d42c9a5e7f23b08
-  data.tar.gz: 0fc2a754ce3f08d0fd4b54066ab059623e53e3af8b112255188a42f60a54e3af0cfd00b613851a4d9902a91287129dde92dfe1320012d334bca9efa5210d0545
+  metadata.gz: 156bd0b3ed9d48abcb2639c67cb1492359dd88119e45575b95d97c64d6c55936ce73a67402258254a67aa2d646c6b97e1eb3b8c9a3db2ae44f1121167123b860
+  data.tar.gz: 6e046e36bf08aa9e8ee08089ad72b6cdde1c4673c87d9f6ef28fb3ee9c0a0709a5b63e360cf0b942dfb2dfd54b67249ccbc51644d98f14ccc3ed915e72efc86c

data/.gitignore

@@ -2,4 +2,5 @@
 /pkg
 /tmp
 *.gem
-coverage/*
+coverage/*
+.rvmrc

data/Guardfile

@@ -0,0 +1,10 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+group :specs do
+  guard :rspec, cmd: 'bundle exec rspec --fail-fast -f doc --color' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^(lib/.+)\.rb$})                { |m| "spec/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')             { 'spec' }
+  end
+end

data/UPGRADE.md

@@ -1,3 +1,15 @@
+## 0.1.0
+
+* only update client attrs before upload
+* dataset/client.rb client.assign_attributes(attributes) before upload human_errors revised
+* load rescues and raises contextual errors
+* add Dataset#human_errors, #full_url
+* add fixtures/data/*.qdf that gets loaded into fixtures_data
+* refactor spec format and qdf_attributes to fixtures
+* add quandl/client/dataset/to_qdf extension Dataset#to_qdf Dataset#qdf_attributes
+* refactor node/dump/load to Dataset Dataset::Load, Dataset::Dump
+
+
 ## 0.0.2
 
 * add support for meta attributes: private, display_url

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

@@ -0,0 +1,20 @@
+module Quandl
+module Client
+
+class Dataset
+  
+  def to_qdf
+    Quandl::Format::Dataset.new( qdf_attributes ).to_qdf
+  end
+  
+  def qdf_attributes
+    Quandl::Format::Dataset.attribute_names.inject({}) do |memo, name|
+      memo[name] = self.send(name) if self.respond_to?(name)
+      memo
+    end
+  end
+  
+end
+
+end
+end

data/lib/quandl/format/dataset/attributes.rb

@@ -0,0 +1,105 @@
+module Quandl
+module Format
+class Dataset
+
+module Attributes
+  
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+
+    META_ATTRIBUTES = :source_code, :code, :name, :description, :private, :display_url
+    DATA_ATTRIBUTES = :column_names, :data
+
+    def attribute_names
+      @attribute_names ||= meta_attribute_names + data_attribute_names
+    end
+
+    def meta_attribute_names
+      META_ATTRIBUTES
+    end
+
+    def data_attribute_names
+      DATA_ATTRIBUTES
+    end
+    
+  end
+  
+  included do
+    attribute_names.each do |name|
+      attr_reader name unless method_defined?(name)
+      attr_writer name unless method_defined?("#{name}=")
+    end
+  end
+  
+  def initialize(*args)
+    attrs = args.extract_options!
+    assign_attributes(attrs) if attrs.is_a?(Hash)
+  end
+
+  def assign_attributes(attrs)
+    attrs.each do |key, value|
+      raise_unknown_attribute_error!(key) unless respond_to?(key)
+      self.send("#{key}=", value) 
+    end
+  end
+  
+  def full_code=(value)
+    value = value.split('/')
+    self.source_code = value[0]
+    self.code = value[1]
+  end
+
+  def full_code
+    [source_code, code].join('/')
+  end
+
+  def description=(value)
+    @description = value.to_s.gsub('\n', "\n")
+  end
+
+  def data=(rows)
+    self.column_names = rows.shift unless rows.first.collect{|r| r.to_s.numeric? }.include?(true)
+    @data = Quandl::Data.new(rows).to_date
+  end
+
+  def column_names=(names)
+    @column_names = Array(names).flatten.collect{|n| n.strip.rstrip }
+  end
+
+  def to_qdf
+    Dump.record(self)
+  end
+
+  def meta_attributes
+    self.class.meta_attribute_names.inject({}){|m,k| m[k] = self.send(k); m }
+  end
+
+  def attributes
+    self.class.attribute_names.inject({}){|m,k| m[k] = self.send(k); m }
+  end
+
+  def inspect
+    attrs = attributes.collect do |key, value|
+      if value.is_a?(String)
+        value = "#{value[0..20]}..." if value.length > 20
+        value = "'#{value}'"
+      end
+      "#{key}: #{value}"
+    end
+    %Q{<##{self.class.name} #{attrs.join(', ')}>}
+  end
+
+  private
+  
+  def raise_unknown_attribute_error!(key)
+    m = "UnknownAttribute #{key} recognized attributes are: #{self.class.attribute_names}"
+    raise Quandl::Format::Errors::UnknownAttribute, m
+  end
+
+
+end
+
+end
+end
+end

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

@@ -0,0 +1,66 @@
+module Quandl
+module Format
+class Dataset
+
+module Client
+  extend ActiveSupport::Concern
+  
+  def human_errors
+    return if errors.blank?
+    puts errors
+    m = "#{client.full_url} #{client.status}\n"
+    m += "  errors: \n"
+    m += errors.collect do |error_type, messages|
+      next human_error(error_type, messages)  unless messages.is_a?(Hash)
+      messages.collect{|n,m| human_error(n, m) }
+    end.flatten.compact.join
+  end
+  
+  def human_error(name, message)
+    message = message.join(', ') if message.respond_to?(:join)
+    "    #{name}: #{message}\n"
+  end
+  
+  def full_url
+    client.full_url
+  end
+  
+  def upload
+    client.save if valid?
+  end
+  
+  def errors
+    client.error_messages
+  end
+  
+  def valid?
+    assign_client_attributes
+    client.valid_with_server?
+  end
+  
+  def client
+    @client ||= find_or_build_client
+  end
+  def client=(value)
+    raise ArgumentError, "Expected Quandl::Client::Dataset received #{value.class}" unless value.is_a?(Quandl::Client::Dataset)
+    @client = value
+  end
+  
+  
+  protected
+  
+  def assign_client_attributes
+    client.assign_attributes(attributes)
+  end
+  
+  def find_or_build_client
+    @client = Quandl::Client::Dataset.find(full_code)
+    @client = Quandl::Client::Dataset.new unless @client.exists?
+    @client
+  end
+  
+end
+
+end
+end
+end

data/lib/quandl/format/{dump.rb → dataset/dump.rb}

@@ -1,24 +1,21 @@
-module Quandl
-module Format
-
-class Dump
-
+class Quandl::Format::Dataset::Dump
+  
   class << self
 
-    def nodes(*args)
-      Array(args).flatten.collect{|r| node(r) }.join("\n")
+    def collection(*args)
+      Array(args).flatten.collect{|r| record(r) }.join("\n")
     end
 
-    def node(node)
-      self.new(node).to_qdf
+    def record(record)
+      self.new(record).to_qdf
     end
 
   end
 
-  attr_accessor :node
+  attr_accessor :record
 
   def initialize(r)
-    self.node = r
+    self.record = r
   end
 
   def to_qdf
@@ -30,21 +27,18 @@ class Dump
   end
 
   def meta_attributes
-    node.meta_attributes.stringify_keys.to_yaml[4..-1] + "-\n"
+    record.meta_attributes.stringify_keys.to_yaml[4..-1] + "-\n"
   end
   
   def data
-    data = node.data
+    data = record.data
     data = data.collect(&:to_csv).join if data.is_a?(Array) && data.first.respond_to?(:to_csv)
     data = data.to_csv if data.respond_to?(:to_csv)
     data
   end
 
   def column_names
-    node.column_names.to_csv if node.column_names.present?
+    record.column_names.to_csv if record.column_names.present?
   end
 
-end
-
-end
 end

data/lib/quandl/format/{load.rb → dataset/load.rb}

@@ -1,14 +1,23 @@
-class Quandl::Format::Load
+class Quandl::Format::Dataset::Load
   
   SECTION_DELIMITER = '-'
   
   class << self
-  
-    def from_file(path)
-      from_string(File.read(path).strip)
+    
+    def file(path)
+      string(File.read(path).strip)
     end
   
-    def from_string(input)
+    def string(input)
+      nodes = parse_string(input)
+      nodes = parse_yaml_and_csv(nodes)
+      nodes = nodes_to_datasets(nodes)
+      nodes
+    end
+    
+    protected
+    
+    def parse_string(input)
       nodes = []
       section_type = :data
       input.each_line do |rline|
@@ -25,7 +34,7 @@ class Quandl::Format::Load
           # update the section to attributes
           section_type = :attributes
           
-        # have we reached the end of the attributes?
+          # have we reached the end of the attributes?
         elsif line[0] == '-'
           # update the section to data
           section_type = :data
@@ -36,29 +45,39 @@ class Quandl::Format::Load
         # YAML must include whitespace
         nodes[-1][section_type] += (section_type == :data) ? "#{line}\n" : rline
       end
-      # append the current node
-      nodes = parse_nodes(nodes)
-      nodes = initialize_nodes(nodes)
       nodes
     end
     
-    
-    protected
-    
-    def parse_nodes(nodes)
+    def parse_yaml_and_csv(nodes)
       nodes.collect do |node|
         # parse attrs as yaml
-        node[:attributes] = YAML.load( node[:attributes] )
+        node[:attributes] = YAML.load( node[:attributes] ).symbolize_keys!
         # parse data as csv
         node[:attributes][:data] = CSV.parse(node[:data])
         node
       end
     end
     
-    def initialize_nodes(nodes)
-      nodes.collect do |node|
-        Quandl::Format::Node.new(node[:attributes])
+    def nodes_to_datasets(nodes)
+      datasets = []
+      nodes.each_with_index do |node, index|
+        dataset = node_to_dataset(node, index)
+        datasets << dataset if dataset
       end
+      datasets
+    end
+    
+    def node_to_dataset(node, index)
+      Quandl::Format::Dataset.new( node[:attributes] )
+    rescue => e# Quandl::Format::Errors::UnknownAttribute => e
+      message = "Error: Dataset #{index + 1}\n"
+      message += node[:attributes][:source_code] + '/' if node[:attributes][:source_code].present?
+      message += node[:attributes][:code] + "\n"
+      message += "#{$!}\n"
+      message += "--"
+      Quandl::Logger.error(message, e)
+      nil
+      # raise $!, message, $!.backtrace
     end
     
     def attribute_format

data/lib/quandl/format/dataset.rb

@@ -0,0 +1,36 @@
+module Quandl
+module Format
+
+class Dataset
+
+  # classes
+  require_relative 'dataset/load'
+  require_relative 'dataset/dump'
+  
+  # concerns
+  require_relative 'dataset/attributes'
+  require_relative 'dataset/client'
+  
+  include Quandl::Format::Dataset::Attributes
+  include Quandl::Format::Dataset::Client
+
+  class << self
+
+    def load(input)
+      Load.string(input)
+    end
+
+    def load_from_file(path)
+      Load.file(path)
+    end
+
+    def dump(datasets)
+      Dump.collection(datasets)
+    end
+
+  end
+  
+
+end  
+end
+end

data/lib/quandl/format/errors.rb

@@ -0,0 +1,7 @@
+module Quandl
+module Format
+module Errors
+  class UnknownAttribute < StandardError; end
+end
+end
+end

data/lib/quandl/format/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Format
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end
 end

data/lib/quandl/format.rb

@@ -4,35 +4,18 @@ require "quandl/format/version"
 
 require 'csv'
 
-require 'quandl/operation'
+require 'quandl/client'
 
 require "active_support"
 require "active_support/inflector"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 
-require 'quandl/format/dump'
-require 'quandl/format/load'
-require 'quandl/format/node'
+require 'quandl/format/errors'
+require 'quandl/format/dataset'
+require 'quandl/client/dataset/to_qdf'
 
 module Quandl
   module Format
-    
-    class << self
-    
-      def load(input)
-        Quandl::Format::Load.from_string(input)
-      end
-    
-      def load_file(file_path)
-        Quandl::Format::Load.from_file(file_path)
-      end
-    
-      def dump(nodes)
-        Quandl::Format::Dump.nodes(nodes)
-      end
-    
-    end
-    
   end
 end

data/quandl_format.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fivemat", "~> 1.2"
   s.add_development_dependency "pry"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
   
-  s.add_runtime_dependency "quandl_operation", "~> 0.1"
+  s.add_runtime_dependency "quandl_client", "~> 2.2"
   
 end

data/spec/config/client.rb

@@ -0,0 +1,2 @@
+Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
+Quandl::Client.use ENV['QUANDL_API_HOST']

data/spec/config/logger.rb

@@ -0,0 +1,25 @@
+module Spec
+class Logger
+  
+  class << self
+    
+    def info(*args)
+      log(*args)
+    end
+    
+    def debug(*args)
+      log(*args)
+    end
+    
+    def error(*args)
+      raise args[1] if args[1].kind_of?(StandardError)
+    end
+    
+    def log(*args)
+      STDOUT << args.collect(&:to_s).join(', ') + "\n"
+    end
+    
+  end
+  
+end
+end

data/spec/fixtures/data/invalid_data.qdf

@@ -0,0 +1,24 @@
+code: "BLAKE_TEST_1"
+name: "A new title"
+description: "The description Date, Open, High"
+private: false
+-
+2013-11-22,1252.0,454.95,448.2,450.0,450.0,1354405.0,6099.41
+Date,Open,High,Low,Last,Close,Total Trade Quantity,Turnover (Lacs)
+2013-11-21,452.25,457.75,449.1,451.2,451.0,218881.0,992.94
+
+code: "BLAKE_TEST_2"
+name: "A new title"
+description: "The description Date, Open, High"
+-
+2013-11-22,1252.0,454.95,448.2,450.0,450.0,1354405.0,6099.41
+2013-11-21,452.25,457.75,449.1,451.2,451.0,218881.0,992.94
+Date,Open,High,Low,Last,Close,Total Trade Quantity,Turnover (Lacs)
+
+code: "BLAKE_TEST_3"
+name: "A new title"
+description: "The description Date, Open, High"
+-
+Date,Open,High,Low,Last,Close,Total Trade Quantity,Turnover (Lacs)
+2013-11-22,1252.0,454.95,448.2,450.0,Low,1354405.0,6099.41
+2013-11-21,452.25,457.75,449.1,451.2,451.0,218881.0,992.94

data/spec/fixtures/data/unknown_attribute.qdf

@@ -0,0 +1,11 @@
+code: "BLAKE_TEST_1"
+name: "A new title"
+this_attribute_does_not_exist: "Why is this here?"
+description: "The description Date, Open, High"
+private: false
+-
+Date, Column 1, Column 2, Column 3, Column 4
+2013-11-30,,11.003235294117646,13.948117647058822,19.038
+2013-11-29,9.953796020761246,10.886730449826988,13.957142899653979,19.10407305882353
+2013-11-28,10.031669836688378,10.89889797209444,13.954679874436392,19.20858357614533
+2013-11-25,10.07474700716357,10.876459064504834,13.923487060599417,19.139658658607395

data/spec/fixtures/data/valid.qdf

@@ -0,0 +1,24 @@
+code: "BLAKE_TEST_1"
+name: "A new title"
+description: "The description Date, Open, High"
+private: false
+-
+Date,Open,High,Low,Last,Close,Total Trade Quantity,Turnover (Lacs)
+2013-11-22,1252.0,454.95,448.2,450.0,450.0,1354405.0,6099.41
+2013-11-21,452.25,457.75,449.1,451.2,451.0,218881.0,992.94
+
+code: "BLAKE_TEST_2"
+name: "A new title"
+description: "The description Date, Open, High"
+-
+Date,Open,High,Low,Last,Close,Total Trade Quantity,Turnover (Lacs)
+2013-11-22,1252.0,454.95,448.2,450.0,450.0,1354405.0,6099.41
+2013-11-21,452.25,457.75,449.1,451.2,451.0,218881.0,992.94
+
+code: "BLAKE_TEST_3"
+name: "A new title"
+description: "The description Date, Open, High"
+-
+Date,Open,High,Low,Last,Close,Total Trade Quantity,Turnover (Lacs)
+2013-11-22,1252.0,454.95,448.2,450.0,450.0,1354405.0,6099.41
+2013-11-21,452.25,457.75,449.1,451.2,451.0,218881.0,992.94

data/spec/fixtures/format.rb

@@ -0,0 +1,65 @@
+def fixtures_data
+  return @fixtures_data if @fixtures_data
+  @fixtures_data = {}
+  Dir.glob( File.join( File.dirname(__FILE__), 'data/**/*.qdf' ) ).each{|f|
+    name = File.basename(f, '.qdf').to_s
+    @fixtures_data[name] = File.read(f)
+  }
+  @fixtures_data
+end
+
+def qdf_format
+%Q{
+# first dataset
+source_code: NSE
+code: OIL
+name: Oil India Limited
+description: |-
+  Here is a description with multiple lines.
+  This is the second line.
+-
+Date, Value, High, Low
+2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
+2013-11-19,10.039388096885814,,14.09718770934256
+
+# Second dataset
+code:           DATASET_CODE_2
+source_code:    SOURCE_CODE_2
+name:           Test Dataset Name 2
+description:    Here is a description with multiple lines.
+-
+Date, Value, High, Low
+2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
+2013-11-19,10.039388096885814,,14.09718770934256
+2013-11-18,11.039388096885814,,15.09718770934256
+}
+end
+
+def qdf_attributes
+  {
+    code:           'DATASET_CODE_2',
+    source_code:    'SOURCE_CODE',
+    name:           'Test Dataset Name 2',
+    description:    "Here is a description with multiple lines.\n This is the second line.",
+    column_names:   ['Date', 'Value', 'High', 'Low'],
+    private:        false,
+    display_url:    'http://test.com/',
+    data:           Quandl::Data.new([["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"],["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]]),
+  }
+end
+
+def qdf_attributes_to_format
+%Q{source_code: SOURCE_CODE
+code: DATASET_CODE_2
+name: Test Dataset Name 2
+description: |-
+  Here is a description with multiple lines.
+   This is the second line.
+private: false
+display_url: http://test.com/
+-
+Date,Value,High,Low
+2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
+2013-11-19,10.039388096885814,,14.09718770934256
+}
+end

data/spec/lib/quandl/client/dataset_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Client::Dataset do
+  
+  let(:attributes) { {
+    code:           'DATASET_CODE_2',
+    source_code:    'SOURCE_CODE',
+    name:           'Test Dataset Name 2',
+    description:    "Here is a description with multiple lines.\n This is the second line.",
+    column_names:   ['Date', 'Value', 'High', 'Low'],
+    private:        false,
+    display_url:    'http://test.com/',
+    data:           [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
+                    ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]], 
+  }}
+  
+  subject{ Quandl::Client::Dataset.new( attributes ) }
+  
+  it{ should respond_to :to_qdf }
+  
+  its(:to_qdf){ should eq Quandl::Format::Dataset.new(attributes).to_qdf }
+  
+end

data/spec/lib/quandl/format/dataset/attributes_spec.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Format::Dataset::Attributes do
+  
+  let(:attributes) { qdf_attributes }
+  
+  subject{ Quandl::Format::Dataset.new( attributes ) }
+  
+end

data/spec/lib/quandl/format/dataset/client_spec.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Format::Dataset::Client do
+  
+  context "without attributes" do
+    subject{ Quandl::Format::Dataset.new }
+    its(:valid?){ should be_false }
+    its(:upload){ should be_false }
+  end
+  
+  let(:attributes) { qdf_attributes }
+  let(:dataset){ Quandl::Format::Dataset.new( attributes ) }
+  subject{ dataset }
+  
+  it{ should respond_to :valid? }
+  it{ should respond_to :upload }
+
+  its(:valid?){ should be_true }
+  its(:client){ should be_a Quandl::Client::Dataset }
+  
+  ["string", 10, Date.today, [1,2,3], {hash: 'test'} ].each do |value|
+    it "#client= #{value.class} should raise_error ArgumentError" do
+      expect{ subject.client = value }.to raise_error ArgumentError
+    end
+  end
+  
+  it "#client= Quandl::Client::Dataset should return client" do
+    d = Quandl::Client::Dataset.new
+    subject.client = d
+    subject.client.should eq d
+  end
+  
+end

data/spec/lib/quandl/format/dataset/errors_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Format::Dataset do
+  subject{ data }
+  context "valid.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['valid'] ) }
+    
+    it{ should be_a Array }
+    its(:count){ should eq 3 }
+    
+    describe "#first" do
+      subject{ data.first }
+      its(:code){ should eq 'BLAKE_TEST_1' }
+      its(:name){ should eq 'A new title' }
+      its(:description){ should eq 'The description Date, Open, High'}
+      its(:column_names){ should eq ['Date','Open','High','Low','Last','Close','Total Trade Quantity','Turnover (Lacs)']}
+      its(:data){ should eq Quandl::Data.new([['2013-11-22','1252.0','454.95','448.2','450.0','450.0','1354405.0','6099.41'],['2013-11-21','452.25','457.75','449.1','451.2','451.0','218881.0','992.94']]) }
+    end
+  end
+  
+  context "invalid_data.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['invalid_data'] ) }
+    it{ expect{data}.to raise_error Quandl::Operation::Errors::UnknownDateFormat, /Date/ }
+  end
+  
+  context "unknown_attribute.qdf" do
+    let(:data){ Quandl::Format::Dataset.load( fixtures_data['unknown_attribute'] ) }
+    it{ expect{data}.to raise_error Quandl::Format::Errors::UnknownAttribute, /this_attribute_does_not_exist/ }
+  end
+  
+end

data/spec/lib/quandl/format/dataset/load_spec.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Format::Dataset::Load do
+  
+  let(:format){ qdf_format }
+  
+  describe ".file" do
+    subject{ Quandl::Format::Dataset::Load.file("spec/fixtures/data/valid.qdf") }
+    its(:count){ should eq 3 }
+  end
+  
+  describe ".string" do
+    
+    let(:collection){ Quandl::Format::Dataset::Load.string(format) }
+    subject{ collection }
+    
+    its(:count){ should eq 2 }
+    
+    describe "#first" do
+      subject{ collection.first }
+
+      it{ should be_a Quandl::Format::Dataset }
+      its(:source_code){ should eq 'NSE' }
+      its(:code){ should eq 'OIL' }
+      its(:name){ should eq 'Oil India Limited' }
+      its(:description){ should eq "Here is a description with multiple lines.\nThis is the second line." }
+      its(:column_names){ should eq ['Date', 'Value', 'High', 'Low'] }
+      its(:data){ should eq Quandl::Data.new([["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"],["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]]) }
+    end
+  end
+  
+end

data/spec/lib/quandl/format/dataset_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Format::Dataset do
+  
+  let(:attributes) { qdf_attributes }
+  
+  subject{ Quandl::Format::Dataset.new(attributes) }
+  
+  its(:code){ should eq 'DATASET_CODE_2' }
+  its(:source_code){ should eq 'SOURCE_CODE' }
+  its(:name){ should eq 'Test Dataset Name 2' }
+  its(:description){ should eq "Here is a description with multiple lines.\n This is the second line." }
+  its(:column_names){ should eq ['Date', 'Value', 'High', 'Low'] }
+  its(:data){ should eq Quandl::Data.new([["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]]) }
+  
+  its(:attributes){ should eq attributes }
+  
+  its(:to_qdf){ should eq qdf_attributes_to_format }
+  
+end

data/spec/spec_helper.rb

@@ -3,8 +3,15 @@ if ENV['COVERAGE']
   SimpleCov.start
 end
 
+Dir.glob( File.join( File.dirname(__FILE__), 'fixtures/**/*.rb' ) ).each{|f| require(f) }
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "rspec"
 require "quandl/format"
-require 'pry'
+require "config/client"
+require "config/logger"
+require 'pry'
+
+# Replace Quandl::Logger with Spec::Logger that will raise errors sent to #error
+# This allows us to easily test error assertions in spec/lib/quandl/format/errors_spec.rb
+Quandl::Logger.use(Spec::Logger)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_format
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,19 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: quandl_operation
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: quandl_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.2'
 description: Data will be loaded and dumped.
 email:
 - blake@hilscher.ca
@@ -103,18 +131,33 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - UPGRADE.md
+- lib/quandl/client/dataset/to_qdf.rb
 - lib/quandl/format.rb
-- lib/quandl/format/dump.rb
-- lib/quandl/format/load.rb
-- lib/quandl/format/node.rb
+- lib/quandl/format/dataset.rb
+- lib/quandl/format/dataset/attributes.rb
+- lib/quandl/format/dataset/client.rb
+- lib/quandl/format/dataset/dump.rb
+- lib/quandl/format/dataset/load.rb
+- lib/quandl/format/errors.rb
 - lib/quandl/format/version.rb
 - quandl_format.gemspec
-- spec/lib/quandl/format/load_spec.rb
-- spec/lib/quandl/format/node_spec.rb
+- spec/config/client.rb
+- spec/config/logger.rb
+- spec/fixtures/data/invalid_data.qdf
+- spec/fixtures/data/unknown_attribute.qdf
+- spec/fixtures/data/valid.qdf
+- spec/fixtures/format.rb
+- spec/lib/quandl/client/dataset_spec.rb
+- spec/lib/quandl/format/dataset/attributes_spec.rb
+- spec/lib/quandl/format/dataset/client_spec.rb
+- spec/lib/quandl/format/dataset/errors_spec.rb
+- spec/lib/quandl/format/dataset/load_spec.rb
+- spec/lib/quandl/format/dataset_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
 licenses:
@@ -141,6 +184,16 @@ signing_key:
 specification_version: 4
 summary: Quandl Data Format
 test_files:
-- spec/lib/quandl/format/load_spec.rb
-- spec/lib/quandl/format/node_spec.rb
+- spec/config/client.rb
+- spec/config/logger.rb
+- spec/fixtures/data/invalid_data.qdf
+- spec/fixtures/data/unknown_attribute.qdf
+- spec/fixtures/data/valid.qdf
+- spec/fixtures/format.rb
+- spec/lib/quandl/client/dataset_spec.rb
+- spec/lib/quandl/format/dataset/attributes_spec.rb
+- spec/lib/quandl/format/dataset/client_spec.rb
+- spec/lib/quandl/format/dataset/errors_spec.rb
+- spec/lib/quandl/format/dataset/load_spec.rb
+- spec/lib/quandl/format/dataset_spec.rb
 - spec/spec_helper.rb

data/lib/quandl/format/node.rb

@@ -1,73 +0,0 @@
-class Quandl::Format::Node
-  
-  META_ATTRIBUTES = :source_code, :code, :name, :description, :private, :display_url
-  DATA_ATTRIBUTES = :column_names, :data
-  
-  attr_accessor *( META_ATTRIBUTES + DATA_ATTRIBUTES )
-
-  class << self
-    
-    def attribute_names
-      @attribute_names ||= meta_attribute_names + data_attribute_names
-    end
-    
-    def meta_attribute_names
-      META_ATTRIBUTES
-    end
-    
-    def data_attribute_names
-      DATA_ATTRIBUTES
-    end
-    
-  end
-
-  def initialize(attrs)
-    assign_attributes(attrs)
-  end
-
-  def assign_attributes(attrs)
-    attrs.each do |key, value|
-      self.send("#{key}=", value) if self.respond_to?(key)
-    end
-  end
-
-  def full_code=(value)
-    value = value.split('/')
-    self.source_code = value[0]
-    self.code = value[1]
-  end
-
-  def full_code
-    [source_code, code].join('/')
-  end
-  
-  def description=(value)
-    @description = value.to_s.gsub('\n', "\n")
-  end
-  
-  def data=(rows)
-    self.column_names = rows.shift unless rows.first.collect{|r| r.to_s.numeric? }.include?(true)
-    @data = rows
-  end
-
-  def column_names=(names)
-    @column_names = Array(names).flatten.collect{|n| n.strip.rstrip }
-  end
-
-  def to_qdf
-    Quandl::Format::Dump.node(self)
-  end
-
-  def meta_attributes
-    self.class.meta_attribute_names.inject({}){|m,k| m[k] = self.send(k); m }
-  end
-
-  def attributes
-    self.class.attribute_names.inject({}){|m,k| m[k] = self.send(k); m }
-  end
-
-  def inspect
-    "<##{self.class.name} #{meta_attributes.to_s} >"
-  end
-  
-end

data/spec/lib/quandl/format/load_spec.rb

@@ -1,54 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Quandl::Format::Load do
-  
-  let(:qdf_dataset){
-    %Q{
-      # first dataset
-      source_code: NSE
-      code: OIL
-      name: Oil India Limited
-      description: |-
-        Here is a description with multiple lines.
-        This is the second line.
-      -
-      Date, Value, High, Low
-      2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
-      2013-11-19,10.039388096885814,,14.09718770934256
-      
-      # Second dataset
-      code:           DATASET_CODE_2
-      source_code:    SOURCE_CODE_2
-      name:           Test Dataset Name 2
-      description:    Here is a description with multiple lines.
-      -
-      Date, Value, High, Low
-      2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
-      2013-11-19,10.039388096885814,,14.09718770934256
-      2013-11-18,11.039388096885814,,15.09718770934256
-    }
-  }
-  
-  describe ".from_string" do
-    
-    let(:collection){ Quandl::Format::Load.from_string(qdf_dataset) }
-    subject{ collection }
-    
-    its(:count){ should eq 2 }
-    
-    describe "#first" do
-      subject{ collection.first }
-
-      it{ should be_a Quandl::Format::Node }
-      its(:source_code){ should eq 'NSE' }
-      its(:code){ should eq 'OIL' }
-      its(:name){ should eq 'Oil India Limited' }
-      its(:description){ should eq "Here is a description with multiple lines.\nThis is the second line." }
-      its(:column_names){ should eq ['Date', 'Value', 'High', 'Low'] }
-      its(:data){ should eq [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
-        ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]] }
-    end
-  end
-  
-end

data/spec/lib/quandl/format/node_spec.rb

@@ -1,44 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Quandl::Format::Node do
-  
-  let(:attributes) { {
-    code:           'DATASET_CODE_2',
-    source_code:    'SOURCE_CODE',
-    name:           'Test Dataset Name 2',
-    description:    "Here is a description with multiple lines.\n This is the second line.",
-    column_names:   ['Date', 'Value', 'High', 'Low'],
-    private:        false,
-    display_url:    'http://test.com/',
-    data:           [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
-                    ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]], 
-  }}
-  
-  subject{ Quandl::Format::Node.new(attributes) }
-  
-  its(:code){ should eq 'DATASET_CODE_2' }
-  its(:source_code){ should eq 'SOURCE_CODE' }
-  its(:name){ should eq 'Test Dataset Name 2' }
-  its(:description){ should eq "Here is a description with multiple lines.\n This is the second line." }
-  its(:column_names){ should eq ['Date', 'Value', 'High', 'Low'] }
-  its(:data){ should eq [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
-                    ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]] }
-                    
-  its(:attributes){ should eq attributes }
-  
-  its(:to_qdf){ should eq %Q{source_code: SOURCE_CODE
-code: DATASET_CODE_2
-name: Test Dataset Name 2
-description: |-
-  Here is a description with multiple lines.
-   This is the second line.
-private: false
-display_url: http://test.com/
--
-Date,Value,High,Low
-2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
-2013-11-19,10.039388096885814,,14.09718770934256
-}}
-
-end