pulse-meter 0.1.6 → 0.1.7

data/examples/basic.ru

@@ -26,7 +26,7 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.timespan 1200
     end
 
-    p.spline "Rhino & Lama count comparison" do |c|
+    p.spline "Rhino & Lama & Goose count comparison" do |c|
       c.redraw_interval 5
       c.values_label 'Count'
       c.width 5
@@ -35,9 +35,10 @@ layout = PulseMeter::Visualizer.draw do |l|
 
       c.sensor :rhino_count, color: '#AAAAAA'
       c.sensor :lama_count, color: '#CC1155'
+      c.sensor :goose_count
     end
 
-    p.pie "Rhino & Lama count comparison" do |c|
+    p.pie "Rhino & Lama & Gooze count comparison" do |c|
       c.redraw_interval 5
       c.values_label 'Count'
       c.width 5
@@ -46,6 +47,7 @@ layout = PulseMeter::Visualizer.draw do |l|
 
       c.sensor :rhino_count, color: '#AAAAAA'
       c.sensor :lama_count, color: '#CC1155'
+      c.sensor :goose_count
     end
 
   end

data/examples/basic_sensor_data.rb

@@ -22,6 +22,12 @@ rhino_counter = PulseMeter::Sensor::Timelined::Counter.new(:rhino_count,
   ttl: 3600
 )
 
+goose_counter = PulseMeter::Sensor::Timelined::HashedCounter.new(:goose_count,
+  annotation: 'Goose Count',
+  interval: 10,
+  ttl: 3600
+)
+
 rhino_average_age = PulseMeter::Sensor::Timelined::Average.new(:rhino_average_age,
   annotation: 'Rhino average age',
   interval: 20,
@@ -35,4 +41,9 @@ while true
   rhino_counter.event(2)
   lama_average_age.event(Random.rand(50))
   rhino_average_age.event(Random.rand(100))
+
+  10.times do
+    goose_n = Random.rand(4)
+    goose_counter.event("goose_#{goose_n}" => 1)
+  end
 end

data/lib/pulse-meter/version.rb

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

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

@@ -1,3 +1,5 @@
+require "pulse-meter/visualize/series_extractor"
+
 module PulseMeter
   module Visualize
     class Sensor
@@ -6,7 +8,7 @@ module PulseMeter
 
       def initialize(args) 
         raise ArgumentError unless args.respond_to?('[]')
-        @name = args[:sensor] or raise ArgumentError, ":sensor_name not specified"
+        @name = args[:sensor] or raise ArgumentError, ":sensor not specified"
         @color = args[:color]
       end
 
@@ -27,24 +29,26 @@ module PulseMeter
       end
 
       def last_point_data(need_incomplete=false)
-        res = {
-            name: real_sensor.annotation,
-            y: to_float(last_value(need_incomplete))
-        }
-        res[:color] = color if color
-        res
+        extractor.point_data(last_value(need_incomplete))
       end
 
       def timeline_data(time_span, need_incomplete = false)
         sensor = real_sensor
-        data = sensor.timeline(time_span).map{|sd| {x: sd.start_time.to_i*1000, y: to_float(sd.value)}}
-        data.pop unless need_incomplete
-        res = {
-            name: sensor.annotation,
-            data: data
-        }
-        res[:color] = color if color
-        res
+        timeline_data = sensor.timeline(time_span)
+        timeline_data.pop unless need_incomplete
+        extractor.series_data(timeline_data)
+      end
+
+      def annotation
+        real_sensor.annotation
+      end
+
+      def type
+        real_sensor.class
+      end
+
+      def extractor
+        PulseMeter::Visualize.extractor(self)
       end
 
       protected
@@ -54,9 +58,6 @@ module PulseMeter
         PulseMeter::Sensor::Base.restore(@name)
       end
 
-      def to_float(val)
-        val && val.to_f
-      end
 
     end
   end

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

@@ -0,0 +1,96 @@
+module PulseMeter
+  module Visualize
+    module SeriesExtractor
+      class Simple
+        def initialize(sensor)
+          @sensor = sensor
+        end
+
+        def opts_to_add
+          opts = {}
+          opts[:color] = @sensor.color if @sensor.color
+          opts[:name] = @sensor.annotation
+          opts
+        end
+
+        def series_data(timeline_data)
+          {
+            data: timeline_data.map{|sd| {x: sd.start_time.to_i*1000, y: to_float(sd.value)}}
+          }.merge(opts_to_add)
+        end
+
+        def point_data(value)
+          {
+            y: to_float(value)
+          }.merge(opts_to_add)
+        end
+
+        protected
+
+        def to_float(val)
+          val && val.to_f
+        end
+      end
+
+
+      class Hashed < Simple
+
+        def parse_data(value)
+          if value
+            if value.is_a?(String)
+              JSON.parse(value)
+            else
+              value
+            end
+          else
+            {}
+          end
+        end
+
+        def point_data(value)
+          data = parse_data(value)
+          data.keys.map do |k|
+            {
+              y: to_float(data[k]),
+              name: k
+            }
+          end
+        end
+
+        def series_data(timeline_data)
+          series_data = {}
+          parsed_data = timeline_data.map do |sd|
+            data = parse_data(sd.value)
+            data.keys.each{|k| series_data[k] ||= {name: k, data: []}}
+            [sd.start_time.to_i*1000, data]
+          end
+
+          series_names = series_data.keys.sort
+          parsed_data.each do |data|
+            series_names.each do |k|
+              series_data[k][:data] << {x: data[0], y: to_float(data[1][k])}
+            end
+          end
+          series_data.values
+        end
+      end
+    end
+
+    SPECIAL_SERIES_EXTRACTORS = {
+      'HashedCounter' => SeriesExtractor::Hashed
+    }.freeze
+
+    DEFAULT_SERIES_EXTRACTOR = SeriesExtractor::Simple
+
+    def extractor(sensor)
+      key = sensor.type.to_s.split('::').last
+      extractor_class = SPECIAL_SERIES_EXTRACTORS[key] || DEFAULT_SERIES_EXTRACTOR
+      extractor_class.new(sensor)
+    end
+
+    module_function :extractor
+
+  end
+end
+
+

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

@@ -51,16 +51,14 @@ module PulseMeter
       end
 
       def line_series_data(tspan)
-        sensors.map do |s|
-          s.timeline_data(tspan, show_last_point)
-        end
+        sensors.map{ |s| s.timeline_data(tspan, show_last_point) }.flatten(1)
       end
 
       def pie_series_data
         [{
           type: type,
           name: values_label,
-          data: sensors.map{|s| s.last_point_data(show_last_point)}
+          data: sensors.map{|s| s.last_point_data(show_last_point)}.flatten(1)
         }]
       end
 

data/spec/pulse_meter/visualize/series_extractor_spec.rb

@@ -0,0 +1,80 @@
+require "spec_helper"
+
+describe PulseMeter::Visualize::SeriesExtractor do
+  let(:interval){ 100 }
+  let!(:real_simple_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:simple_sensor,
+    ttl: 1000,
+    interval: interval,
+    annotation: 'simple sensor'
+  ) }
+  let!(:real_hashed_sensor){ PulseMeter::Sensor::Timelined::HashedCounter.new(:hashed_sensor,
+    ttl: 1000,
+    interval: interval,
+    annotation: 'hashed sensor'
+  ) }
+
+  let!(:simple_sensor){PulseMeter::Visualize::Sensor.new(sensor: :simple_sensor)}
+  let!(:hashed_sensor){PulseMeter::Visualize::Sensor.new(sensor: :hashed_sensor)}
+
+  describe "simple extractor" do
+
+    let(:extractor) {PulseMeter::Visualize.extractor(simple_sensor)}
+
+    it "should be created for simple sensors" do
+      extractor.should be_kind_of(PulseMeter::Visualize::SeriesExtractor::Simple)
+    end
+
+    it "should create point data correctly" do
+      extractor.point_data(123).should == {y: 123, name: 'simple sensor'}
+    end
+
+    it "should create timeline data correctly" do
+      tl_data = [
+        PulseMeter::SensorData.new(Time.at(1), 11),
+        PulseMeter::SensorData.new(Time.at(2), "22")
+      ]
+      extractor.series_data(tl_data).should == {
+        name: 'simple sensor',
+        data: [{x: 1000, y: 11}, {x: 2000, y: 22}]
+      }
+    end
+
+  end
+
+  describe "hash extractor" do
+    let(:extractor) {PulseMeter::Visualize.extractor(hashed_sensor)}
+
+    it "should be created for hash sensors" do
+      extractor.should be_kind_of(PulseMeter::Visualize::SeriesExtractor::Hashed)
+    end
+
+    it "should create point data correctly" do
+      extractor.point_data('{"x": 123, "y": 321}').should == [
+        {y: 123, name: 'x'},
+        {y: 321, name: 'y'}
+      ]
+    end
+
+    it "should create timeline data correctly" do
+      tl_data = [
+        PulseMeter::SensorData.new(Time.at(1), {"a" => 5, "b" => 6}),
+        PulseMeter::SensorData.new(Time.at(2), '{"c": 7, "b": 6}')
+      ]
+      extractor.series_data(tl_data).should == [
+        {
+          name: 'a',
+          data: [{x: 1000, y: 5}, {x: 2000, y: nil}]
+        },
+        {
+          name: 'b',
+          data: [{x: 1000, y: 6}, {x: 2000, y: 6}]
+        },
+        {
+          name: 'c',
+          data: [{x: 1000, y: nil}, {x: 2000, y: 7}]
+        }
+      ]
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -339,6 +339,7 @@ files:
 - lib/pulse-meter/visualize/public/js/json2.js
 - lib/pulse-meter/visualize/public/js/underscore-min.js
 - lib/pulse-meter/visualize/sensor.rb
+- lib/pulse-meter/visualize/series_extractor.rb
 - lib/pulse-meter/visualize/views/main.haml
 - lib/pulse-meter/visualize/widget.rb
 - lib/pulse-meter/visualizer.rb
@@ -365,6 +366,7 @@ files:
 - spec/pulse_meter/visualize/layout_spec.rb
 - spec/pulse_meter/visualize/page_spec.rb
 - spec/pulse_meter/visualize/sensor_spec.rb
+- spec/pulse_meter/visualize/series_extractor_spec.rb
 - spec/pulse_meter/visualize/widget_spec.rb
 - spec/pulse_meter/visualizer_spec.rb
 - spec/pulse_meter_spec.rb
@@ -420,6 +422,7 @@ test_files:
 - spec/pulse_meter/visualize/layout_spec.rb
 - spec/pulse_meter/visualize/page_spec.rb
 - spec/pulse_meter/visualize/sensor_spec.rb
+- spec/pulse_meter/visualize/series_extractor_spec.rb
 - spec/pulse_meter/visualize/widget_spec.rb
 - spec/pulse_meter/visualizer_spec.rb
 - spec/pulse_meter_spec.rb