pulse-meter 0.1.5 → 0.1.6

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

@@ -7,6 +7,8 @@ module PulseMeter
     class Timeline < Base
       include PulseMeter::Mixins::Utils
 
+      MAX_TIMESPAN_POINTS = 1000
+
       # @!attribute [r] interval
       #   @return [Fixnum] Rotation interval
       # @!attribute [r] ttl
@@ -109,13 +111,14 @@ module PulseMeter
       def timeline_within(from, till)
         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
+        actual_interval = optimized_inteval(start_time, end_time)
+        current_interval_id = get_interval_id(start_time) + actual_interval
         keys = []
         ids = []
         while current_interval_id < end_time
           ids << current_interval_id
           keys << data_key(current_interval_id)
-          current_interval_id += interval
+          current_interval_id += actual_interval
         end
         values = if keys.empty?
           []
@@ -133,7 +136,21 @@ module PulseMeter
         res
       end
 
-      # Returns sensor data for given interval, in-memory summarization
+      # Makes interval optimization so that the requested timespan contains less than MAX_TIMESPAN_POINTS values
+      # @param start_time [Fixnum] unix timestamp of timespan start
+      # @param end_time [Fixnum] unix timestamp of timespan start
+      # @return [Fixnum] optimized interval in seconds.
+      def optimized_inteval(start_time, end_time)
+        res_interval = interval
+        timespan = end_time - start_time
+        while timespan / res_interval > MAX_TIMESPAN_POINTS - 1
+          res_interval *= 2
+        end
+        res_interval
+      end
+
+
+      # Returns sensor data for given interval making in-memory summarization
       #   and returns calculated value
       # @param interval_id [Fixnum]
       # @return [SensorData]

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/pulse-meter/visualize/public/js/application.coffee

@@ -108,6 +108,7 @@ $ ->
 
 		cutoff: (min, max) ->
 			_.each(@get('series'), (s) ->
+				console.log s.data.length
 				_.each( s.data, (v) ->
 					@cutoffValue(v, min, max)
 				, this)
@@ -212,7 +213,8 @@ $ ->
 			true
 
 		extendTimespan: ->
-			val = @$el.find("#extend-timespan-val").first().val()
+			select = @$el.find("#extend-timespan-val")
+			val = select.first().val()
 			@model.increaseTimespan(parseInt(val))
 
 		resetTimespan: ->

data/lib/pulse-meter/visualize/public/js/application.js

@@ -111,6 +111,7 @@
       },
       cutoff: function(min, max) {
         return _.each(this.get('series'), function(s) {
+          console.log(s.data.length);
           return _.each(s.data, function(v) {
             return this.cutoffValue(v, min, max);
           }, this);
@@ -216,8 +217,9 @@
         return true;
       },
       extendTimespan: function() {
-        var val;
-        val = this.$el.find("#extend-timespan-val").first().val();
+        var select, val;
+        select = this.$el.find("#extend-timespan-val");
+        val = select.first().val();
         return this.model.increaseTimespan(parseInt(val));
       },
       resetTimespan: function() {

data/lib/pulse-meter/visualize/views/main.haml

@@ -14,7 +14,7 @@
     #plotarea
     #chart-controls
       .form-inline
-        %span#refresh.btn.btn-mini
+        %button#refresh.btn.btn-mini
           %i.icon-refresh
           Refresh
         %span.space
@@ -32,9 +32,6 @@
         <% if(type != 'pie'){ %>
         %label
           Timespan:
-          %span.btn.btn-mini#extend-timespan
-            %i.icon-arrow-left
-            Extend
           %select#extend-timespan-val.btn-mini.span1
             %option{value: 60, selected: true} 1 minute
             %option{value: 60 * 5} 5 minutes
@@ -46,7 +43,10 @@
             %option{value: 60 * 60 * 24 * 7} 1 week
             %option{value: 60 * 60 * 24 * 7 * 2} 2 weeks
             %option{value: 60 * 60 * 24 * 30} 1 month
-          %span#reset-timespan.btn.btn-mini
+          %button#extend-timespan.btn.btn-mini
+            %i.icon-arrow-left
+            Extend
+          %button#reset-timespan.btn.btn-mini
             %i.icon-arrow-right
             Reset
         <% } %>

data/spec/shared_examples/timeline_sensor.rb

@@ -202,6 +202,15 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
         ).size.should == 0
       end
     end
+
+    it "should not return more than #{PulseMeter::Sensor::Timeline::MAX_TIMESPAN_POINTS} points" do
+      max = PulseMeter::Sensor::Timeline::MAX_TIMESPAN_POINTS
+      (1..10).each do |i|
+        timespan = sensor.interval * max * (2**i)
+        sensor.timeline_within(Time.now, Time.now - timespan).size.should < max
+
+      end
+    end
   end
 
   describe "#timeline" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra