quandl_operation 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7881122ddea828dd458817aa7de4facbb24dd7ba
-  data.tar.gz: 1604dc65536cce9cf67a8e89a79a872f4ffffa0a
+  metadata.gz: b7d2fcd944ad2dc1d1b251472b4fd21246f3d689
+  data.tar.gz: e0bc3a24a4069a5ec6b7ba42f2a6e9788f3d99cb
 SHA512:
-  metadata.gz: 7c1425f09dcea673d51d707886594de40f1930f0f61e2b176b43047c92dff746e717b3ca44fbf469f2f611dee8ce9157ed36053022068f7775770176875e550c
-  data.tar.gz: 276cc0608fd53738e2f0874e6edcefe9b882865493f2753f61402ee3c3d10a2eee7c57c1bd238924c75ff45b0056aad9aa6770c2e9c922af673b55489f4477d0
+  metadata.gz: f9a93903052832e5567b45a42467e6a0d89d9b7a76800a65d972cfa6cf88a3e973aff49d6bbb7b2eaef50a554312be1349c4e12e30a99c9177cd707c53472f68
+  data.tar.gz: 8a4c52d84b8a2bd1701f0436312d4fc87a57c65e7a4bdcdc73acbe5979c3c16d0cc1d0e3738a1ceb6389026c477aac2e94fb8eb6d6adc3c2c75df7b9763743f2

data/UPGRADE.md

@@ -1,3 +1,8 @@
+## 0.1.21
+
+* QDFormat should handle new lines in attributes
+
+
 ## 0.1.20
 
 * qdformat#to_qdf

data/lib/quandl/operation/qdformat/dump.rb

@@ -27,9 +27,17 @@ class Dump
   end
 
   def attributes
-    [:source_code, :code, :name, :description].
-    inject({}){|m,k| m[k.to_s] = node.send(k) unless node.send(k).blank?; m }.
-    to_yaml[4..-1]
+    attrs = [:source_code, :code, :name, :description].inject({}) do |memo, name|
+      name = name.to_s
+      memo[name] = node.send(name) if node.respond_to?(name) && node.send(name).present?
+      memo[name] = memo[name].gsub("\n", '\n') if memo[name].present?
+      memo
+    end
+    attrs.to_yaml[4..-1]
+  end
+  
+  def description
+    record.description
   end
 
   def data

data/lib/quandl/operation/qdformat/load.rb

@@ -7,14 +7,14 @@ class Quandl::Operation::QDFormat::Load
     end
   
     def from_string(input)
-      nodes = []
+      nodes = [{ attributes: '', data: '' }]
       input.each_line do |line|
         # strip whitespace
         line = line.strip.rstrip
         # ignore comments and blank lines
         next if line[0] == '#' || line.blank?
         # code_format denotes the start of a new node
-        nodes << { attributes: '', data: '' } if line =~ code_format
+        nodes << { attributes: '', data: '' } if line[0..2] == node_delimiter
         # attribute_format denotes an attribute
         if line =~ attribute_format
           # add the attribute to attributes
@@ -26,6 +26,7 @@ class Quandl::Operation::QDFormat::Load
       end
       # append the current node
       nodes = parse_nodes(nodes)
+      nodes = initialize_nodes(nodes)
       nodes
     end
     
@@ -34,14 +35,26 @@ class Quandl::Operation::QDFormat::Load
     
     def parse_nodes(nodes)
       nodes.collect do |node|
+        # parse attrs as yaml
         node[:attributes] = YAML.load( node[:attributes] )
+        # replace new line characters
+        node[:attributes].each do |key, value|
+          node[:attributes][key].gsub!('\n', "\n") if node[:attributes][key].respond_to?(:gsub!)
+        end
+        # parse data as csv
         node[:attributes][:data] = CSV.parse(node[:data])
+        node
+      end
+    end
+    
+    def initialize_nodes(nodes)
+      nodes.collect do |node|
         Quandl::Operation::QDFormat::Node.new(node[:attributes])
       end
     end
-  
-    def code_format
-      /^code: (.+)/
+    
+    def node_delimiter
+      '---'
     end
   
     def attribute_format

data/lib/quandl/operation/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Operation
-  VERSION = "0.1.20"
+  VERSION = "0.1.21"
 end
 end

data/spec/lib/quandl/operation/{qdformat_spec.rb → qdformat/load_spec.rb}

@@ -2,26 +2,26 @@
 require 'quandl/operation/qdformat'
 require 'spec_helper'
 
-describe Quandl::Operation::QDFormat do
+describe Quandl::Operation::QDFormat::Load do
   
   let(:qdf_dataset){
     %Q{
       # YAML metadata
-      code:           DATASET_CODE
-      source_code:    SOURCE_CODE
-      name:           Test Dataset Name 1
-      description:    Here is a description with multiple lines.\\n This is the second line.
+      source_code: NSE
+      code: OIL
+      name: Oil India Limited
+      description: 'Historical prices for Oil India Limited (OIL), (ISIN: INE274J01014), National \\nStock Exchange of India.'
       # CSV data
       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.
-      # CSV data
+      
       Date, Value, High, Low
       2013-11-20,9.99470588235294,11.003235294117646,14.00164705882353
       2013-11-19,10.039388096885814,,14.09718770934256
@@ -29,10 +29,9 @@ describe Quandl::Operation::QDFormat do
     }
   }
   
-  let(:collection){ Quandl::Operation::QDFormat.load(qdf_dataset) }
-  
-  describe ".load" do
+  describe ".from_string" do
     
+    let(:collection){ Quandl::Operation::QDFormat::Load.from_string(qdf_dataset) }
     subject{ collection }
     
     its(:count){ should eq 2 }
@@ -41,13 +40,12 @@ describe Quandl::Operation::QDFormat do
       subject{ collection.first }
 
       it{ should be_a Quandl::Operation::QDFormat::Node }
-      its(:source_code){ should eq 'SOURCE_CODE' }
-      its(:code){ should eq 'DATASET_CODE' }
-      its(:name){ should eq 'Test Dataset Name 1' }
-      its(:description){ should eq 'Here is a description with multiple lines.\n This is the second line.' }
+      its(:source_code){ should eq 'NSE' }
+      its(:code){ should eq 'OIL' }
+      its(:name){ should eq 'Oil India Limited' }
+      its(:description){ should eq "Historical prices for Oil India Limited (OIL), (ISIN: INE274J01014), National \nStock Exchange of India." }
       its(:column_names){ should eq ['Date', 'Value', 'High', 'Low'] }
-      its(:data){ should eq [
-        ["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
+      its(:data){ should eq [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
         ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]] }
     end
   end

data/spec/lib/quandl/operation/qdformat/node_spec.rb

@@ -8,7 +8,7 @@ describe Quandl::Operation::QDFormat::Node do
     code:           'DATASET_CODE',
     source_code:    'SOURCE_CODE',
     name:           'Test Dataset Name 1',
-    description:    "Here is a description with multiple lines.\\n This is the second line.",
+    description:    "Here is a description with multiple lines.\n This is the second line.",
     column_names:   ['Date', 'Value', 'High', 'Low'],
     data:           [["2013-11-20", "9.99470588235294", "11.003235294117646", "14.00164705882353"], 
                     ["2013-11-19", "10.039388096885814", nil, "14.09718770934256"]], 
@@ -19,7 +19,7 @@ describe Quandl::Operation::QDFormat::Node do
   its(:code){ should eq 'DATASET_CODE' }
   its(:source_code){ should eq 'SOURCE_CODE' }
   its(:name){ should eq 'Test Dataset Name 1' }
-  its(:description){ should eq "Here is a description with multiple lines.\\n This is the second line." }
+  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"]] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_operation
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Blake Hilscher
@@ -158,8 +158,8 @@ files:
 - spec/lib/quandl/operation/collapse_spec.rb
 - spec/lib/quandl/operation/date_spec.rb
 - spec/lib/quandl/operation/parse_spec.rb
+- spec/lib/quandl/operation/qdformat/load_spec.rb
 - spec/lib/quandl/operation/qdformat/node_spec.rb
-- spec/lib/quandl/operation/qdformat_spec.rb
 - spec/lib/quandl/operation/transform_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
@@ -190,7 +190,7 @@ test_files:
 - spec/lib/quandl/operation/collapse_spec.rb
 - spec/lib/quandl/operation/date_spec.rb
 - spec/lib/quandl/operation/parse_spec.rb
+- spec/lib/quandl/operation/qdformat/load_spec.rb
 - spec/lib/quandl/operation/qdformat/node_spec.rb
-- spec/lib/quandl/operation/qdformat_spec.rb
 - spec/lib/quandl/operation/transform_spec.rb
 - spec/spec_helper.rb