simple_time_series 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1de65d10a8508cd676b70cf80ed57c89ec66d2f
-  data.tar.gz: 662431d9c143297aa5b992cde8331a6c39892035
+  metadata.gz: 07a3e14fd7eff38cbdbb58579d7bebbc7e3899da
+  data.tar.gz: 023551817a829f9bea6da942a8f627ad844796cc
 SHA512:
-  metadata.gz: ed5334c0dc23e5ad262eac7bcedbceedaed3ecf0b7a2c89e86029fd5365e6bd9b4605053f1480e54b8748532dc039fea43e322ef324d7df22f3ee9366350e870
-  data.tar.gz: 8b705e90fb271cd18e7d36576ba52f04f9251602630aca9a2dc6bcf8f88b0bac12a16482341971abfceb2b6f6167c31a02f57c8ada9ac79f9aa5383d5669bfe5
+  metadata.gz: 5062c774092d7ae6b36c8cb0af664c2b41796dc073bef4c99630946dd2df91e032cd3c30063aa570843e9aee3c5f85177b640ffd1e2e0e4acf44d3a575376817
+  data.tar.gz: ca7130e239cf7cc6dcf6dcf83c84207983728a07827d0e04d86399db99f07b9073aeb1241b4b46327a3ffca6176275add7ab3f30080cb6d020ee395d6a10e0b3

data/lib/simple_time_series/simple_time_series.rb

@@ -17,7 +17,7 @@ class SimpleTimeSeries
   end
 
   def find_plus_label(what, date, end_date=nil)
-    find(what, date, end_date).unshift(what)
+    find(what, date, end_date).dup.unshift(what)
   end
 
   def data_array(*data_var_names, opts)
@@ -27,6 +27,7 @@ class SimpleTimeSeries
     raise err_msg unless opts
     data_arr = []
     Array(data_var_names).each do |name|
+      puts "Looping through data_var_names inside data_array with #{name}" if DEBUG
       if opts[:start] && opts[:end]
         puts "Calling find(#{name}, #{opts[:start]}, #{opts[:end]}, #{opts})" if DEBUG
         data_arr << find(name, opts[:start], opts[:end], opts)
@@ -38,7 +39,9 @@ class SimpleTimeSeries
   end
 
   def current(what, opts={})
-    send(what.to_sym, opts)
+    puts "#current called with #{what} and #{opts}" if DEBUG
+    vals = send(what.to_sym, opts)
+    opts[:prepend_names] ? vals.dup.unshift(what) : vals
   end
 
   def index_of_date_value(date)
@@ -82,7 +85,7 @@ class SimpleTimeSeries
         time_vars.each do |tv_key, tv_val|
           start_idx = index_of_date_value(first) || 0
           last_idx = index_of_date_value(last) || (first.nil? ? -1 : start_idx)
-          answer = (eval(var).each_cons(2).map { |val1, val2| val2 - val1 }.unshift(nil))[start_idx..last_idx]
+          answer = (eval(var).each_cons(2).map { |val1, val2| val2 - val1 }.dup.unshift(nil))[start_idx..last_idx]
           return answer.length == 1 ? answer[0] : answer
         end
       end
@@ -93,7 +96,7 @@ class SimpleTimeSeries
           start_idx = index_of_date_value(first) || 0
           last_idx = index_of_date_value(last) || (first.nil? ? -1 : start_idx)
           sum = eval(var)[0]
-          answer = (eval(var).each_cons(2).map { |val1, val2| sum += val2 }.unshift(eval(var)[start_idx]))[start_idx..last_idx]
+          answer = (eval(var).each_cons(2).map { |val1, val2| sum += val2 }.dup.unshift(eval(var)[start_idx]))[start_idx..last_idx]
           return answer.length == 1 ? answer[0] : answer
         end
       end
@@ -107,7 +110,7 @@ class SimpleTimeSeries
           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)
+            return (opts[:prepend_names] ? arr.dup.unshift(var) : arr)
           elsif start_idx
             return eval(var)[start_idx]
           else

data/lib/simple_time_series/version.rb

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

data/spec/lib/simple_time_series_spec.rb

@@ -289,21 +289,22 @@ describe SimpleTimeSeries do
     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('miles', 'tasks_done', {:prepend_names => true}).
+               should == [ ['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}).
-               should == [ @my_data.current('dates').unshift('dates'),
-                           @my_data.current('tasks_done').unshift('tasks_done'),
-                           @my_data.current('pizzas').unshift('pizzas') ]
+               should == [ ['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] ]
     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]
+      @my_data.data_array('tasks_done', 'pizzas', {:start => 'Monday', :end => 'Friday',
+                                                   :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'),

metadata

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