simple_time_series 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a54aaaa112d4b24219ab2b63613345dc9133d06
-  data.tar.gz: cc68ebee7a5177d810c7bfa40b81b05bbc22e5be
+  metadata.gz: 6652cc5ac84fbe5b9a437ad9823a2b877f98eed5
+  data.tar.gz: 4e81af7f660737a23e230e575839ea2db4bfbc0a
 SHA512:
-  metadata.gz: 08edd9f00dcab7cc725b205b465d2b24331dcca5f1015ecaca7616f2bd1c71a938c0c5d1cddfec86608165769a7436ebfa072e82eefa38acedaa438828c27b2b
-  data.tar.gz: 4ddd445ea40a7d3b4758dfa48cf8bdf4ecdd5abad6500eeec4b831e0ca44a4e453d7b3d33d130a9a1eb4095cb54f47600cc58803edcb1a5c843b0306c8b623ef
+  metadata.gz: 44ba101165e85cd96a1b2868ccf1cbb2259158bfebed931a4ff1a31c23c55d559d77e698c18044e45684abc4dc1358f50ce212a0a78a14252b0ed159bd29844e
+  data.tar.gz: c194fe33b180a5baa8b7bc8b54a91178ec58ed1d1cc2b50e14019d9af28bba715971d5b62c563bb6e29c20e04cba1e8657b5dcc4451679cc2db4753bbc043b68

data/lib/simple_time_series/simple_time_series.rb

@@ -30,7 +30,7 @@ class SimpleTimeSeries
       end
     end
     arr = arr.transpose.map { |arr| arr.reduce(:+) }
-    opts[:prepend_name] ? arr.unshift(opts[:prepend_name]) : arr
+    opts[:prepend_name] ? arr.dup.unshift(opts[:prepend_name]) : arr
   end
 
   def data_array(*data_var_names, opts)
@@ -41,11 +41,15 @@ class SimpleTimeSeries
     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)
+      puts "Calling find(#{name}, #{opts[:start]}, #{opts[:end]}, #{opts})" if DEBUG
+      data_arr << find(name, opts[:start], opts[:end], opts)
+    end
+
+    if opts[:prepend_names]
+      if opts[:prepend_names].is_a? Array
+        data_arr = data_arr.each_with_index.map { |var, idx| var.dup.unshift(opts[:prepend_names][idx]) }
       else
-        data_arr << current(name, opts)
+        data_arr = data_arr.each_with_index.map { |var, idx| var.dup.unshift(data_var_names[idx]) }
       end
     end
     data_arr
@@ -53,8 +57,7 @@ class SimpleTimeSeries
 
   def current(what, opts={})
     puts "#current called with #{what} and #{opts}" if DEBUG
-    vals = send(what.to_sym, opts)
-    opts[:prepend_names] ? vals.dup.unshift(what) : vals
+    send(what.to_sym, opts)
   end
 
   def index_of_date_value(date)
@@ -133,8 +136,7 @@ class SimpleTimeSeries
           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.dup.unshift(var) : arr)
+            return eval(var)[start_idx..last_idx]
           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.4"
+  VERSION = "0.1.5"
 end

data/spec/lib/simple_time_series_spec.rb

@@ -300,6 +300,18 @@ describe SimpleTimeSeries do
                            ['pizzas', 0, 0, 1, 0, 0.5, 0, 2] ]
     end
 
+    it "builds an array of specified arrays with custom variable names prepended to each array" do
+      @my_data.data_array('tasks_done', {:prepend_names => ['Tasks Completed']}).
+               should == [ ['Tasks Completed', 2, 3, 0, 14, 3, 11, 0] ]
+      @my_data.data_array('miles', 'tasks_done', {:prepend_names => ['Miles Run', 'Tasks Completed']}).
+               should == [ ['Miles Run', 2.2, 3.1, 0.0, 4.3, 1.2, 12.2, 2.3],
+                           ['Tasks Completed', 2, 3, 0, 14, 3, 11, 0] ]
+      @my_data.data_array('dates', 'tasks_done', 'pizzas', {:prepend_names => ['YYYY-MM-DD', 'Tasks Completed', 'Pizzas Consumed']}).
+               should == [ ['YYYY-MM-DD', '2014-01-01', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05', '2014-01-06', '2014-01-07'],
+                           ['Tasks Completed', 2, 3, 0, 14, 3, 11, 0],
+                           ['Pizzas Consumed', 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
       @my_data.data_array('tasks_done', 'pizzas', {:start => 'Monday', :end => 'Friday',
                                                    :prepend_names => true}).

metadata

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