pulse-meter 0.2.8 → 0.2.9

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

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

@@ -43,6 +43,20 @@ module PulseMeter
 				content_type :json
         camelize_keys(@layout.widget(page_id - 1, id - 1, timespan: timespan)).to_json
 			end
+
+      get '/sensors' do
+        content_type :json
+        camelize_keys(@layout.sensor_list).to_json
+      end
+
+      get '/dynamic_widget' do
+        content_type :json
+        camelize_keys(@layout.dynamic_widget(
+          timespan:  params[:timespan],
+          sensors: params[:sensor],
+          type: params[:type])
+        ).to_json
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module PulseMeter
   module Visualize
     class Layout < Base
+      include PulseMeter::Mixins::Utils
+
       def initialize(opts)
         super
         @opts[:pages] ||= []
@@ -37,6 +39,41 @@ module PulseMeter
       def widgets(page_id)
         pages[page_id].widget_datas
       end
+
+      def sensor_list
+        PulseMeter::Sensor::Base
+          .list_objects
+          .select{|s| s.is_a?(PulseMeter::Sensor::Timeline)}
+          .map do |s|
+          {
+            id: s.name,
+            annotation: s.annotation,
+            type: s.class.to_s.split('::').last,
+            interval: s.interval
+          }
+        end
+      end
+
+      DEFAULT_TIMESPAN_IN_INTERVALS = 50
+
+      def dynamic_widget(args)
+        sensor_names = args[:sensors]
+        sensors = sensor_names.map{|n| PulseMeter::Sensor::Base.restore(n)}
+        timespan = if args[:timespan] && !args[:timespan].empty?
+          args[:timespan].to_i
+        else
+          sensors.first.interval * DEFAULT_TIMESPAN_IN_INTERVALS
+        end
+
+        type = args[:type]
+        widget_dsl_class = constantize("PulseMeter::Visualize::DSL::Widgets::#{type.capitalize}")
+        widget = widget_dsl_class.new('Dynamic Widget')
+        widget.timespan(timespan)
+        sensor_names.each{|n| widget.sensor(n)}
+
+        widget.to_data.data(id: 1)
+      end
+
     end
   end
 end

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

@@ -10,16 +10,22 @@
 	margin-bottom: 50px;
 }
 
+#dynamic-chart-controls{
+	margin-top: 20px;
+}
+
 #chart-controls input{
-    width: 30px;
+  width: 30px;
 }
 
 #chart-controls .space{
-    padding-left: 10px;
+  padding-left: 10px;
 }
 
 .footer{
-    margin-top: 100px;
-    text-align: center;
+  margin-top: 100px;
+  text-align: center;
 }
 
+#dynamic-plotarea {
+}

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

@@ -2,10 +2,31 @@ document.startApp = ->
 	globalOptions = gon.options
 	
 	String::capitalize = ->
-	  @charAt(0).toUpperCase() + @slice(1)
+		@charAt(0).toUpperCase() + @slice(1)
 	String::strip = ->
 		if String::trim? then @trim() else @replace /^\s+|\s+$/g, ""
 
+	Number::humanize = ->
+		interval = this
+		res = ""
+		s = interval % 60
+		res = "#{s} s" if s > 0
+		interval = (interval - s) / 60
+		return res unless interval > 0
+
+		m = interval % 60
+		res = "#{m} m #{res}".strip() if m > 0
+		interval = (interval - m) / 60
+		return res unless interval > 0
+
+		h = interval % 24
+		res = "#{h} h #{res}".strip() if h > 0
+		d = (interval - h) / 24
+		if d > 0
+			"#{d} d #{res}".strip()
+		else
+			res
+
 	PageInfo = Backbone.Model.extend {
 	}
 
@@ -14,9 +35,13 @@ document.startApp = ->
 		selected: ->
 			@find (m) ->
 				m.get 'selected'
-			
+
 		selectFirst: ->
 			@at(0).set('selected', true) if @length > 0
+		
+		selectNone: ->
+			@each (m) ->
+				m.set 'selected', false
 
 		selectPage: (id) ->
 			@each (m) ->
@@ -83,12 +108,18 @@ document.startApp = ->
 				height: 300
 			}
 
-		mergedOptions: -> $.extend(true,
-			@options(),
-			globalOptions.gchartOptions,
-			pageInfos.selected().get('gchartOptions')
-			@get('gchartOptions')
-		)
+		mergedOptions: ->
+			pageOptions = if pageInfos.selected()
+				pageInfos.selected().get('gchartOptions')
+			else
+				{}
+
+			$.extend(true,
+				@options(),
+				globalOptions.gchartOptions,
+				pageOptions,
+				@get('gchartOptions')
+			)
 
 		data: -> new google.visualization.DataTable
 
@@ -171,7 +202,7 @@ document.startApp = ->
 					position: 'bottom'
 				}
 				vAxis: {
-					title: "#{@get('valuesTitle')} / #{@humanizedInterval()}"
+					title: @valuesTitle()
 				}
 				hAxis: {
 					format: format
@@ -180,27 +211,15 @@ document.startApp = ->
 				axisTitlesPosition: 'in'
 			}
 
-		humanizedInterval: ->
-			interval = @get('interval')
-			res = ""
-			s = interval % 60
-			res = "#{s} s" if s > 0
-			interval = (interval - s) / 60
-			return res unless interval > 0
-
-			m = interval % 60
-			res = "#{m} m #{res}".strip() if m > 0
-			interval = (interval - m) / 60
-			return res unless interval > 0
-
-			h = interval % 24
-			res = "#{h} h #{res}".strip() if h > 0
-			d = (interval - h) / 24
-			if d > 0
-				"#{d} d #{res}".strip()
+		valuesTitle: ->
+			if @get('valuesTitle')
+				"#{@get('valuesTitle')} / #{@humanizedInterval()}"
 			else
-				res
+				@humanizedInterval()
+
 
+		humanizedInterval: ->
+			@get('interval').humanize()
 		
 		cutoff: (min, max) ->
 			_.each(@get('series').rows, (row) ->
@@ -288,12 +307,191 @@ document.startApp = ->
 
 	}
 
+	DynamicWidget = Backbone.Model.extend {
+
+		increaseTimespan: (inc) ->
+			@set('timespan', @timespan() + inc)
+
+		resetTimespan: ->
+			@set('timespan', null)
+
+		timespan: -> @get('timespan')
+
+		sensorArgs: ->
+			_.map(@get('sensorIds'), (name) -> "sensor[]=#{name}").join('&')
+
+		url: ->
+			url = "#{ROOT}dynamic_widget?#{@sensorArgs()}&type=#{@get('type')}"
+			
+			timespan = @timespan()
+			url = "#{url}&timespan=#{timespan}" if timespan? && !_.isNaN(timespan)
+
+			url
+
+		forceUpdate: ->
+			@fetch {
+				success: (model, response) ->
+					model.trigger('redraw')
+			}
+	}
+
 	WidgetList = Backbone.Collection.extend {
 		model: Widget
 		url: ->
 			ROOT + 'pages/' + pageInfos.selected().id + '/widgets'
 	}
 
+	SensorInfo = Backbone.Model.extend {
+
+	}
+
+	SensorInfoList = Backbone.Collection.extend {
+		model: SensorInfo
+		url: ->
+			ROOT + 'sensors'
+	}
+
+
+	SensorInfoListView = Backbone.View.extend {
+		tagName: 'div'
+
+		template: ->
+			_.template($("#sensor-list").html())
+
+		initialize: (sensorInfo) ->
+			@sensorInfo = sensorInfo
+			@sensorInfo.bind 'reset', @render, this
+
+		render: ->
+			@$el.html @template()({sensors: @sensorInfo.toJSON()})
+
+		selectedSensors: ->
+			checked = _.filter @$el.find('.sensor-box'), (el) -> $(el).is(':checked')
+			ids = {}
+			_.each checked, (box) -> ids[box.id] = true
+			selected = @sensorInfo.filter (sensor) -> ids[sensor.id]
+			
+	}
+
+	DynamicChartView = Backbone.View.extend {
+		initialize: ->
+			@sensors = []
+			@type = 'Area'
+			@widget = new DynamicWidget
+			
+			@widget.bind('destroy', @remove, this)
+			@widget.bind('redraw', @redrawChart, this)
+
+		tagName: 'div'
+
+		events: {
+			"click #refresh-chart": 'update'
+			"click #extend-timespan": 'extendTimespan'
+			"click #reset-timespan": 'resetTimespan'
+		}
+
+		template: -> _.template($("#dynamic-widget-plotarea").html())
+
+		render: ->
+			@$el.html(@template()())
+
+		extendTimespan: ->
+			select = @$el.find("#extend-timespan-val")
+			val = select.first().val()
+			@widget.increaseTimespan(parseInt(val))
+			@update()
+
+		resetTimespan: ->
+			@widget.resetTimespan()
+			@update()
+
+		sensorIds: -> _.map(@sensors, (s) -> s.id)
+
+		redrawChart: ->
+			if @presenter
+				@presenter.draw()
+			else
+				@presenter = WidgetPresenter.create(@widget, @chartContainer())
+
+
+		chartContainer: ->
+			@$el.find('#chart')[0]
+
+		update: ->
+			@widget.forceUpdate() if @sensors.length > 0
+
+		draw: (sensors, type) ->
+			@sensors = sensors
+			@type = type
+
+			@widget.set('sensorIds', @sensorIds())
+			@widget.set('type', @type)
+			
+			@presenter = null
+			$(@chartContainer()).empty()
+			@widget.forceUpdate()
+	}
+
+	DynamicWidgetView = Backbone.View.extend {
+		tagName: 'div'
+
+		initialize: ->
+			@sensorInfo = new SensorInfoList
+
+			@sensorListView = new SensorInfoListView(@sensorInfo)
+			@chartView = new DynamicChartView
+		
+			@$el.html(@template()())
+
+			@$el.find('#sensor-list-area').append(@sensorListView.el)
+			
+			@chartView.render()
+			@$el.find('#dynamic-plotarea').append(@chartView.el)
+
+		events: {
+			"click #sensor-controls #refresh": 'refresh'
+			"click #sensor-controls #draw": 'drawChart'
+		}
+
+		template: ->
+			_.template($("#dynamic-widget").html())
+
+		errorTemplate: -> _.template($("#dynamic-widget-error").html())
+
+		error: (error)->
+			@$el.find('#errors').append(@errorTemplate()(error: error))
+
+
+		refresh: ->
+			@sensorInfo.fetch()
+
+		intervalsEqual: (sensors) ->
+			interval = sensors[0].get('interval')
+			badIntervals = _.filter(sensors, (s) ->
+				s.get('interval') != interval
+			)
+			badIntervals.length == 0
+
+		drawChart: ->
+			selectedSensors = @sensorListView.selectedSensors()
+			return unless selectedSensors.length > 0
+	
+			unless @intervalsEqual(selectedSensors)
+				@error('Selected sensors have different intervals')
+				return
+
+			type = @$el.find('#chart-type').val()
+			@chartView.draw(selectedSensors, type)
+			
+		render: (container) ->
+			container.empty()
+			container.append(@$el)
+			@sensorInfo.fetch()
+			@chartView.update()
+			
+	}
+
+
 	WidgetChartView = Backbone.View.extend {
 		tagName: 'div'
 
@@ -370,8 +568,9 @@ document.startApp = ->
 
 	widgetList = new WidgetList
 	setInterval( ->
-		widgetList.each (w) ->
-			w.refetch()
+		if pageInfos.selected()
+			widgetList.each (w) ->
+				w.refetch()
 	, 200)
 
 	WidgetListView = Backbone.View.extend {
@@ -382,9 +581,7 @@ document.startApp = ->
 			container = $('#widgets')
 			container.empty()
 			widgetList.each (w) ->
-				view = new WidgetView {
-					model: w
-				}
+				view = new WidgetView { model: w }
 				view.render()
 				container.append(view.el)
 				view.renderChart()
@@ -395,14 +592,19 @@ document.startApp = ->
 	AppRouter = Backbone.Router.extend {
 		routes: {
 			'pages/:id': 'getPage'
+			'custom': 'custom'
 			'*actions': 'defaultRoute'
 		}
 		getPage: (ids) ->
 			id = parseInt(ids)
 			pageInfos.selectPage(id)
 			widgetList.fetch()
+		custom: ->
+			pageInfos.selectNone()
+			dynamicWidget = new DynamicWidgetView
+			dynamicWidget.render($('#widgets'))
 		defaultRoute: (actions) ->
-			@navigate('//pages/1') if pageInfos.length > 0
+			@navigate('//custom')
 	}
 
 	appRouter = new AppRouter

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

@@ -4,7 +4,7 @@
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
 
   document.startApp = function() {
-    var AppRouter, AreaPresenter, GaugePresenter, LinePresenter, PageInfo, PageInfoList, PageTitleView, PageTitlesView, PiePresenter, SeriesPresenter, TablePresenter, TimelinePresenter, Widget, WidgetChartView, WidgetList, WidgetListView, WidgetPresenter, WidgetView, appRouter, globalOptions, pageInfos, pageTitlesApp, widgetList, widgetListApp;
+    var AppRouter, AreaPresenter, DynamicChartView, DynamicWidget, DynamicWidgetView, GaugePresenter, LinePresenter, PageInfo, PageInfoList, PageTitleView, PageTitlesView, PiePresenter, SensorInfo, SensorInfoList, SensorInfoListView, SeriesPresenter, TablePresenter, TimelinePresenter, Widget, WidgetChartView, WidgetList, WidgetListView, WidgetPresenter, WidgetView, appRouter, globalOptions, pageInfos, pageTitlesApp, widgetList, widgetListApp;
     globalOptions = gon.options;
     String.prototype.capitalize = function() {
       return this.charAt(0).toUpperCase() + this.slice(1);
@@ -16,6 +16,27 @@
         return this.replace(/^\s+|\s+$/g, "");
       }
     };
+    Number.prototype.humanize = function() {
+      var d, h, interval, m, res, s;
+      interval = this;
+      res = "";
+      s = interval % 60;
+      if (s > 0) res = "" + s + " s";
+      interval = (interval - s) / 60;
+      if (!(interval > 0)) return res;
+      m = interval % 60;
+      if (m > 0) res = ("" + m + " m " + res).strip();
+      interval = (interval - m) / 60;
+      if (!(interval > 0)) return res;
+      h = interval % 24;
+      if (h > 0) res = ("" + h + " h " + res).strip();
+      d = (interval - h) / 24;
+      if (d > 0) {
+        return ("" + d + " d " + res).strip();
+      } else {
+        return res;
+      }
+    };
     PageInfo = Backbone.Model.extend({});
     PageInfoList = Backbone.Collection.extend({
       model: PageInfo,
@@ -27,6 +48,11 @@
       selectFirst: function() {
         if (this.length > 0) return this.at(0).set('selected', true);
       },
+      selectNone: function() {
+        return this.each(function(m) {
+          return m.set('selected', false);
+        });
+      },
       selectPage: function(id) {
         return this.each(function(m) {
           return m.set('selected', m.id === id);
@@ -101,7 +127,9 @@
       };
 
       WidgetPresenter.prototype.mergedOptions = function() {
-        return $.extend(true, this.options(), globalOptions.gchartOptions, pageInfos.selected().get('gchartOptions'), this.get('gchartOptions'));
+        var pageOptions;
+        pageOptions = pageInfos.selected() ? pageInfos.selected().get('gchartOptions') : {};
+        return $.extend(true, this.options(), globalOptions.gchartOptions, pageOptions, this.get('gchartOptions'));
       };
 
       WidgetPresenter.prototype.data = function() {
@@ -234,7 +262,7 @@
             position: 'bottom'
           },
           vAxis: {
-            title: "" + (this.get('valuesTitle')) + " / " + (this.humanizedInterval())
+            title: this.valuesTitle()
           },
           hAxis: {
             format: format
@@ -244,28 +272,18 @@
         });
       };
 
-      SeriesPresenter.prototype.humanizedInterval = function() {
-        var d, h, interval, m, res, s;
-        interval = this.get('interval');
-        res = "";
-        s = interval % 60;
-        if (s > 0) res = "" + s + " s";
-        interval = (interval - s) / 60;
-        if (!(interval > 0)) return res;
-        m = interval % 60;
-        if (m > 0) res = ("" + m + " m " + res).strip();
-        interval = (interval - m) / 60;
-        if (!(interval > 0)) return res;
-        h = interval % 24;
-        if (h > 0) res = ("" + h + " h " + res).strip();
-        d = (interval - h) / 24;
-        if (d > 0) {
-          return ("" + d + " d " + res).strip();
+      SeriesPresenter.prototype.valuesTitle = function() {
+        if (this.get('valuesTitle')) {
+          return "" + (this.get('valuesTitle')) + " / " + (this.humanizedInterval());
         } else {
-          return res;
+          return this.humanizedInterval();
         }
       };
 
+      SeriesPresenter.prototype.humanizedInterval = function() {
+        return this.get('interval').humanize();
+      };
+
       SeriesPresenter.prototype.cutoff = function(min, max) {
         return _.each(this.get('series').rows, function(row) {
           var i, value, _i, _ref, _results;
@@ -416,12 +434,193 @@
         });
       }
     });
+    DynamicWidget = Backbone.Model.extend({
+      increaseTimespan: function(inc) {
+        return this.set('timespan', this.timespan() + inc);
+      },
+      resetTimespan: function() {
+        return this.set('timespan', null);
+      },
+      timespan: function() {
+        return this.get('timespan');
+      },
+      sensorArgs: function() {
+        return _.map(this.get('sensorIds'), function(name) {
+          return "sensor[]=" + name;
+        }).join('&');
+      },
+      url: function() {
+        var timespan, url;
+        url = "" + ROOT + "dynamic_widget?" + (this.sensorArgs()) + "&type=" + (this.get('type'));
+        timespan = this.timespan();
+        if ((timespan != null) && !_.isNaN(timespan)) {
+          url = "" + url + "&timespan=" + timespan;
+        }
+        return url;
+      },
+      forceUpdate: function() {
+        return this.fetch({
+          success: function(model, response) {
+            return model.trigger('redraw');
+          }
+        });
+      }
+    });
     WidgetList = Backbone.Collection.extend({
       model: Widget,
       url: function() {
         return ROOT + 'pages/' + pageInfos.selected().id + '/widgets';
       }
     });
+    SensorInfo = Backbone.Model.extend({});
+    SensorInfoList = Backbone.Collection.extend({
+      model: SensorInfo,
+      url: function() {
+        return ROOT + 'sensors';
+      }
+    });
+    SensorInfoListView = Backbone.View.extend({
+      tagName: 'div',
+      template: function() {
+        return _.template($("#sensor-list").html());
+      },
+      initialize: function(sensorInfo) {
+        this.sensorInfo = sensorInfo;
+        return this.sensorInfo.bind('reset', this.render, this);
+      },
+      render: function() {
+        return this.$el.html(this.template()({
+          sensors: this.sensorInfo.toJSON()
+        }));
+      },
+      selectedSensors: function() {
+        var checked, ids, selected;
+        checked = _.filter(this.$el.find('.sensor-box'), function(el) {
+          return $(el).is(':checked');
+        });
+        ids = {};
+        _.each(checked, function(box) {
+          return ids[box.id] = true;
+        });
+        return selected = this.sensorInfo.filter(function(sensor) {
+          return ids[sensor.id];
+        });
+      }
+    });
+    DynamicChartView = Backbone.View.extend({
+      initialize: function() {
+        this.sensors = [];
+        this.type = 'Area';
+        this.widget = new DynamicWidget;
+        this.widget.bind('destroy', this.remove, this);
+        return this.widget.bind('redraw', this.redrawChart, this);
+      },
+      tagName: 'div',
+      events: {
+        "click #refresh-chart": 'update',
+        "click #extend-timespan": 'extendTimespan',
+        "click #reset-timespan": 'resetTimespan'
+      },
+      template: function() {
+        return _.template($("#dynamic-widget-plotarea").html());
+      },
+      render: function() {
+        return this.$el.html(this.template()());
+      },
+      extendTimespan: function() {
+        var select, val;
+        select = this.$el.find("#extend-timespan-val");
+        val = select.first().val();
+        this.widget.increaseTimespan(parseInt(val));
+        return this.update();
+      },
+      resetTimespan: function() {
+        this.widget.resetTimespan();
+        return this.update();
+      },
+      sensorIds: function() {
+        return _.map(this.sensors, function(s) {
+          return s.id;
+        });
+      },
+      redrawChart: function() {
+        if (this.presenter) {
+          return this.presenter.draw();
+        } else {
+          return this.presenter = WidgetPresenter.create(this.widget, this.chartContainer());
+        }
+      },
+      chartContainer: function() {
+        return this.$el.find('#chart')[0];
+      },
+      update: function() {
+        if (this.sensors.length > 0) return this.widget.forceUpdate();
+      },
+      draw: function(sensors, type) {
+        this.sensors = sensors;
+        this.type = type;
+        this.widget.set('sensorIds', this.sensorIds());
+        this.widget.set('type', this.type);
+        this.presenter = null;
+        $(this.chartContainer()).empty();
+        return this.widget.forceUpdate();
+      }
+    });
+    DynamicWidgetView = Backbone.View.extend({
+      tagName: 'div',
+      initialize: function() {
+        this.sensorInfo = new SensorInfoList;
+        this.sensorListView = new SensorInfoListView(this.sensorInfo);
+        this.chartView = new DynamicChartView;
+        this.$el.html(this.template()());
+        this.$el.find('#sensor-list-area').append(this.sensorListView.el);
+        this.chartView.render();
+        return this.$el.find('#dynamic-plotarea').append(this.chartView.el);
+      },
+      events: {
+        "click #sensor-controls #refresh": 'refresh',
+        "click #sensor-controls #draw": 'drawChart'
+      },
+      template: function() {
+        return _.template($("#dynamic-widget").html());
+      },
+      errorTemplate: function() {
+        return _.template($("#dynamic-widget-error").html());
+      },
+      error: function(error) {
+        return this.$el.find('#errors').append(this.errorTemplate()({
+          error: error
+        }));
+      },
+      refresh: function() {
+        return this.sensorInfo.fetch();
+      },
+      intervalsEqual: function(sensors) {
+        var badIntervals, interval;
+        interval = sensors[0].get('interval');
+        badIntervals = _.filter(sensors, function(s) {
+          return s.get('interval') !== interval;
+        });
+        return badIntervals.length === 0;
+      },
+      drawChart: function() {
+        var selectedSensors, type;
+        selectedSensors = this.sensorListView.selectedSensors();
+        if (!(selectedSensors.length > 0)) return;
+        if (!this.intervalsEqual(selectedSensors)) {
+          this.error('Selected sensors have different intervals');
+          return;
+        }
+        type = this.$el.find('#chart-type').val();
+        return this.chartView.draw(selectedSensors, type);
+      },
+      render: function(container) {
+        container.empty();
+        container.append(this.$el);
+        this.sensorInfo.fetch();
+        return this.chartView.update();
+      }
+    });
     WidgetChartView = Backbone.View.extend({
       tagName: 'div',
       initialize: function() {
@@ -506,9 +705,11 @@
     });
     widgetList = new WidgetList;
     setInterval(function() {
-      return widgetList.each(function(w) {
-        return w.refetch();
-      });
+      if (pageInfos.selected()) {
+        return widgetList.each(function(w) {
+          return w.refetch();
+        });
+      }
     }, 200);
     WidgetListView = Backbone.View.extend({
       initialize: function() {
@@ -533,6 +734,7 @@
     AppRouter = Backbone.Router.extend({
       routes: {
         'pages/:id': 'getPage',
+        'custom': 'custom',
         '*actions': 'defaultRoute'
       },
       getPage: function(ids) {
@@ -541,8 +743,14 @@
         pageInfos.selectPage(id);
         return widgetList.fetch();
       },
+      custom: function() {
+        var dynamicWidget;
+        pageInfos.selectNone();
+        dynamicWidget = new DynamicWidgetView;
+        return dynamicWidget.render($('#widgets'));
+      },
       defaultRoute: function(actions) {
-        if (pageInfos.length > 0) return this.navigate('//pages/1');
+        return this.navigate('//custom');
       }
     });
     appRouter = new AppRouter;

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

@@ -19,6 +19,7 @@
 
   - %w(area line table pie gauge).each do |wtype|
     = partial "widgets/#{wtype}"
+  = partial "sensors"
 
   .container#main
     .row
@@ -26,7 +27,8 @@
         .navbar
           .navbar-inner
             .container
-              %span.brand= @title 
-              %ul.nav#page-titles
+              %a{href: '#/custom'}
+                %span.brand= @title 
+                %ul.nav#page-titles
         #widgets.row
 

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

@@ -0,0 +1,66 @@
+%script#sensor-list{type: 'text/template'}
+  %table#sensors.table.table-striped
+    %tr
+      %th
+      %th Title
+      %th Type
+      %th Interval
+    <% _.each(sensors, function(sensor) { %>
+    %tr
+      %td
+        :plain
+          <input class="sensor-box" type="checkbox" id="<%- sensor.id %>" />
+      %td 
+        <%- sensor.annotation %>
+        %sub <%- sensor.id %>
+      %td <%- sensor.type %>
+      %td <%- sensor.interval.humanize() %>
+    <% }) %>
+
+%script#dynamic-widget-error{type: 'text/template'}
+  .alert.alert-error
+    .button.close{'data-dismiss' => 'alert'} ×
+    <%- error %>
+
+%script#dynamic-widget-plotarea{type: 'text/template'}
+  .well
+    #chart
+      %h3 Choose sensors to plot 
+    #dynamic-chart-controls
+      .form-inline
+        %button#refresh-chart.btn.btn-mini
+          %i.icon-refresh
+          Refresh chart
+        Timespan:
+        %select#extend-timespan-val.btn-mini.span1
+          = partial "widgets/extend_options"
+        %button#extend-timespan.btn.btn-mini
+          %i.icon-arrow-left
+          Extend
+        %button#reset-timespan.btn.btn-mini
+          %i.icon-arrow-right
+          Reset
+
+
+%script#dynamic-widget{type: 'text/template'}
+  .span10
+    #dynamic-plotarea
+    #errors
+  .span10
+    #sensor-controls.form-horizontal
+      %p.form-inline
+        Chart type 
+        %select#chart-type{value: 'area'}
+          %option{value: 'area'} Area
+          %option{value: 'line'} Line
+          %option{value: 'table'} Table
+        %button#draw.btn.btn-mini.btn-primary
+          %i.icon-play
+          Draw
+        %button#refresh.btn.btn-mini
+          %i.icon-refresh
+          Refresh sensor list
+    #sensor-list-area
+        
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -370,7 +370,6 @@ files:
 - lib/pulse-meter/visualize/dsl/page.rb
 - lib/pulse-meter/visualize/dsl/sensor.rb
 - lib/pulse-meter/visualize/dsl/widget.rb
-- lib/pulse-meter/visualize/dsl/widget_old.rb
 - lib/pulse-meter/visualize/dsl/widgets/area.rb
 - lib/pulse-meter/visualize/dsl/widgets/gauge.rb
 - lib/pulse-meter/visualize/dsl/widgets/line.rb
@@ -394,6 +393,7 @@ files:
 - lib/pulse-meter/visualize/sensor.rb
 - lib/pulse-meter/visualize/series_extractor.rb
 - lib/pulse-meter/visualize/views/main.haml
+- lib/pulse-meter/visualize/views/sensors.haml
 - lib/pulse-meter/visualize/views/widgets/area.haml
 - lib/pulse-meter/visualize/views/widgets/extend_options.haml
 - lib/pulse-meter/visualize/views/widgets/gauge.haml
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2299028715226414900
+      hash: -3651038348403284878
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/pulse-meter/visualize/dsl/widget_old.rb

@@ -1,95 +0,0 @@
-module PulseMeter
-  module Visualize
-    module DSL
-      class Widget
-        include PulseMeter::Mixins::Utils
-
-        DEFAULT_WIDTH = 10
-        DEFAULT_TIMESPAN = 60 * 60 * 24 # One day
-        DEFAULT_GCHART_OPTIONS = {}
-
-        def initialize(type, title = '')
-          raise BadWidgetType, type if type.to_s.empty?
-          @type = type
-          @title = title.to_s || ''
-          @values_label = ''
-          @width = DEFAULT_WIDTH
-          @sensors = []
-          @show_last_point = false
-          @redraw_interval = nil
-          @timespan = DEFAULT_TIMESPAN
-          @gchart_options = DEFAULT_GCHART_OPTIONS.dup
-        end
-
-        def process_args(args)
-          [:sensor, :title, :width, :values_label, :show_last_point, :redraw_interval, :timespan].each do |arg|
-            if args.has_key?(arg)
-              send(arg, args[arg])
-            end
-          end
-        end
-
-        def redraw_interval(new_redraw_interval)
-          new_redraw_interval = new_redraw_interval.to_i
-          raise BadWidgetRedrawInterval, new_redraw_interval unless new_redraw_interval > 0
-          @redraw_interval = new_redraw_interval
-        end
-
-        def show_last_point(new_show_last_point)
-          @show_last_point = !!new_show_last_point
-        end
-
-        def timespan(new_timespan)
-          new_timespan = new_timespan.to_i
-          raise BadWidgetTimeSpan, new_timespan unless new_timespan > 0
-          @timespan = new_timespan
-        end
-
-        def values_label(new_label)
-          @values_label = new_label.to_s
-        end
-
-        def title(new_title)
-          @title = new_title.to_s || ''
-        end
-
-        def width(new_width)
-          raise BadWidgetWidth, new_width unless new_width.respond_to?(:to_i)
-          w = new_width.to_i
-          raise BadWidgetWidth, new_width unless w > 0 && w <= 10
-          @width = new_width.to_i
-        end
-
-        def gchart_options(options = {})
-          @gchart_options.merge!(options)
-        end
-
-        def sensor(name, sensor_args = nil) 
-          s = PulseMeter::Visualize::DSL::Sensor.new(name)
-          s.process_args(sensor_args) if sensor_args
-          @sensors << s
-        end
-
-        def method_missing(name, value)
-          @gchart_options[name] = value
-        end
-
-        def to_widget
-          args = {
-            title: @title,
-            type: @type,
-            values_label: @values_label,
-            width: @width,
-            sensors: @sensors.map(&:to_sensor),
-            redraw_interval: @redraw_interval,
-            show_last_point: @show_last_point,
-            timespan: @timespan,
-            gchart_options: @gchart_options
-          }
-          PulseMeter::Visualize::Widget.new(args)
-        end
-      end
-    end
-  end
-end
-