pulse-meter 0.1.4 → 0.1.5

data/lib/pulse-meter/version.rb

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

data/lib/pulse-meter/visualize/app.rb

@@ -33,10 +33,11 @@ module PulseMeter
 
 			get '/pages/:page_id/widgets/:id' do
 				page_id = params[:page_id].to_i 
-				id = params[:id].to_i 
+				id = params[:id].to_i
+        timespan = params[:timespan].to_i
 
 				content_type :json
-        camelize_keys(@layout.widget(page_id - 1, id - 1)).to_json
+        camelize_keys(@layout.widget(page_id - 1, id - 1, timespan: timespan)).to_json
 			end
     end
   end

data/lib/pulse-meter/visualize/layout.rb

@@ -41,8 +41,8 @@ module PulseMeter
         }
       end
 
-      def widget(page_id, widget_id)
-        pages[page_id].widget_data(widget_id)
+      def widget(page_id, widget_id, opts = {})
+        pages[page_id].widget_data(widget_id, opts)
       end
 
       def widgets(page_id)

data/lib/pulse-meter/visualize/page.rb

@@ -12,8 +12,8 @@ module PulseMeter
         @highchart_options = args[:highchart_options] or raise ArgumentError, ":highchart_options not specified"
       end
 
-      def widget_data(widget_id)
-        widgets[widget_id].data.merge(id: widget_id + 1)
+      def widget_data(widget_id, opts = {})
+        widgets[widget_id].data(opts).merge(id: widget_id + 1)
       end
 
       def widget_datas

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

@@ -17,3 +17,9 @@
 #chart-controls .space{
     padding-left: 10px;
 }
+
+.footer{
+    margin-top: 100px;
+    text-align: center;
+}
+

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

@@ -68,6 +68,18 @@ $ ->
 		initialize: ->
 			@needRefresh = true
 			@setNextFetch()
+			@timespanInc = 0
+
+		increaseTimespan: (inc) ->
+			@timespanInc = @timespanInc + inc
+			@forceUpdate()
+
+		resetTimespan: ->
+			@timespanInc = 0
+			@forceUpdate()
+
+		url: ->
+			"#{@collection.url()}/#{@get('id')}?timespan=#{@get('timespan') + @timespanInc}"
 
 		time: -> (new Date()).getTime()
 
@@ -104,7 +116,7 @@ $ ->
 		forceUpdate: ->
 			@fetch {
 				success: (model, response) ->
-					model.trigger('change')
+					model.trigger('redraw')
 			}
 	}
 
@@ -182,11 +194,13 @@ $ ->
 
 		initialize: ->
 			@model.bind('destroy', @remove, this)
-			@model.bind('change', @updateChart, this)
+			@model.bind('redraw', @updateChart, this)
 
 		events: {
 			"click #refresh": 'refresh'
 			"click #need-refresh": 'setRefresh'
+			"click #extend-timespan": 'extendTimespan'
+			"click #reset-timespan": 'resetTimespan'
 		}
 
 		refresh: ->
@@ -197,6 +211,13 @@ $ ->
 			@model.setRefresh(needRefresh)
 			true
 
+		extendTimespan: ->
+			val = @$el.find("#extend-timespan-val").first().val()
+			@model.increaseTimespan(parseInt(val))
+
+		resetTimespan: ->
+			@model.resetTimespan()
+
 		renderChart: ->
 			@chartView.render()
 

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

@@ -65,7 +65,19 @@
     Widget = Backbone.Model.extend({
       initialize: function() {
         this.needRefresh = true;
-        return this.setNextFetch();
+        this.setNextFetch();
+        return this.timespanInc = 0;
+      },
+      increaseTimespan: function(inc) {
+        this.timespanInc = this.timespanInc + inc;
+        return this.forceUpdate();
+      },
+      resetTimespan: function() {
+        this.timespanInc = 0;
+        return this.forceUpdate();
+      },
+      url: function() {
+        return "" + (this.collection.url()) + "/" + (this.get('id')) + "?timespan=" + (this.get('timespan') + this.timespanInc);
       },
       time: function() {
         return (new Date()).getTime();
@@ -107,7 +119,7 @@
       forceUpdate: function() {
         return this.fetch({
           success: function(model, response) {
-            return model.trigger('change');
+            return model.trigger('redraw');
           }
         });
       }
@@ -186,11 +198,13 @@
       template: _.template($('#widget-template').html()),
       initialize: function() {
         this.model.bind('destroy', this.remove, this);
-        return this.model.bind('change', this.updateChart, this);
+        return this.model.bind('redraw', this.updateChart, this);
       },
       events: {
         "click #refresh": 'refresh',
-        "click #need-refresh": 'setRefresh'
+        "click #need-refresh": 'setRefresh',
+        "click #extend-timespan": 'extendTimespan',
+        "click #reset-timespan": 'resetTimespan'
       },
       refresh: function() {
         return this.model.forceUpdate();
@@ -201,6 +215,14 @@
         this.model.setRefresh(needRefresh);
         return true;
       },
+      extendTimespan: function() {
+        var val;
+        val = this.$el.find("#extend-timespan-val").first().val();
+        return this.model.increaseTimespan(parseInt(val));
+      },
+      resetTimespan: function() {
+        return this.model.resetTimespan();
+      },
       renderChart: function() {
         return this.chartView.render();
       },

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

@@ -18,15 +18,38 @@
           %i.icon-refresh
           Refresh
         %span.space
-        Cutoff min:
-        %input.btn-mini#cutoff-min
+        %label
+          Cutoff min:
+          %input.btn-mini#cutoff-min
         %span.space
-        Cutoff max:
-        %input.btn-mini#cutoff-max
+        %label
+          Cutoff max:
+          %input.btn-mini#cutoff-max
         %span.space
-        Refresh:
-        %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
-
+        %label
+          Refresh:
+          %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+        <% 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
+            %option{value: 60 * 30} 30 minutes
+            %option{value: 60 * 60 * 2} 2 hours
+            %option{value: 60 * 60 * 6 } 6 hours
+            %option{value: 60 * 60 * 24} 1 day
+            %option{value: 60 * 60 * 24 * 2} 2 days
+            %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
+            %i.icon-arrow-right
+            Reset
+        <% } %>
     %hr
 
   .container#main
@@ -38,3 +61,4 @@
               %span.brand= @title 
               %ul.nav#page-titles
         #widgets.row
+

data/lib/pulse-meter/visualize/widget.rb

@@ -22,35 +22,37 @@ module PulseMeter
         @timespan = args[:timespan]
       end
 
-      def data
+      def data(options = {})
+        real_timespan = options[:timespan] || timespan
         {
           title: title,
           type: type,
           values_title: values_label,
           width: width,
           interval: redraw_interval,
-          series: series_data
+          series: series_data(real_timespan),
+          timespan: timespan
         }
       end
 
       protected
 
-      def series_data
+      def series_data(tspan)
         case type
           when :spline
-            line_series_data
+            line_series_data(tspan)
           when :line
-            line_series_data
+            line_series_data(tspan)
           when :area
-            line_series_data
+            line_series_data(tspan)
           when :pie
             pie_series_data
         end
       end
 
-      def line_series_data
+      def line_series_data(tspan)
         sensors.map do |s|
-          s.timeline_data(timespan, show_last_point)
+          s.timeline_data(tspan, show_last_point)
         end
       end
 

data/spec/pulse_meter/visualize/layout_spec.rb

@@ -39,7 +39,7 @@ describe PulseMeter::Visualize::Layout do
     it "should return data for correct widget" do
       w = layout.widget(1, 0)
       w.should include(id: 1, title: "w3")
-      w = layout.widget(0, 1)
+      w = layout.widget(0, 1, timespan: 123)
       w.should include(id: 2, title: "w2")
     end
   end

data/spec/pulse_meter/visualize/page_spec.rb

@@ -98,6 +98,39 @@ describe PulseMeter::Visualize::Page do
           }]
       end
 
+      Timecop.freeze(interval_start + 2 * interval - 1) do
+        page.widget_data(0, timespan: 0)[:series].should ==
+          [
+            {
+              type: :pie,
+              name: values_label,
+              data: [
+                {
+                  name: a_sensor.annotation,
+                  color: a_color,
+                  y: 12
+                },
+                  {
+                    name: b_sensor.annotation,
+                    color: b_color,
+                    y: 33
+                  }
+              ]
+
+            }
+          ]
+        page.widget_data(1, timespan: 1)[:series].should ==
+          [{
+            name: a_sensor.annotation,
+            color: a_color,
+            data: []
+          }, {
+            name: b_sensor.annotation,
+            color: b_color,
+            data: []
+          }]
+      end
+
 
     end
   end

data/spec/pulse_meter/visualize/widget_spec.rb

@@ -105,6 +105,24 @@ describe PulseMeter::Visualize::Widget do
               end
             end
           end
+
+          it "should accept custom timespan" do
+            Timecop.freeze(@current_time + interval) do
+              [:line, :spline, :area].each do |type|
+                widget = widgets[type]
+                widget.data(timespan: timespan)[:series].each do |s|
+                  s[:data].size.should == 1
+                end
+
+                widget.data(timespan: timespan + interval)[:series].each do |s|
+                  s[:data].size.should == 2
+                end
+
+              end
+            end
+          end
+
+
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors: