quandl_data 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66cac1ad0db0943543233552e5b6d3b81cabf7fe
-  data.tar.gz: 62fe7fc23777141e8625e620afb2e22c96014709
+  metadata.gz: 7b0f288b521778108286a02d72ff8fe057a0c4fe
+  data.tar.gz: 2f0fcaf78040bcfd49bc3eabfa8351d9d6b7d0c4
 SHA512:
-  metadata.gz: 7453e322586fb29caaf1405f483095b6c24ef79c79fbc0d22158875d840c9a55eafd9f07a792a199ce8af7f15be226c591fdaaee6bc05d6599ade7cbbef9bdd3
-  data.tar.gz: 1dc0ea26bfad0e1a3ee8a59535bd10c32e55a0747df17549841565c2503f271bfeaf6be3933ab7389feaced651414a69b0b5ab3582539580f839b8816cc66013
+  metadata.gz: da18bc34e4157033a453de1ce35b1735e7ddfcfa81f46128517c2d63caab378d4d55a085dbac6b3cfcbba2ff9450a3ec820d4f26a07183fa49dda69cd27a59f3
+  data.tar.gz: 1134498d2d40da8e57bcb0b14d9be9d19d0aeb35100e38e0d1a8aa074653670bf64a3470451f8cb58f1f90b832f33ec8423a0229ccb3ea60f09b6c84e5e11997

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

@@ -43,37 +43,47 @@ module Operations
     @data_array = Parse.date_to_julian( data_array )
     self
   end
-  
+
+  def to_date!
+    @data_array = to_date.to_a
+    self
+  end
   def to_date
     Parse.julian_to_date data_array
   end
-  def to_date!
-    @data_array = Parse.julian_to_date data_array
+  
+  def trim_start!(trim_date)
+    @data_array = trim_start(trim_date).to_a
     self
   end
-  
-  def trim_start(date)
+  def trim_start(trim_date)
     # date format
-    date = Date.parse(date) if date.is_a?(String)
-    date = date.jd if date.respond_to?(:jd)
+    trim_date = Date.parse(trim_date) if trim_date.is_a?(String)
+    trim_date = trim_date.jd if trim_date.respond_to?(:jd)
     # find index
-    index = data_array.rindex{|r| r[0] == date }
-    # trim if index is valid
-    @data_array = @data_array[index..-1] if index && @data_array[index]
-    # chainable
+    return self unless trim_date.is_a?(Integer)
+    # reject rows with dates less than
+    sort_descending.delete_if do |row|
+      row_date = row[0]
+      row_date < trim_date
+    end
+  end
+  
+  def trim_end!(trim_date)
+    @data_array = trim_end(trim_date).to_a
     self
   end
-
-  def trim_end(date)
+  def trim_end(trim_date)
     # date format
-    date = Date.parse(date) if date.is_a?(String)
-    date = date.jd if date.respond_to?(:jd)
+    trim_date = Date.parse(trim_date) if trim_date.is_a?(String)
+    trim_date = trim_date.jd if trim_date.respond_to?(:jd)
     # find index
-    index = data_array.rindex{|r| r[0] == date }
-    # trim if index is valid
-    @data_array = @data_array[0..index] if index && @data_array[index]
-    # chainable
-    self
+    return self unless trim_date.is_a?(Integer)
+    # reject rows with dates less than
+    sort_descending.delete_if do |row|
+      row_date = row[0]
+      row_date > trim_date
+    end
   end
   
   def limit(amount)
@@ -85,21 +95,21 @@ module Operations
     dir == :asc ? sort_ascending! : sort_descending!
   end
   
+  def sort_ascending!
+    @data_array = sort_ascending.to_a
+    self
+  end
   def sort_ascending
     Table.new( Parse.sort( data_array, :asc ), frequency: frequency )
   end
-  def sort_ascending!
-    @data_array = Parse.sort( data_array, :asc )
+
+  def sort_descending!
+    @data_array = sort_descending.to_a
     self
   end
-  
   def sort_descending
     Table.new( Parse.sort( data_array, :desc ), frequency: frequency )
   end
-  def sort_descending!
-    @data_array = Parse.sort( data_array, :desc )
-    self
-  end
   
   def transform(*args)
     return @transform unless args.first.present?

data/lib/quandl/data/version.rb

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

data/spec/quandl/data_spec.rb

@@ -51,4 +51,18 @@ describe Quandl::Data::Table do
     subject.to_date.first.first.should be_a Date
   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
+  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
+  end
+  
 end

metadata

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