simple_time_series 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a3e14fd7eff38cbdbb58579d7bebbc7e3899da
-  data.tar.gz: 023551817a829f9bea6da942a8f627ad844796cc
+  metadata.gz: a33413b0800112a07b7b347449f23083d6818e21
+  data.tar.gz: eecea33cfd1e112e46dab628c0c998ccf79817fc
 SHA512:
-  metadata.gz: 5062c774092d7ae6b36c8cb0af664c2b41796dc073bef4c99630946dd2df91e032cd3c30063aa570843e9aee3c5f85177b640ffd1e2e0e4acf44d3a575376817
-  data.tar.gz: ca7130e239cf7cc6dcf6dcf83c84207983728a07827d0e04d86399db99f07b9073aeb1241b4b46327a3ffca6176275add7ab3f30080cb6d020ee395d6a10e0b3
+  metadata.gz: 4dbebf90278966bc1ac4310f8acbc01dd3fb57dada2c656fcb00fd51aff1704a32c80d6ce1c565ba6856e602321f264acee9d0898d4134adac457bd5ce03e76d
+  data.tar.gz: a2d325dcf5de97d353835e1170f41f94e89a5f5e7c778fbb11a89c86059f52c49308f77fe75a0ce0319e2818179b8847fd6fdc86f8cc30f1cf3ff6e8ad94f9ca

data/README.md

@@ -201,6 +201,78 @@ It also calculates cumulative sums for any data_var:
     my_data.tasks_done_cumsum('Sunday','Monday') # returns [2, 5]
     my_data.tasks_done_cumsum('Tuesday','Saturday') # returns [5, 19, 22, 33, 33]
 
+You can extract subsets of your data into arrays of arrays with #data_array:
+
+      my_data.data_array('tasks_done', {})
+        => [ [2, 3, 0, 14, 3, 11, 0] ]
+
+      my_data.data_array('dates', 'tasks_done', 'pizzas', {})
+        =>
+        [ ['2014-01-01', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+          [2, 3, 0, 14, 3, 11, 0],
+          [0, 0, 1, 0, 0.5, 0, 2] ]
+
+You can tell it to prepend the variable name to each array:
+
+      my_data.data_array('tasks_done', {:prepend_names => true})
+        =>
+        [ ['tasks_done', 2, 3, 0, 14, 3, 11, 0] ]
+
+      my_data.data_array('miles', 'tasks_done', {:prepend_names => true})
+        =>
+        [ ['miles', 2.2, 3.1, 0.0, 4.3, 1.2, 12.2, 2.3],
+          ['tasks_done', 2, 3, 0, 14, 3, 11, 0] ]
+
+      my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => true})
+        =>
+        [ ['dates', '2014-01-01', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+          ['tasks_done', 2, 3, 0, 14, 3, 11, 0],
+          ['pizzas', 0, 0, 1, 0, 0.5, 0, 2] ]
+
+      my_data.data_array('tasks_done', 'pizzas', {:start => 'Monday',
+                                                  :end => 'Friday',
+                                                  :prepend_names => true})
+        =>
+        [ ['tasks_done', 3, 0, 14, 3, 11],
+          ['pizzas', 0, 1, 0, 0.5, 0] ]
+
+      my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => true,
+                                                           :start => '2014-01-02',
+                                                           :end => 'Saturday'})
+        =>
+        [ ['dates', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+          ['tasks_done', 3, 0, 14, 3, 11, 0],
+          ['pizzas', 0, 1, 0, 0.5, 0, 2] ]
+
+      my_data.data_array('tasks_done', {:prepend_names => true})
+        =>
+        [ ['tasks_done', 2, 3, 0, 14, 3, 11, 0] ]
+
+      my_data.data_array('miles', 'tasks_done', {:prepend_names => true})
+        =>
+        [ ['miles', 2.2, 3.1, 0.0, 4.3, 1.2, 12.2, 2.3],
+          ['tasks_done', 2, 3, 0, 14, 3, 11, 0] ]
+
+      my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => true})
+        =>
+        [ ['dates', '2014-01-01', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+          ['tasks_done', 2, 3, 0, 14, 3, 11, 0],
+          ['pizzas', 0, 0, 1, 0, 0.5, 0, 2] ]
+
+      my_data.data_array('tasks_done', 'pizzas', {:start => 'Monday', :end => 'Friday',
+                                                   :prepend_names => true}).
+        =>
+        [ ['tasks_done', 3, 0, 14, 3, 11],
+          ['pizzas', 0, 1, 0, 0.5, 0] ]
+
+      my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => true,
+                                                            :start => '2014-01-02',
+                                                            :end => 'Saturday'})
+        =>
+        [ ['dates', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+          ['tasks_done', 3, 0, 14, 3, 11, 0],
+          ['pizzas', 0, 1, 0, 0.5, 0, 2] ]
+
 Currently, SimpleTimeSeries assumes all variable arrays have equal lengths and represent the same sequence of observations. Though the gem says "time series," it should work with any kind of sequential data.
 
 ## Disclaimer

data/lib/simple_time_series/simple_time_series.rb

@@ -61,6 +61,7 @@ class SimpleTimeSeries
     define_getter_and_setter(var)
     instance_variable_set("@#{var}", vals) if vals
     time_vars[var] = vals unless time_vars.has_key?(var)
+    define_var_on(var)
   end
 
   def new_data_var(var, vals)
@@ -100,6 +101,16 @@ class SimpleTimeSeries
           return answer.length == 1 ? answer[0] : answer
         end
       end
+    end
+    define_var_on(var)
+    instance_variable_set("@#{var}", vals) if vals
+    data_vars[var] = vals unless data_vars.has_key?(var)
+  end
+
+  private
+
+  def define_var_on(var)
+    self.class.class_eval do
       define_method("#{var}_on") do |first, last=nil, opts={}|
         time_vars.each do |tv_key, tv_val|
           # tv_key is something like 'dows' or 'dates'
@@ -119,12 +130,8 @@ class SimpleTimeSeries
         end
       end
     end
-    instance_variable_set("@#{var}", vals) if vals
-    data_vars[var] = vals unless data_vars.has_key?(var)
   end
 
-  private
-
   def define_time_methods_and_set_values
     time_vars.each do |var, vals|
       new_time_var(var, vals)

data/lib/simple_time_series/version.rb

@@ -1,3 +1,3 @@
 class SimpleTimeSeries
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/simple_time_series_spec.rb

@@ -279,10 +279,10 @@ describe SimpleTimeSeries do
     it "builds an array of specified arrays" do
       @my_data.data_array('tasks_done', {}).should == [ @my_data.current('tasks_done') ]
       @my_data.data_array('tasks_done', {}).should == [ [2, 3, 0, 14, 3, 11, 0] ]
-      @my_data.data_array('dates', 'tasks_done', 'pizzas', {}).
-               should == [ @my_data.current('dates'),
-                           @my_data.current('tasks_done'),
-                           @my_data.current('pizzas') ]
+      @my_data.data_array('dates', 'tasks_done', 'pizzas', {}).should ==
+        [ ['2014-01-01', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+          [2, 3, 0, 14, 3, 11, 0],
+          [0, 0, 1, 0, 0.5, 0, 2] ]
       @my_data.data_array('tasks_done', 'pizzas', {:start => 'Tuesday', :end => 'Thursday'}).
                should == [ @my_data.find('tasks_done','Tuesday','Thursday'),
                            @my_data.find('pizzas', '2014-01-03', 'Jan 5, 2014') ]
@@ -305,10 +305,12 @@ describe SimpleTimeSeries do
                                                    :prepend_names => true}).
                should == [ ['tasks_done', 3, 0, 14, 3, 11],
                            ['pizzas', 0, 1, 0, 0.5, 0] ]
-               #should == [ ['tasks_done', 3, 0, 14, 3, 11], ['pizzas', 0, 1, 0, 0.5, 0] ]
-               #should == [ ['tasks_done', 3, 0, 14, 3, 11], ['pizzas', 0, 1, 0, 0.5, 0] ]
-               #should == [ @my_data.find('tasks_done','Tuesday','Thursday'),
-               #            @my_data.find('pizzas', '2014-01-03', 'Jan 5, 2014') ]
+      @my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => true,
+                                                            :start => '2014-01-02',
+                                                            :end => 'Saturday'}).
+               should == [ ['dates', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+                           ['tasks_done', 3, 0, 14, 3, 11, 0],
+                           ['pizzas', 0, 1, 0, 0.5, 0, 2] ]
     end
 
     #it "builds an array of specified arrays with variable names prepended to each array" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_time_series
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Lavin