pulse-meter 0.2.1 → 0.2.2

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

@@ -2,16 +2,7 @@ require "pulse-meter/visualize/series_extractor"
 
 module PulseMeter
   module Visualize
-    class Sensor
-      attr_reader :name
-      attr_reader :color
-
-      def initialize(args) 
-        raise ArgumentError unless args.respond_to?('[]')
-        @name = args[:sensor] or raise ArgumentError, ":sensor not specified"
-        @color = args[:color]
-      end
-
+    class Sensor < Base
       def last_value(now, need_incomplete=false)
         sensor = real_sensor
 
@@ -40,7 +31,7 @@ module PulseMeter
       end
 
       def annotation
-        real_sensor.annotation
+        real_sensor.annotation || real_sensor.name
       end
 
       def type
@@ -50,6 +41,10 @@ module PulseMeter
       def interval
         real_sensor.interval
       end
+      
+      def value
+        real_sensor.value
+      end
 
       def extractor
         PulseMeter::Visualize.extractor(self)
@@ -59,10 +54,9 @@ module PulseMeter
 
       def real_sensor
         # TODO add !temporarily! caching if this will be called too frequently
-        PulseMeter::Sensor::Base.restore(@name)
+        PulseMeter::Sensor::Base.restore(name)
       end
 
-
     end
   end
 end

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

@@ -10,59 +10,15 @@
     %link{rel: 'stylesheet', href: url("/css/#{cssfile}"), type: 'text/css', media: 'screen'}
   %script{type: 'text/javascript', src: "https://www.google.com/jsapi"}
   :javascript
-    google.load("visualization", "1", {packages:["corechart", "table"]});
+    google.load("visualization", "1", {packages:["corechart", "table", "gauge"]});
+    google.setOnLoadCallback(drawChart);
+    function drawChart() {
+      document.startApp();
+    }
 %body
-  %script#widget-template{type: 'text/template'}
-    #plotarea
-    #chart-controls
-      .form-inline
-        %button#refresh.btn.btn-mini
-          %i.icon-refresh
-          Refresh
-        <% if(type != 'table'){ %>
-        %span.space
-        %label
-          Cutoff min:
-          %input.btn-mini#cutoff-min
-        %span.space
-        %label
-          Cutoff max:
-          %input.btn-mini#cutoff-max
-        <% } %>
-        %span.space
-        %label
-          Refresh:
-          %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
-        <% if(type != 'pie'){ %>
-        %label
-          Timespan:
-          %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
-          %button#extend-timespan.btn.btn-mini
-            <% if(type != 'table'){ %>
-            %i.icon-arrow-left
-            <% } else { %>
-            %i.icon-arrow-down
-            <% } %>
-            Extend
-          %button#reset-timespan.btn.btn-mini
-            <% if(type != 'table'){ %>
-            %i.icon-arrow-right
-            <% } else { %>
-            %i.icon-arrow-up
-            <% } %>
-            Reset
-        <% } %>
-    %hr
+
+  - %w(area line table pie gauge).each do |wtype|
+    = partial "widgets/#{wtype}"
 
   .container#main
     .row

data/lib/pulse-meter/visualize/views/widgets/area.haml

@@ -0,0 +1,31 @@
+%script.widget-template{type: 'text/template', 'data-widget-type' => 'area'}
+  #plotarea
+  #chart-controls
+    .form-inline
+      %button#refresh.btn.btn-mini
+        %i.icon-refresh
+        Refresh
+      %span.space
+      %label
+        Cutoff min:
+        %input.btn-mini#cutoff-min
+      %span.space
+      %label
+        Cutoff max:
+        %input.btn-mini#cutoff-max
+      %span.space
+      %label
+        Refresh:
+        %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+      %label
+        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
+  %hr
+

data/lib/pulse-meter/visualize/views/widgets/extend_options.haml

@@ -0,0 +1,11 @@
+%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
+

data/lib/pulse-meter/visualize/views/widgets/gauge.haml

@@ -0,0 +1,13 @@
+%script.widget-template{type: 'text/template', 'data-widget-type' => 'gauge'}
+  #plotarea
+  #chart-controls
+    .form-inline
+      %button#refresh.btn.btn-mini
+        %i.icon-refresh
+        Refresh
+      %span.space
+      %label
+        Refresh:
+        %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+  %hr
+

data/lib/pulse-meter/visualize/views/widgets/line.haml

@@ -0,0 +1,31 @@
+%script.widget-template{type: 'text/template', 'data-widget-type' => 'line'}
+  #plotarea
+  #chart-controls
+    .form-inline
+      %button#refresh.btn.btn-mini
+        %i.icon-refresh
+        Refresh
+      %span.space
+      %label
+        Cutoff min:
+        %input.btn-mini#cutoff-min
+      %span.space
+      %label
+        Cutoff max:
+        %input.btn-mini#cutoff-max
+      %span.space
+      %label
+        Refresh:
+        %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+      %label
+        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
+  %hr
+

data/lib/pulse-meter/visualize/views/widgets/pie.haml

@@ -0,0 +1,13 @@
+%script.widget-template{type: 'text/template', 'data-widget-type' => 'pie'}
+  #plotarea
+  #chart-controls
+    .form-inline
+      %button#refresh.btn.btn-mini
+        %i.icon-refresh
+        Refresh
+      %span.space
+      %label
+        Refresh:
+        %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+  %hr
+

data/lib/pulse-meter/visualize/views/widgets/table.haml

@@ -0,0 +1,23 @@
+%script.widget-template{type: 'text/template', 'data-widget-type' => 'table'}
+  #plotarea
+  #chart-controls
+    .form-inline
+      %button#refresh.btn.btn-mini
+        %i.icon-refresh
+        Refresh
+      %span.space
+      %label
+        Refresh:
+        %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+      %label
+        Timespan:
+        %select#extend-timespan-val.btn-mini.span1
+          = partial "widgets/extend_options"
+        %button#extend-timespan.btn.btn-mini
+          %i.icon-arrow-down
+          Extend
+        %button#reset-timespan.btn.btn-mini
+          %i.icon-arrow-up
+          Reset
+  %hr
+

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

@@ -2,60 +2,29 @@ module PulseMeter
   module Visualize
     class Error < StandardError; end
 
-    class Widget
-      class NotATimelinedSensorInWidget < PulseMeter::Visualize::Error; end
-      class DifferentSensorIntervalsInWidget < PulseMeter::Visualize::Error; end
-
-      attr_reader :sensors
-      attr_reader :title
-      attr_reader :type
-      attr_reader :width
-      attr_reader :values_label
-      attr_reader :show_last_point
-      attr_reader :redraw_interval
-      attr_reader :timespan
-
-      def initialize(args) 
-        raise ArgumentError unless args.respond_to?('[]')
-        @title = args[:title] or raise ArgumentError, ":title not specified"
-        @sensors = args[:sensors] or raise ArgumentError, ":sensors not specified"
-        @type = args[:type] or raise ArgumentError, ":type not specified"
-        @width = args[:width]
-        @values_label = args[:values_label]
-        @show_last_point = args[:show_last_point] || false
-        @redraw_interval = args[:redraw_interval]
-        @timespan = args[:timespan]
+    class Widget < Base
+      def initialize(opts)
+        super
+        @opts[:sensors] ||= []
       end
 
-      def data(options = {})
-        ensure_sensor_match!
-        real_timespan = options[:timespan] || timespan
+      def data
         {
-          title: title,
           type: type,
-          values_title: values_label,
+          title: title,
+          redraw_interval: redraw_interval,
           width: width,
-          interval: redraw_interval,
-          series: series_data(real_timespan),
-          timespan: timespan
+          gchart_options: gchart_options,
+          values_title: values_label
         }
       end
 
-      protected
-
-      def series_data(tspan)
-        case type
-          when :line
-            line_series_data(tspan)
-          when :area
-            line_series_data(tspan)
-          when :pie
-            pie_series_data
-          when :table
-            line_series_data(tspan)
-        end
+      def type
+        self.class.to_s.split('::').last.downcase
       end
 
+      protected
+
       def ensure_sensor_match!
         intervals = []
         sensors.each do |s|
@@ -71,51 +40,12 @@ module PulseMeter
         end
       end
 
-      def line_series_data(tspan)
-        now = Time.now
-        sensor_datas = sensors.map{ |s|
-          s.timeline_data(now, tspan, show_last_point)
-        }
-        rows = []
-        titles = []
-        series_options = []
-        datas = []
-        sensor_datas.each do |sensor_data|
-          sensor_data.each do |tl|
-            titles << tl[:name]
-            series_options << {color: tl[:color]}
-            datas << tl[:data]
-          end
-        end
-        unless datas.empty?
-          first = datas.shift
-          first.each_with_index do |tl_data, row_num|
-            rows << datas.each_with_object([tl_data[:x], tl_data[:y]]) do |data_col, row|
-              row << data_col[row_num][:y]
-            end
-          end
-        end
-        {
-          titles: titles,
-          rows: rows,
-          options: series_options
-        }
-      end
 
-      def pie_series_data
-        values = []
-        slice_options = []
-        now = Time.now
-        sensors.each do |s|
-          s.last_point_data(now, show_last_point).each do |point_data|
-            values << [point_data[:name], point_data[:y]]
-            slice_options << {color: point_data[:color]}
-          end
+      def gauge_series_data
+        ensure_gauge_indicators!
+        sensors.map do |s|
+          [s.annotation, s.value]
         end
-        {
-          data: values,
-          options: slice_options
-        }
       end
 
     end

data/lib/pulse-meter/visualize/widgets/gauge.rb

@@ -0,0 +1,47 @@
+module PulseMeter
+  module Visualize
+    module Widgets
+      class Gauge < PulseMeter::Visualize::Widget
+        class NotAnIndicatorSensorInGaugeWidget < PulseMeter::Visualize::Error; end
+
+        def data(options = {})
+          super().merge({
+            series: values_data
+          })
+        end
+
+        protected
+
+        def ensure_gauge_indicators!
+          sensors.each do |s|
+            unless s.type <= PulseMeter::Sensor::Indicator || s.type <= PulseMeter::Sensor::HashedIndicator
+              raise NotAnIndicatorSensorInGaugeWidget, "Sensor #{s.name} is not an indicator(PulseMeter::Sensor::Indicator or PulseMeter::Sensor::HashedIndicator)"
+            end
+          end
+        end
+        
+        def values_data
+          ensure_gauge_indicators!
+          gauges = []
+          sensors.map do |s|
+            s_type = s.type
+            case 
+            when s_type == PulseMeter::Sensor::Indicator
+              gauges << [s.annotation, s.value]
+            when s_type == PulseMeter::Sensor::HashedIndicator
+              s.value.each_pair do |k, v|
+                gauge_title = "#{s.annotation}: #{k}"
+                gauges << [gauge_title, v]
+              end
+            end
+          end
+          gauges
+        end
+
+      end
+    end
+
+  end
+end
+
+

data/lib/pulse-meter/visualize/widgets/pie.rb

@@ -0,0 +1,36 @@
+module PulseMeter
+  module Visualize
+    module Widgets
+      class Pie < PulseMeter::Visualize::Widget
+
+        def data(options = {})
+          super().merge({
+            series: slice_data
+          })
+        end
+
+        protected
+        
+        def slice_data
+          values = []
+          slice_options = []
+          now = Time.now
+          sensors.each do |s|
+            s.last_point_data(now, show_last_point).each do |point_data|
+              values << [point_data[:name], point_data[:y]]
+              slice_options << {color: point_data[:color]}
+            end
+          end
+          {
+            data: values,
+            options: slice_options
+          }
+        end
+
+      end
+    end
+
+  end
+end
+
+