simple_time_series 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd605120e06fab71a1bccb9dac79ab16a6880474
-  data.tar.gz: 5a1c66e55f196de999eb07011a60ab3a801e09bb
+  metadata.gz: a1de65d10a8508cd676b70cf80ed57c89ec66d2f
+  data.tar.gz: 662431d9c143297aa5b992cde8331a6c39892035
 SHA512:
-  metadata.gz: 7a7bc9c117b71584071b279137b3d2db9cc80599dc3021495b9f2318d51d7f25dd48877350a6413bd5613954b999e4d014eb3bdfa82159440eb1aedafb56118d
-  data.tar.gz: 1be9e907f24713542848055f1dd1a9cd0d2c256798ad55b3b8b64cd158edddb57a8163ea342b5a864e7cff55304212eefb942a141cdeca3861a4c42796a25935
+  metadata.gz: ed5334c0dc23e5ad262eac7bcedbceedaed3ecf0b7a2c89e86029fd5365e6bd9b4605053f1480e54b8748532dc039fea43e322ef324d7df22f3ee9366350e870
+  data.tar.gz: 8b705e90fb271cd18e7d36576ba52f04f9251602630aca9a2dc6bcf8f88b0bac12a16482341971abfceb2b6f6167c31a02f57c8ada9ac79f9aa5383d5669bfe5

data/lib/simple_time_series/simple_time_series.rb

@@ -1,5 +1,7 @@
 class SimpleTimeSeries
   
+  DEBUG = false
+
   attr_accessor :time_vars, :data_vars
 
   def initialize(opts)
@@ -9,12 +11,9 @@ class SimpleTimeSeries
     define_time_methods_and_set_values
   end
 
-  def find(what, date, end_date=nil)
-    if end_date
-      send (what + '_on').to_sym, date, end_date
-    else
-      send (what + '_on').to_sym, date
-    end
+  def find(what, date, end_date=nil, opts={})
+    puts "Calling send(#{what}_on, #{date}, #{end_date}, #{opts})" if DEBUG
+    send((what + '_on').to_sym, date, end_date, opts)
   end
 
   def find_plus_label(what, date, end_date=nil)
@@ -26,19 +25,20 @@ class SimpleTimeSeries
     err_msg += "Example: {:start => 'Tuesday', :end => '2014-01-06'}\n"
     err_msg += "If you want to use all observations, you can pass a blank hash, like {}\n"
     raise err_msg unless opts
-    data_array = []
+    data_arr = []
     Array(data_var_names).each do |name|
       if opts[:start] && opts[:end]
-        data_array << find(name, opts[:start], opts[:end])
+        puts "Calling find(#{name}, #{opts[:start]}, #{opts[:end]}, #{opts})" if DEBUG
+        data_arr << find(name, opts[:start], opts[:end], opts)
       else
-        data_array << current(name)
+        data_arr << current(name, opts)
       end
     end
-    data_array
+    data_arr
   end
 
-  def current(what)
-    send what.to_sym
+  def current(what, opts={})
+    send(what.to_sym, opts)
   end
 
   def index_of_date_value(date)
@@ -62,7 +62,6 @@ class SimpleTimeSeries
 
   def new_data_var(var, vals)
     define_getter_and_setter(var)
-    var_on = "#{var}_on"
     self.class.class_eval do
       define_method("#{var}_subset") do |first, last=first|
         start_idx = index_of_date_value(first)
@@ -98,26 +97,27 @@ class SimpleTimeSeries
           return answer.length == 1 ? answer[0] : answer
         end
       end
-      define_method(var_on) do |first, last=nil|
+      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'
           # tv_val is an array of associated values
           start_idx = index_of_date_value(first) || 0
           last_idx = index_of_date_value(last) || (first.nil? ? -1 : start_idx)
-          if start_idx != last_idx #&& tv_val.include?(last)
-            return eval(var)[start_idx..last_idx]
-          elsif tv_val.include?(first)
+          puts "Called with #{first}, #{last}, #{opts}" if DEBUG
+          puts "start_idx = #{start_idx}; last_idx = #{last_idx}" if DEBUG
+          if start_idx != last_idx
+            arr = eval(var)[start_idx..last_idx]
+            return (opts[:prepend_names] ? arr.unshift(var) : arr)
+          elsif start_idx
             return eval(var)[start_idx]
+          else
+            raise "Can't find #{var}_on for #{first}"
           end
         end
-        raise "Can't find #{var_on} for #{first}"
       end
     end
     instance_variable_set("@#{var}", vals) if vals
     data_vars[var] = vals unless data_vars.has_key?(var)
-    #def eval(var).[] (first, last)
-    #  send "#{var}_subset".to_sym, first, last
-    #end
   end
 
   private
@@ -137,7 +137,9 @@ class SimpleTimeSeries
   def define_getter_and_setter(var)
     ivar = "@#{var}"
     self.class.class_eval do
-      define_method(var) { instance_variable_get ivar }
+      define_method(var) do |opts={}|
+        instance_variable_get ivar
+      end
       define_method "#{var}=" do |val|
         instance_variable_set ivar, val
       end

data/lib/simple_time_series/version.rb

@@ -1,3 +1,3 @@
 class SimpleTimeSeries
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/lib/simple_time_series_spec.rb

@@ -276,17 +276,49 @@ describe SimpleTimeSeries do
 
   describe "#data_array" do
 
-    it "builds an array of arrays with all time_vars" 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', 'pizzas', {}).should == [ @my_data.current('tasks_done'),
-                                                                  @my_data.current('pizzas') ]
+      @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('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') ]
-      #@my_data.data_array(['tasks_done', 'pizzas']).should == [ @my_data.current('tasks_done'),
-      #                                                        @my_data.current('pizzas') ]
+               should == [ @my_data.find('tasks_done','Tuesday','Thursday'),
+                           @my_data.find('pizzas', '2014-01-03', 'Jan 5, 2014') ]
     end
 
+    it "builds an array of specified arrays with variable names prepended to each array" do
+      @my_data.data_array('tasks_done', {:prepend_names => true}).
+               should == [ @my_data.current('tasks_done').unshift('tasks_done') ]
+      @my_data.data_array('tasks_done', {:prepend_names => true}).
+               should == [ ['tasks_done', 2, 3, 0, 14, 3, 11, 0] ]
+      @my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => true}).
+               should == [ @my_data.current('dates').unshift('dates'),
+                           @my_data.current('tasks_done').unshift('tasks_done'),
+                           @my_data.current('pizzas').unshift('pizzas') ]
+    end
+
+    it "builds an array of specified arrays subsetted correctly with variable names prepended to each array" do
+      da = @my_data.data_array('tasks_done', 'pizzas', {:start => 'Monday', :end => 'Friday',
+                                                        :prepend_names => true})
+      da[0].should == ['tasks_done', 3, 0, 14, 3, 11]
+      da[1].should == ['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') ]
+    end
+
+    #it "builds an array of specified arrays with variable names prepended to each array" do
+    #  @my_data.data_array('tasks_done', {}).should == [ @my_data.current('tasks_done') ]
+    #  @my_data.data_array('tasks_done', 'pizzas', {:prepend_names => true}).should == [ @my_data.current('tasks_done'),
+    #                                                              @my_data.current('pizzas') ]
+    #  @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') ]
+    #end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_time_series
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - James Lavin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler