pulse-meter 0.1.11 → 0.2.0

data/README.md

@@ -394,20 +394,15 @@ A more complicated visualization
       # Use local time for x-axis of charts
       l.use_utc false
 
-      # Color for values cut off
-      l.outlier_color '#FF0000'
-
-      # Transfer some global parameters to Highcharts
-      l.highchart_options({
-        tooltip: {
-          value_decimals: 2
-        }
+      # Transfer some global parameters to Google Charts
+      l.gchart_options({
+        backgroundColor: '#CCC'
       })
 
       # Add some pages
       l.page "Request count" do |p|
 
-        # Add chart  (of Highcharts `area' style, `spline', `pie' and `line' are also available)
+        # Add chart  (of Google Charts `area' style, `pie' and `line' are also available)
         p.area "Requests per minute" do |w|
 
           # Plot :requests_per_minute values on this chart with black color
@@ -431,11 +426,9 @@ A more complicated visualization
           # Occupy half (5/10) of the page (horizontally)
           w.width 5
 
-          # Transfer page-wide (and page-specific) options to Highcharts
-          p.highchart_options({
-            chart: {
-              height: 300
-            }
+          # Transfer page-wide (and page-specific) options to Google Charts
+          p.gchart_options({
+            height: 400
           })
         end
 
@@ -484,10 +477,8 @@ A more complicated visualization
 
         end
 
-        p.highchart_options({
-          chart: {
-            height: 500
-          }
+        p.ghchart_options({
+          height: 500
         })
       end
 

data/Rakefile

@@ -50,4 +50,4 @@ namespace :example do
     end
   end
 
-end
+end

data/examples/basic.ru

@@ -10,7 +10,8 @@ layout = PulseMeter::Visualizer.draw do |l|
 
   l.page "Counts" do |p|
 
-    p.spline "Lama count", sensor: :lama_count do |c|
+    p.line "Lama count" do |c|
+      c.sensor :lama_count, color: '#CC1155'
       c.redraw_interval 5
       c.values_label 'Count'
       c.width 5
@@ -26,7 +27,19 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.timespan 1200
     end
 
-    p.spline "Rhino & Lama & Goose count comparison" do |c|
+    p.line "Rhino & Lama & Goose count comparison" do |c|
+      c.redraw_interval 5
+      c.values_label 'Count'
+      c.width 5
+      c.show_last_point true
+      c.timespan 1200
+
+      c.sensor :rhino_count, color: '#AAAAAA'
+      c.sensor :lama_count, color: '#CC1155'
+      c.sensor :goose_count
+    end
+
+    p.table "Rhino & Lama & Goose count comparison" do |c|
       c.redraw_interval 5
       c.values_label 'Count'
       c.width 5
@@ -92,19 +105,14 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.sensor :rhino_average_age
     end
 
-    p.highchart_options({
-      chart: {
-        height: 300
-      }
+    p.gchart_options({
+      background_color: '#CCC'
     })
   end
 
-  l.use_utc false
-  l.outlier_color '#FF0000'
-  l.highchart_options({
-    tooltip: {
-      value_decimals: 2
-    }
+  l.use_utc true
+  l.gchart_options({
+    height: 300
   })
 end
 

data/examples/full/server.ru

@@ -12,20 +12,15 @@ layout = PulseMeter::Visualizer.draw do |l|
   # Use local time for x-axis of charts
   l.use_utc false
 
-  # Color for values cut off
-  l.outlier_color '#FF0000'
-
-  # Transfer some global parameters to Highcharts
-  l.highchart_options({
-    tooltip: {
-      value_decimals: 2
-    }
+  # Transfer some global parameters to Google Charts
+  l.gchart_options({
+    backgroundColor: '#CCC'
   })
 
   # Add some pages
   l.page "Request count" do |p|
 
-    # Add chart  (of Highcharts `area' style, `spline', `pie' and `line' are also available)
+    # Add chart  (of Google Charts `area' style, `pie' and `line' are also available)
     p.area "Requests per minute" do |w|
 
       # Plot :requests_per_minute values on this chart with black color
@@ -49,11 +44,9 @@ layout = PulseMeter::Visualizer.draw do |l|
       # Occupy half (5/10) of the page (horizontally)
       w.width 5
 
-      # Transfer page-wide (and page-specific) options to Highcharts
-      p.highchart_options({
-        chart: {
-          height: 300
-        }
+      # Transfer page-wide (and page-specific) options to Google Charts
+      p.gchart_options({
+        height: 500
       })
     end
 
@@ -102,10 +95,8 @@ layout = PulseMeter::Visualizer.draw do |l|
 
     end
 
-    p.highchart_options({
-      chart: {
-        height: 500
-      }
+    p.gchart_options({
+      height: 500
     })
   end
 

data/examples/minimal/client.rb

@@ -6,7 +6,8 @@ PulseMeter.redis = Redis.new
 
 sensor = PulseMeter::Sensor::Timelined::Counter.new(:simple_sample_counter,
   :interval => 5,
-  :ttl => 60 * 60
+  :ttl => 60 * 60,
+  :annotation => 'Simple Sample Counter'
 )
 
 while true

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.1.11"
+  VERSION = "0.2.0"
 end

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

@@ -3,15 +3,13 @@ module PulseMeter
     module DSL
       class Layout
         DEFAULT_TITLE = "Pulse Meter"
-        DEFAULT_OUTLIER_COLOR = "#FF0000"
-        DEFAULT_HIGHCHART_OPTIONS = {}
+        DEFAULT_GCHART_OPTIONS = {}
 
         def initialize
           @pages = []
           @title = DEFAULT_TITLE
           @use_utc = true
-          @outlier_color = DEFAULT_OUTLIER_COLOR
-          @highchart_options = DEFAULT_HIGHCHART_OPTIONS.dup
+          @gchart_options = DEFAULT_GCHART_OPTIONS.dup
         end
 
         def title(title)
@@ -22,12 +20,16 @@ module PulseMeter
           @use_utc = use
         end
 
-        def outlier_color(color)
-          @outlier_color = color
+        def outlier_color(_)
+          STDERR.puts "DEPRECATION: outlier_color DSL helper does not take effect anymore"
         end
 
-        def highchart_options(options = {})
-          @highchart_options.merge!(options)
+        def highchart_options(_)
+          STDERR.puts "DEPRECATION: highchart_options DSL helper does not take effect anymore, use gchart_options instead"
+        end
+
+        def gchart_options(options = {})
+          @gchart_options.merge!(options)
         end
 
         def page(title, &block)
@@ -43,8 +45,7 @@ module PulseMeter
             pages: pages,
             title: title,
             use_utc: @use_utc,
-            outlier_color: @outlier_color,
-            highchart_options: @highchart_options
+            gchart_options: @gchart_options
           } )
         end
 

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

@@ -1,14 +1,14 @@
 module PulseMeter
   module Visualize
     module DSL
-      WIDGETS = %w(pie spline line area)
-      DEFAULT_HIGHCHART_OPTIONS = {}
+      WIDGETS = %w(pie line area table)
+      DEFAULT_GCHART_OPTIONS = {}
 
       class Page
         def initialize(title = nil)
           @title = title || ""
           @widgets = []
-          @highchart_options = DEFAULT_HIGHCHART_OPTIONS.dup
+          @gchart_options = DEFAULT_GCHART_OPTIONS.dup
         end
 
         def widget(type, title = '', widget_args = nil, &block) 
@@ -26,19 +26,28 @@ module PulseMeter
           EVAL
         end
 
+        def spline(*args, &block)
+          STDERR.puts "DEPRECATION: spline widget is no longer available. Using `line' as a fallback."
+          line(*args, &block)
+        end
+
         def title(new_title)
           @title = new_title || ''
         end
 
-        def highchart_options(options = {})
-          @highchart_options.merge!(options)
+        def highchart_options(_)
+          STDERR.puts "DEPRECATION: highchart_options DSL helper does not take effect anymore, use gchart_options instead"
+        end
+
+        def gchart_options(options = {})
+          @gchart_options.merge!(options)
         end
 
         def to_page
           args = {
             title: @title,
             widgets: @widgets.map(&:to_widget),
-            highchart_options: @highchart_options
+            gchart_options: @gchart_options
           }
           PulseMeter::Visualize::Page.new(args)
         end

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

@@ -5,16 +5,14 @@ module PulseMeter
 
       attr_reader :title
       attr_reader :use_utc
-      attr_reader :outlier_color
-      attr_reader :highchart_options
+      attr_reader :gchart_options
 
       def initialize(args) 
         raise ArgumentError unless args.respond_to?('[]')
         @title = args[:title] or raise ArgumentError, ":title not specified"
         @pages = args[:pages] or raise ArgumentError, ":pages not specified"
         @use_utc = args[:use_utc]
-        @outlier_color = args[:outlier_color]
-        @highchart_options = args[:highchart_options]
+        @gchart_options = args[:gchart_options]
       end
 
       def to_app
@@ -27,7 +25,7 @@ module PulseMeter
 					res << {
 						id: i + 1,
 						title: p.title,
-            highchart_options: p.highchart_options
+            gchart_options: p.gchart_options
 					}
 				end
 				res
@@ -36,8 +34,7 @@ module PulseMeter
 			def options
 				{
 					use_utc: @use_utc,
-				  outlier_color: @outlier_color,
-          highchart_options: @highchart_options
+          gchart_options: @gchart_options
         }
       end
 

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

@@ -3,13 +3,13 @@ module PulseMeter
     class Page
       attr_reader :widgets
       attr_reader :title
-      attr_reader :highchart_options
+      attr_reader :gchart_options
 
       def initialize(args) 
         raise ArgumentError unless args.respond_to?('[]')
         @title = args[:title] or raise ArgumentError, ":title not specified"
         @widgets = args[:widgets] or raise ArgumentError, ":widgets not specified"
-        @highchart_options = args[:highchart_options] or raise ArgumentError, ":highchart_options not specified"
+        @gchart_options = args[:gchart_options] or raise ArgumentError, ":gchart_options not specified"
       end
 
       def widget_data(widget_id, opts = {})

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

@@ -1,12 +1,6 @@
 $ ->
 	globalOptions = gon.options
 
-	Highcharts.setOptions {
-		global: {
-			useUTC: globalOptions.useUtc
-		}
-	}
-
 	PageInfo = Backbone.Model.extend {
 	}
 
@@ -29,7 +23,7 @@ $ ->
 
 	PageTitleView = Backbone.View.extend {
 		tagName: 'li'
-		
+
 		template: _.template('<a href="#/pages/<%= id  %>"><%= title %></a>')
 			
 		initialize: ->
@@ -99,19 +93,20 @@ $ ->
 				@setNextFetch()
 
 		cutoffValue: (v, min, max) ->
-			if min isnt null && v.y < min
-				v.y = min
-				v.color = globalOptions.outlierColor
-			if max isnt null && v.y > max
-				v.y = max
-				v.color = globalOptions.outlierColor
+			if v isnt null
+				if min isnt null && v < min
+					min
+				else if max isnt null && v > max
+					max
+				else
+					v
+			else
+				0
 
 		cutoff: (min, max) ->
-			_.each(@get('series'), (s) ->
-				console.log s.data.length
-				_.each( s.data, (v) ->
-					@cutoffValue(v, min, max)
-				, this)
+			_.each(@get('series').rows, (row) ->
+				for i in [1 .. row.length - 1]
+					row[i] = @cutoffValue(row[i], min, max)
 			, this)
 
 		forceUpdate: ->
@@ -119,6 +114,97 @@ $ ->
 				success: (model, response) ->
 					model.trigger('redraw')
 			}
+
+		pieData: ->
+			data = new google.visualization.DataTable()
+			data.addColumn('string', 'Title')
+			data.addColumn('number', @get('valuesTitle'))
+			data.addRows(@get('series').data)
+			data
+
+		dateOffset: ->
+			if globalOptions.useUtc
+				(new Date).getTimezoneOffset() * 60000
+			else
+				0
+
+		lineData: ->
+			title = @get('title')
+			data = new google.visualization.DataTable()
+			data.addColumn('datetime', 'Time')
+			dateOffset = @dateOffset()
+			series = @get('series')
+			_.each series.titles, (t) ->
+				data.addColumn('number', t)
+
+			console.log series
+			_.each series.rows, (row) ->
+				row[0] = new Date(row[0] + dateOffset)
+				data.addRow(row)
+			data
+
+		options: ->
+			{
+				title: @get('title')
+				lineWidth: 1
+				chartArea: {
+					left: 40
+					width: '100%'
+				}
+				height: 300
+				legend: {
+					position: 'bottom'
+				}
+				vAxis: {
+					title: @get('valuesTitle')
+				}
+				axisTitlesPosition: 'in'
+			}
+
+		pieOptions: ->
+			$.extend true, @options(), {
+				slices: @get('series').options
+			}
+
+		lineOptions: ->
+			$.extend true, @options(), {
+				hAxis: {
+					format: 'yyyy.MM.dd HH:mm:ss'
+				}
+				series: @get('series').options
+			}
+
+		tableOptions: ->
+			$.extend true, @lineOptions(), {
+				sortColumn: 0
+				sortAscending: false
+			}
+
+		chartOptions: ->
+			opts = if @get('type') == 'pie'
+				@pieOptions()
+			else if @get('type') == 'table'
+				@tableOptions()
+			else
+				@lineOptions()
+			$.extend true, opts, globalOptions.gchartOptions, pageInfos.selected().get('gchartOptions')
+
+		chartData: ->
+			if @get('type') == 'pie'
+				@pieData()
+			else
+				@lineData()
+
+		chartClass: ->
+			if @get('type') == 'pie'
+				google.visualization.PieChart
+			else if @get('type') == 'area'
+				google.visualization.AreaChart
+			else if @get('type') == 'table'
+				google.visualization.Table
+			else
+				google.visualization.LineChart
+
 	}
 
 	WidgetList = Backbone.Collection.extend {
@@ -135,58 +221,14 @@ $ ->
 
 		updateData: (min, max) ->
 			@model.cutoff(min, max)
-			chartSeries = @chart.series
-			newSeries = @model.get('series')
-			for i in [0 .. chartSeries.length - 1]
-				if newSeries[i]?
-					chartSeries[i].setData(newSeries[i].data, false)
-			@chart.redraw()
+			@chart.draw(@model.chartData(), @model.chartOptions())
 
 		render: ->
-			options = {
-				chart: {
-					renderTo: @el
-					plotBorderWidth: 1
-					spacingLeft: 0
-					spacingRight: 0
-					type: @model.get('type')
-					animation: false
-					zoomType: 'x'
-				}
-				credits: {
-					enabled: false
-				}
-				title: {
-					text: @model.get('title')
-				}
-				xAxis: {
-					type: 'datetime'
-				}
-				yAxis: {
-					title: {
-						text: @model.get('valuesTitle')
-					}
-				}
-				tooltip: {
-					xDateFormat: '%Y-%m-%d %H:%M:%S'
-					valueDecimals: 6
-				}
-				series: @model.get('series')
-				plotOptions: {
-					series: {
-						animation: false
-						lineWidth: 1
-						shadow: false
-						marker: {
-							radius: 0
-						}
-					}
-				}
-			}
-			$.extend(true, options, globalOptions.highchartOptions, pageInfos.selected().get('highchartOptions'))
-			@chart = new Highcharts.Chart(options)
+			chartClass = @model.chartClass()
+			@chart = new chartClass(@el)
+			@updateData()
 
-  }
+	}
 
 	WidgetView = Backbone.View.extend {
 		tagName: 'div'