quandl_data 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b0f288b521778108286a02d72ff8fe057a0c4fe
-  data.tar.gz: 2f0fcaf78040bcfd49bc3eabfa8351d9d6b7d0c4
+  metadata.gz: a671dc7961dc824080203af92205cbf45401c38c
+  data.tar.gz: 573b0ccfabfe0b929749f6b2d1d1ff40f10d22fa
 SHA512:
-  metadata.gz: da18bc34e4157033a453de1ce35b1735e7ddfcfa81f46128517c2d63caab378d4d55a085dbac6b3cfcbba2ff9450a3ec820d4f26a07183fa49dda69cd27a59f3
-  data.tar.gz: 1134498d2d40da8e57bcb0b14d9be9d19d0aeb35100e38e0d1a8aa074653670bf64a3470451f8cb58f1f90b832f33ec8423a0229ccb3ea60f09b6c84e5e11997
+  metadata.gz: 5e7dd6185d4c8947fffe2b450fd7c7d6ce217576c1a47e51a7f7cffa2b3c0712a75499f5f7fed0057bec51d71add108c841b3b801e4e756f2932e9ed86a42112
+  data.tar.gz: 2166730089b5375f8eba61a11db1108539bc3e9bf7f3f0c5299e6b8ee6f767675c2eabec9475f564e2a783bc12178e436d9477825dcf9390d20539f1ffd3152f

data/lib/quandl/data/table/operations.rb

@@ -45,15 +45,15 @@ module Operations
   end
 
   def to_date!
-    @data_array = to_date.to_a
+    @data_array = to_date.data_array
     self
   end
   def to_date
-    Parse.julian_to_date data_array
+    Table.new( Parse.julian_to_date( data_array ) )
   end
   
   def trim_start!(trim_date)
-    @data_array = trim_start(trim_date).to_a
+    @data_array = trim_start(trim_date).data_array
     self
   end
   def trim_start(trim_date)
@@ -63,14 +63,15 @@ module Operations
     # find index
     return self unless trim_date.is_a?(Integer)
     # reject rows with dates less than
-    sort_descending.delete_if do |row|
+    data = sort_descending.delete_if do |row|
       row_date = row[0]
       row_date < trim_date
     end
+    Table.new(data)
   end
   
   def trim_end!(trim_date)
-    @data_array = trim_end(trim_date).to_a
+    @data_array = trim_end(trim_date).data_array
     self
   end
   def trim_end(trim_date)
@@ -80,35 +81,39 @@ module Operations
     # find index
     return self unless trim_date.is_a?(Integer)
     # reject rows with dates less than
-    sort_descending.delete_if do |row|
+    data = sort_descending.delete_if do |row|
       row_date = row[0]
       row_date > trim_date
     end
+    Table.new(data)
   end
   
-  def limit(amount)
-    @data_array = data_array[0..( amount.to_i - 1 )] if amount.present?
+  def limit!(amount)
+    @data_array = limit(amount).data_array
     self
   end
+  def limit(amount)
+    Table.new( data_array[0..( amount.to_i - 1 )] )
+  end
   
   def sort_order(dir)
     dir == :asc ? sort_ascending! : sort_descending!
   end
   
   def sort_ascending!
-    @data_array = sort_ascending.to_a
+    @data_array = sort_ascending.data_array
     self
   end
   def sort_ascending
-    Table.new( Parse.sort( data_array, :asc ), frequency: frequency )
+    Table.new( Parse.sort( data_array.dup, :asc ), frequency: frequency )
   end
 
   def sort_descending!
-    @data_array = sort_descending.to_a
+    @data_array = sort_descending.data_array
     self
   end
   def sort_descending
-    Table.new( Parse.sort( data_array, :desc ), frequency: frequency )
+    Table.new( Parse.sort( data_array.dup, :desc ), frequency: frequency )
   end
   
   def transform(*args)

data/lib/quandl/data/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Data
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 end

data/spec/quandl/data_spec.rb

@@ -47,22 +47,62 @@ describe Quandl::Data::Table do
     subject.limit(2).count.should eq 2
   end
   
-  it "should convert julian dates to dates" do
-    subject.to_date.first.first.should be_a Date
+  describe "to_date" do
+
+    it "should convert julian dates to dates" do
+      subject.to_date.first.first.should be_a Date
+    end
+    
   end
   
-  it "should delete everything before trim_start" do
-    data = Quandl::Data::Random.table( nils: false, rows: 10, columns: 1 ).sort_descending
-    date = data[-2][0]
-    data.trim_start(date).count.should eq 9
+  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
+      date = data[1][0]
+      data.trim_end!(date)
+      data.data_array.should be_a Array
+      data.count.should eq 9
+    end
+  
+    it "should be chainable" do
+      subject.trim_end(subject.first.first).trim_end(subject.last.first)
+    end
+    
+    it "should not alter the original object" do
+      data = subject.trim_end(subject[2][0])
+      subject.count.should eq 4
+    end
+    
+    it "should alter the original object" do
+      subject.trim_end!(subject[2][0])
+      subject.count.should eq 2
+    end
+  
   end
   
-  it "should delete everything after trim_end" do
-    data = Quandl::Data::Random.table( nils: false, rows: 10, columns: 1 ).sort_descending
-    date = data[1][0]
-    data.trim_end!(date)
-    data.data_array.should be_a Array
-    data.count.should eq 9
+  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
+      date = data[-2][0]
+      data.trim_start(date).count.should eq 9
+    end
+  
+    it "should be chainable" do
+      subject.trim_start(subject.first.first).trim_end(subject.last.first)
+    end
+    
+    it "should not alter the original object" do
+      data = subject.trim_start(subject[2][0])
+      subject.count.should eq 4
+    end
+    
+    it "should alter the original object" do
+      subject.trim_start!(subject[-3][0])
+      subject.count.should eq 2
+    end
+  
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_data
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Blake Hilscher