quandl_data 0.1.11 → 1.0.0

data/README.md

@@ -1,26 +1,26 @@
 # Quandl::Data
 
-### Quandl::Data::Table
+### Quandl::Data
 
 ```ruby
 
 require 'quandl/data'
 
-decade_of_daily_data_as_csv = Quandl::Data::Random.table( rows: 3650, columns: 4, nils: false ).to_csv
+decade_of_daily_data_as_csv = Quandl::Fabricate::Data.rand( rows: 3650, columns: 4, nils: false ).to_csv
 
-table = Quandl::Data::Table.new( decade_of_daily_data_as_csv )
+table = Quandl::Data.new( decade_of_daily_data_as_csv )
 table.collapse(:monthly).transform(:rdiff).to_date
 
 ```
 
 
-### Quandl::Fabricate::Data::Table
+### Quandl::Fabricate::Data
 
 ```ruby
 
 require 'quandl/fabricate/data'
 
-data = Quandl::Fabricate::Data::Table.rand( rows: 4, columns: 2, nils: false )
+data = Quandl::Fabricate::Data.rand( rows: 4, columns: 2, nils: false )
 data.to_csv
 
 => "2456459,9.75573946698621,11.003327581245657\n2456460,9.815208080651333,11.06123640714187\n2456461,9.85055418685121,11.054083764705883\n2456462,9.915882352941177,10.96635294117647\n"

data/UPGRADE.md

@@ -1,7 +1,14 @@
+## 1.0.0
+
+* Quandl::Data::Table is removed. Replaced by: Quandl::Data
+* Quandl::Fabricate::Data::Table is remove. Replaced by: Quandl::Fabricate::Data
+
+
 ## 0.1.11
 
 * add quandl/fabricate/data. deprecate Quandl::Data::Random.table
 
+
 ## 0.1
 
 * Initial

data/lib/quandl/data/{table.rb → enumerator.rb}

@@ -1,20 +1,15 @@
-require 'quandl/data/table/loggable'
-require 'quandl/data/table/operations'
-
-module Quandl
-module Data
+module Quandl::Data::Enumerator
+  extend ActiveSupport::Concern
   
-class Table
-
-  include Operations
-  include Loggable
+  included do
+    
+    delegate *Array.forwardable_methods, to: :data_array
   
-  delegate *Array.forwardable_methods, to: :data_array
+    delegate :to_json, :as_json, to: :data_array
   
-  delegate :to_json, :as_json, to: :data_array
+    attr_accessor :pristine_data
+  end
   
-  attr_accessor :pristine_data
-
   def initialize(*args)
     self.pristine_data = args.first
     self.attributes = args.extract_options!
@@ -48,6 +43,4 @@ class Table
     end
   end
   
-end  
-end
-end
+end

data/lib/quandl/data/logging.rb

@@ -0,0 +1,19 @@
+module Quandl::Data::Logging
+  
+  extend ActiveSupport::Concern
+
+  def to_h
+    t1 = Time.now
+    r = super
+    Quandl::Logger.debug("#{self.class.name}.to_h (#{t1.elapsed_ms})")
+    r
+  end
+  
+  def to_csv
+    t1 = Time.now
+    r = super
+    Quandl::Logger.debug("#{self.class.name}.to_csv (#{t1.elapsed_ms})")
+    r
+  end
+  
+end

data/lib/quandl/data/{table/operations.rb → operations.rb}

@@ -1,8 +1,4 @@
-module Quandl
-module Data
-class Table
-  
-module Operations
+module Quandl::Data::Operations
   
   extend ActiveSupport::Concern
   include Quandl::Operation
@@ -37,7 +33,7 @@ module Operations
   end
   
   def to_jd
-    Table.new( Parse.date_to_julian( data_array ), frequency: frequency )
+    Quandl::Data.new( Parse.date_to_julian( data_array ), frequency: frequency )
   end
   def to_jd!
     @data_array = Parse.date_to_julian( data_array )
@@ -49,7 +45,7 @@ module Operations
     self
   end
   def to_date
-    Table.new( Parse.julian_to_date( data_array ) )
+    Quandl::Data.new( Parse.julian_to_date( data_array ) )
   end
   
   def trim_start!(trim_date)
@@ -67,7 +63,7 @@ module Operations
       row_date = row[0]
       row_date < trim_date
     end
-    Table.new(data)
+    Quandl::Data.new(data)
   end
   
   def trim_end!(trim_date)
@@ -85,7 +81,7 @@ module Operations
       row_date = row[0]
       row_date > trim_date
     end
-    Table.new(data)
+    Quandl::Data.new(data)
   end
   
   def limit!(amount)
@@ -93,7 +89,7 @@ module Operations
     self
   end
   def limit(amount)
-    Table.new( data_array[0..( amount.to_i - 1 )] )
+    Quandl::Data.new( data_array[0..( amount.to_i - 1 )] )
   end
   
   def sort_order(dir)
@@ -105,7 +101,7 @@ module Operations
     self
   end
   def sort_ascending
-    Table.new( Parse.sort( data_array.dup, :asc ), frequency: frequency )
+    Quandl::Data.new( Parse.sort( data_array.dup, :asc ), frequency: frequency )
   end
 
   def sort_descending!
@@ -113,7 +109,7 @@ module Operations
     self
   end
   def sort_descending
-    Table.new( Parse.sort( data_array.dup, :desc ), frequency: frequency )
+    Quandl::Data.new( Parse.sort( data_array.dup, :desc ), frequency: frequency )
   end
   
   def transform(*args)
@@ -149,8 +145,4 @@ module Operations
     data
   end
   
-end
-
-end
-end
 end

data/lib/quandl/data/version.rb

@@ -1,5 +1,5 @@
 module Quandl
-module Data
-  VERSION = "0.1.11"
+class Data
+  VERSION = "1.0.0"
 end
 end

data/lib/quandl/data.rb

@@ -7,10 +7,12 @@ require "active_support/core_ext/object"
 
 require "quandl/operation"
 
-require 'quandl/data/table'
-require 'quandl/data/random'
+require 'quandl/data/enumerator'
+require 'quandl/data/operations'
+require 'quandl/data/logging'
 
-module Quandl
-  module Data
-  end
+class Quandl::Data
+  include Enumerator
+  include Operations
+  include Logging if defined?(QUANDL_LOGGER) && QUANDL_LOGGER == true
 end

data/lib/quandl/fabricate/data.rb

@@ -1,101 +1,89 @@
-module Quandl
-module Fabricate
-module Data
+class Quandl::Fabricate::Data
   
-  class Table
-    
-    class << self
+  def self.rand(*args)
+    new(*args).random
+  end
   
-      def rand(*args)
-        new(*args).random
-      end
-      
-    end
+  attr_accessor :attributes, :offset, :rows, :columns, :frequency, :data, :nils
 
-    attr_accessor :attributes, :offset, :rows, :columns, :frequency, :data, :nils
-
-    def initialize(*args)
-      self.attributes = default_options.merge args.extract_options!
-    end
+  def initialize(*args)
+    self.attributes = default_options.merge args.extract_options!
+  end
 
-    def to_csv(*args)
-      data.collect(&:to_csv).join
-    end
+  def to_csv(*args)
+    data.collect(&:to_csv).join
+  end
 
-    def random_column
-      self.columns = 1
-      random
-    end
+  def random_column
+    self.columns = 1
+    random
+  end
 
-    def random
-      data = []
-      index = 0
-      until data.count >= rows
-        data << row(index) unless nils
-        index += 1
-      end
-      Quandl::Data::Table.new( data ).sort_descending
+  def random
+    data = []
+    index = 0
+    until data.count >= rows
+      data << row(index) unless nils
+      index += 1
     end
+    Quandl::Data.new( data ).sort_descending
+  end
 
-    def row(index)
-      row = [ date(index) ]
-      columns.times{|column_index| row << point(index, column_index) }
-      row
-    end
+  def row(index)
+    row = [ date(index) ]
+    columns.times{|column_index| row << point(index, column_index) }
+    row
+  end
 
-    def date(index)
-      (Date.today - ( index * ( frequencies[frequency] ) - offset )).jd
-    end
+  def date(index)
+    (Date.today - ( index * ( frequencies[frequency] ) - offset )).jd
+  end
 
-    def point(row_index, column_index)
-      percent = ( (rand(10).to_f / 1000) ) - ( (rand(10).to_f / 850) ) + 1
-      # increase the value
-      trending_point[column_index] ||= column_index * column_index + 10
-      trending_point[column_index] = trending_point[column_index] * percent
-      # increase
-      nils ? nil : trending_point[column_index]
-    end
+  def point(row_index, column_index)
+    percent = ( (rand(10).to_f / 1000) ) - ( (rand(10).to_f / 850) ) + 1
+    # increase the value
+    trending_point[column_index] ||= column_index * column_index + 10
+    trending_point[column_index] = trending_point[column_index] * percent
+    # increase
+    nils ? nil : trending_point[column_index]
+  end
 
-    def trending_point
-      @trending_point ||= {}
-    end
+  def trending_point
+    @trending_point ||= {}
+  end
 
-    def nils
-      @nils == false ? false : rand(6) == 1
-    end
+  def nils
+    @nils == false ? false : rand(6) == 1
+  end
 
-    def frequencies
-      {daily: 1, weekly: 7, monthly: 30, quarterly: 90, annual: 365}
-    end
+  def frequencies
+    {daily: 1, weekly: 7, monthly: 30, quarterly: 90, annual: 365}
+  end
 
-    def default_options
-      {
-        offset:     1,
-        rows:       20 + rand(100),
-        columns:    2 + rand(4),
-        frequency:  :daily,
-        monkey:     6
-      }
-    end
+  def default_options
+    {
+      offset:     1,
+      rows:       20 + rand(100),
+      columns:    2 + rand(4),
+      frequency:  :daily,
+      monkey:     6
+    }
+  end
   
-    def attributes
-      @attributes ||= {}
-    end
+  def attributes
+    @attributes ||= {}
+  end
   
-    def attributes=(attrs)
-      assign_attributes(attrs)
-      attributes
-    end
+  def attributes=(attrs)
+    assign_attributes(attrs)
+    attributes
+  end
   
-    # mass assignment protection
-    def assign_attributes(attrs)
-      attrs.each do |name, value|
-        self.send("#{name}=", value) if self.respond_to?("#{name}=")
-      end
+  # mass assignment protection
+  def assign_attributes(attrs)
+    attrs.each do |name, value|
+      self.send("#{name}=", value) if self.respond_to?("#{name}=")
     end
-
   end
-  
-end
-end
+
 end

data/lib/quandl/fabricate.rb

@@ -1,6 +1,5 @@
-require 'quandl/fabricate/data'
-
 module Quandl
-  module Fabricate
-  end
+module Fabricate
+  require 'quandl/fabricate/data'
+end
 end

data/spec/lib/fabricate/data_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Quandl::Fabricate::Data::Table do
+describe Quandl::Fabricate::Data do
   
-  let(:data){ Quandl::Fabricate::Data::Table.rand( rows: 4, columns: 5, nils: false ) }
+  let(:data){ Quandl::Fabricate::Data.rand( rows: 4, columns: 5, nils: false ) }
   subject{ data }
   
-  it{ should be_a Quandl::Data::Table }
+  it{ should be_a Quandl::Data }
   its(:count){ should eq 4 }
   
   describe "#first" do

data/spec/lib/quandl/data_spec.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Quandl::Data::Table do
-  subject { Quandl::Data::Random.table( nils: false, rows: 4, columns: 4 ) }
+describe Quandl::Data do
+  subject { Quandl::Fabricate::Data.rand( nils: false, rows: 4, columns: 4 ) }
 
   its(:to_h){ should be_a Hash }
   its(:count){ should eq 4 }
 
   it "should parse csv" do
-    Quandl::Data::Table.new(subject.to_csv).count.should eq 4
+    Quandl::Data.new(subject.to_csv).count.should eq 4
   end
   
   it "should convert to julian dates" do
@@ -23,14 +23,19 @@ describe Quandl::Data::Table do
     date_data.first.first.should be_a Date
   end
 
-  it "should transform the data" do
-    value = subject.first[1]
-    subject.transform(:rdiff).first[1].should_not eq value
-  end
-
-  it "should transform the data to rdiff from" do
-    data = Quandl::Data::Table.new([[1,3,5],[4,5,4],[5,15,20]])
-    data.transform(:rdiff_from).should eq [[1,4,3],[4,2,4],[5,0,0]]
+  describe "#transform" do
+    it "should rdiff" do
+      value = subject.first[1]
+      subject.transform(:rdiff).first[1].should_not eq value
+    end
+    it "should rdiff_from" do
+      data = Quandl::Data.new([[1,3,5],[4,5,4],[5,15,20]])
+      data.transform(:rdiff_from).should eq [[1,4,3],[4,2,4],[5,0,0]]
+    end
+    it "should cumul" do
+      data = Quandl::Data.new( [[1000, 10], [1001, 20], [1002, 30]] )
+      data.transform(:cumul).should eq [[1000, 10], [1001, 30], [1002, 60]]
+    end
   end
 
   it "should collapse the data" do
@@ -50,8 +55,8 @@ describe Quandl::Data::Table do
       data.should eq subject
     end
   
-    it "should output csv when initialized with a Data::Table" do
-      Quandl::Data::Table.new( subject ).to_csv.should eq subject.to_csv
+    it "should output csv when initialized with a Quandl::Data" do
+      Quandl::Data.new( subject ).to_csv.should eq subject.to_csv
     end
     
   end
@@ -79,7 +84,7 @@ describe Quandl::Data::Table do
   describe "trim_end" do
   
     it "should delete everything after trim_end" do
-      data = Quandl::Data::Random.table( nils: false, rows: 10, columns: 1 ).sort_descending
+      data = Quandl::Fabricate::Data.rand( nils: false, rows: 10, columns: 1 ).sort_descending
       date = data[1][0]
       data.trim_end!(date)
       data.data_array.should be_a Array
@@ -105,7 +110,7 @@ describe Quandl::Data::Table do
   describe "trim_start" do
   
     it "should delete everything before trim_start" do
-      data = Quandl::Data::Random.table( nils: false, rows: 10, columns: 1 ).sort_descending
+      data = Quandl::Fabricate::Data.rand( nils: false, rows: 10, columns: 1 ).sort_descending
       date = data[-2][0]
       data.trim_start(date).count.should eq 9
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_data
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,10 +140,9 @@ files:
 - Rakefile
 - UPGRADE.md
 - lib/quandl/data.rb
-- lib/quandl/data/random.rb
-- lib/quandl/data/table.rb
-- lib/quandl/data/table/loggable.rb
-- lib/quandl/data/table/operations.rb
+- lib/quandl/data/enumerator.rb
+- lib/quandl/data/logging.rb
+- lib/quandl/data/operations.rb
 - lib/quandl/data/version.rb
 - lib/quandl/fabricate.rb
 - lib/quandl/fabricate/data.rb

data/lib/quandl/data/random.rb

@@ -1,16 +0,0 @@
-require 'quandl/data/table/operations'
-
-module Quandl
-module Data
-
-  class Random
-
-    def self.table(*args)
-      warn "[DEPRECATION] `Quandl::Data::Random.table` is deprecated.  Please use `Quandl::Fabricate::Data::Table` instead."
-      Quandl::Fabricate::Data::Table.rand(*args)
-    end
-
-  end
-
-end
-end

data/lib/quandl/data/table/loggable.rb

@@ -1,21 +0,0 @@
-module Quandl
-module Data
-class Table
-  
-module Loggable
-  
-  extend ActiveSupport::Concern
-
-  def to_h
-    Quandl::Logger.info_with_elapsed("Quandl::Data::Table.to_h"){ super }
-  end
-  
-  def to_csv
-    Quandl::Logger.info_with_elapsed("Quandl::Data::Table.to_csv"){ super }
-  end
-  
-end
-
-end
-end
-end