pulse-meter 0.1.2 → 0.1.3

data/lib/pulse-meter/sensor/timeline.rb

@@ -110,22 +110,34 @@ module PulseMeter
         raise ArgumentError unless from.kind_of?(Time) && till.kind_of?(Time)
         start_time, end_time = from.to_i, till.to_i
         current_interval_id = get_interval_id(start_time) + interval
-        res = []
+        keys = []
+        ids = []
         while current_interval_id < end_time
-          res << get_timeline_value(current_interval_id)
+          ids << current_interval_id
+          keys << data_key(current_interval_id)
           current_interval_id += interval
         end
+        values = if keys.empty?
+          []
+        else
+          redis.mget(*keys)
+        end
+        res = []
+        ids.zip(values) do |(id, val)|
+          res << if val.nil?
+            get_raw_value(id)
+          else
+            SensorData.new(Time.at(id), val)
+          end
+        end
         res
       end
 
-      # Returns sensor data for given interval.
-      #   If the interval is not over yet makes its data in-memory summarization
+      # Returns sensor data for given interval, in-memory summarization
       #   and returns calculated value
       # @param interval_id [Fixnum]
       # @return [SensorData]
-      def get_timeline_value(interval_id)
-        interval_data_key = data_key(interval_id)
-        return SensorData.new(Time.at(interval_id), redis.get(interval_data_key)) if redis.exists(interval_data_key)
+      def get_raw_value(interval_id)
         interval_raw_data_key = raw_data_key(interval_id)
         return SensorData.new(Time.at(interval_id), summarize(interval_raw_data_key)) if redis.exists(interval_raw_data_key)
         SensorData.new(Time.at(interval_id), nil)

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -390,9 +390,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -914537785395250315
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24