pulse-meter 0.2.11 → 0.3.0

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

@@ -23,9 +23,9 @@ module PulseMeter
         extractor.point_data(last_value(now, need_incomplete))
       end
 
-      def timeline_data(now, time_span, need_incomplete = false)
+      def timeline_data(from, till, need_incomplete = false)
         sensor = real_sensor
-        timeline_data = sensor.timeline_within(now - time_span, now)
+        timeline_data = sensor.timeline_within(from, till)
         timeline_data.pop unless need_incomplete
         extractor.series_data(timeline_data)
       end

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

@@ -4,9 +4,9 @@
   :javascript
     var ROOT = "#{url('/')}";
   = include_gon
-  - %w{jquery-1.7.2.min.js json2.js underscore-min.js backbone-min.js application.js bootstrap.js}.each do |jsfile|
+  - %w{jquery-1.7.2.min.js jquery-ui-1.8.16.bootstrap.min.js jquery-ui-timepicker-addon.js json2.js underscore-min.js backbone-min.js application.js bootstrap.js}.each do |jsfile|
     %script{type: 'text/javascript', src: url("/js/#{jsfile}")}
-  - %w{bootstrap.min.css application.css}.each do |cssfile|
+  - %w{bootstrap.min.css application.css jquery-ui-1.8.16.bootstrap.css}.each do |cssfile|
     %link{rel: 'stylesheet', href: url("/css/#{cssfile}"), type: 'text/css', media: 'screen'}
   %script{type: 'text/javascript', src: "https://www.google.com/jsapi"}
   :javascript
@@ -16,7 +16,6 @@
       document.startApp();
     }
 %body
-
   - %w(area line table pie gauge).each do |wtype|
     = partial "widgets/#{wtype}"
   = partial "sensors"

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

@@ -19,7 +19,7 @@
 
 %script#dynamic-widget-error{type: 'text/template'}
   .alert.alert-error
-    .button.close{'data-dismiss' => 'alert'} ×
+    .button.close{'data-dismiss' => 'alert'} ×
     <%- error %>
 
 %script#dynamic-widget-plotarea{type: 'text/template'}
@@ -31,6 +31,7 @@
         %button#refresh-chart.btn.btn-mini
           %i.icon-refresh
           Refresh chart
+      .form-inline
         Timespan:
         %select#extend-timespan-val.btn-mini.span1
           = partial "widgets/extend_options"
@@ -40,6 +41,18 @@
         %button#reset-timespan.btn.btn-mini
           %i.icon-arrow-right
           Reset
+      .form-inline
+        %label
+          From:
+          %span#start-time
+            %input.datepicker
+        %label
+          Till:
+          %span#end-time
+            %input.datepicker
+        %button#set-interval.btn.btn-mini
+          %i.icon-time
+          Set interval
 
 
 %script#dynamic-widget{type: 'text/template'}

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

@@ -5,27 +5,49 @@
       %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
-
+      %a#configure-button.btn.btn-mini{href: "#configure", role: 'button', 'data-toggle' => 'modal'} 
+        %i.icon-wrench
+        Configure...
+      .modal.hide.fade#configure
+        .modal-header
+          %button.close{type: 'button', 'data-dismiss' => 'modal', 'aria-hidden' => 'true'} ×
+          %h3 Configure
+        .modal-body
+          %p
+            %label
+              Cutoff min:
+              %input.btn-mini#cutoff-min
+            %span.space
+            %label
+              Cutoff max:
+              %input.btn-mini#cutoff-max
+          %hr
+          %p
+            %label
+              Refresh:
+              %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+          %hr
+          %p
+            %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
+          %p
+            %label
+              From:
+              %span#start-time
+                %input.datepicker
+            %label
+              Till:
+              %span#end-time
+                %input.datepicker
+            %button#set-interval.btn.btn-mini
+              %i.icon-time
+              Set interval

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

@@ -5,27 +5,50 @@
       %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
+      %a#configure-button.btn.btn-mini{href: "#configure", role: 'button', 'data-toggle' => 'modal'} 
+        %i.icon-wrench
+        Configure...
+      .modal.hide.fade#configure
+        .modal-header
+          %button.close{type: 'button', 'data-dismiss' => 'modal', 'aria-hidden' => 'true'} ×
+          %h3 Configure
+        .modal-body
+          %p
+            %label
+              Cutoff min:
+              %input.btn-mini#cutoff-min
+            %span.space
+            %label
+              Cutoff max:
+              %input.btn-mini#cutoff-max
+          %hr
+          %p
+            %label
+              Refresh:
+              %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+          %hr
+          %p
+            %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
+          %p
+            %label
+              From:
+              %span#start-time
+                %input.datepicker
+            %label
+              Till:
+              %span#end-time
+                %input.datepicker
+            %button#set-interval.btn.btn-mini
+              %i.icon-time
+              Set interval
 

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

@@ -5,19 +5,41 @@
       %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
+      %a#configure-button.btn.btn-mini{href: "#configure", role: 'button', 'data-toggle' => 'modal'} 
+        %i.icon-wrench
+        Configure...
+      .modal.hide.fade#configure
+        .modal-header
+          %button.close{type: 'button', 'data-dismiss' => 'modal', 'aria-hidden' => 'true'} ×
+          %h3 Configure
+        .modal-body
+          %p
+            %label
+              Refresh:
+              %input.btn-mini#need-refresh{type: :checkbox, checked: :true}
+          %hr
+          %p
+            %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
+          %p
+            %label
+              From:
+              %span#start-time
+                %input.datepicker
+            %label
+              Till:
+              %span#end-time
+                %input.datepicker
+            %button#set-interval.btn.btn-mini
+              %i.icon-time
+              Set interval
 

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

@@ -15,10 +15,10 @@ module PulseMeter
         end
 
         def data(options = {})
-          real_timespan = options[:timespan] || timespan
+          from, till = get_interval_borders(options)
           super().merge({
             values_title: values_label,
-            series: series_data(real_timespan),
+            series: series_data(from, till),
             timespan: timespan,
             interval: interval
           })
@@ -26,11 +26,26 @@ module PulseMeter
 
         protected
 
-        def series_data(tspan)
+        def get_interval_borders(options)
+          from = if options[:start_time] && (options[:start_time] > 0)
+            Time.at options[:start_time]
+          else
+            tspan = options[:timespan] || timespan
+            Time.now - tspan
+          end
+
+          till = if options[:end_time] && (options[:end_time] > 0)
+            Time.at options[:end_time]
+          else
+            Time.now
+          end
+          [from, till]
+        end
+
+        def series_data(from, till)
           ensure_sensor_match!
-          now = Time.now
           sensor_datas = sensors.map{ |s|
-            s.timeline_data(now, tspan, show_last_point)
+            s.timeline_data(from, till, show_last_point)
           }
           rows = []
           titles = []

data/pulse-meter.gemspec

@@ -28,14 +28,18 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('terminal-table')
   gem.add_runtime_dependency('thor')
 
+  gem.add_development_dependency('coffee-script')
   gem.add_development_dependency('foreman')
   gem.add_development_dependency('hashie')
+  gem.add_development_dependency('listen')
   gem.add_development_dependency('mock_redis')
   gem.add_development_dependency('rack-test')
   gem.add_development_dependency('rake')
+  gem.add_development_dependency('rb-fsevent')
   gem.add_development_dependency('redcarpet')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('simplecov')
+  gem.add_development_dependency('sprockets')
   gem.add_development_dependency('timecop')
   gem.add_development_dependency('yard')
 

data/spec/pulse_meter/observer_spec.rb

@@ -0,0 +1,252 @@
+require 'spec_helper'
+
+describe PulseMeter::Observer do
+
+  context "instance methods observation" do
+  
+    class Dummy
+      attr_reader :count
+
+      def initialize
+        @count = 0
+      end
+
+      def incr(value = 1, &proc)
+        Timecop.travel(Time.now + 1)
+        @count += value
+        @count += proc.call if proc
+        @count
+      end
+
+      def error
+        raise RuntimeError
+      end
+    end
+
+    let!(:dummy) {Dummy.new}
+    let!(:sensor) {PulseMeter::Sensor::Counter.new(:foo)}
+    before do
+      [:incr, :error].each {|m| described_class.unobserve_method(Dummy, m)}
+    end
+
+    def create_observer(method = :incr, increment = 1)
+      described_class.observe_method(Dummy, method, sensor) do |*args|
+        event(increment)
+      end
+    end
+
+    def remove_observer(method = :incr)
+      described_class.unobserve_method(Dummy, method)
+    end
+
+    describe ".observe_method" do
+      it "executes block in context of sensor each time specified method of given class called" do
+        create_observer
+        5.times {dummy.incr}
+        sensor.value.should == 5
+      end
+      
+      it "passes arguments to observed method" do
+        create_observer
+        5.times {dummy.incr(10)}
+        dummy.count.should == 50
+      end
+
+      it "passes methods' params to block" do
+        described_class.observe_method(Dummy, :incr, sensor) do |time, cnt|
+          event(cnt)
+        end
+
+        5.times {dummy.incr(10)}
+        sensor.value.should == 50
+      end
+
+      it "passes execution time in milliseconds to block" do
+        Timecop.freeze do
+          described_class.observe_method(Dummy, :incr, sensor) do |time, cnt|
+            event(time)
+          end
+
+          dummy.incr
+          sensor.value.should >= 1000
+        end
+      end
+
+      it "does not break observed method even is observer raises error" do
+        described_class.observe_method(Dummy, :incr, sensor) do |*args|
+          raise RuntimeError
+        end
+
+        lambda {dummy.incr}.should_not raise_error
+        dummy.count.should == 1
+      end
+
+      it "uses first observer in case of double observation" do
+        create_observer(:incr, 1)
+        create_observer(:incr, 2)
+        5.times {dummy.incr}
+        sensor.value.should == 5
+      end
+
+      it "keeps observed methods' errors" do
+        create_observer(:error)
+        lambda {dummy.error}.should raise_error(RuntimeError)
+        sensor.value.should == 1
+      end
+
+      it "makes observed method return its value" do
+        create_observer
+        dummy.incr.should == 1
+      end
+
+      it "allows to pass blocks to observed method" do
+        create_observer
+        dummy.incr do
+          2
+        end
+        dummy.count.should == 3
+      end
+    end
+
+    describe ".unobserve_method" do
+      it "does nothing unless method is observed" do
+        lambda {remove_observer}.should_not raise_error
+      end
+
+      it "removes observation from observed method" do
+        create_observer
+        dummy.incr
+        remove_observer
+        dummy.incr
+        sensor.value.should == 1
+      end
+    end
+  end
+
+  context "class methods observation" do
+  
+    class Dummy
+      @@count = 0
+      class << self
+        def count
+          @@count
+        end
+
+        def reset
+          @@count = 0
+        end
+
+        def incr(value = 1, &proc)
+          Timecop.travel(Time.now + 1)
+          @@count += value
+          @@count += proc.call if proc
+          @@count
+        end
+
+        def error
+          raise RuntimeError
+        end
+      end
+    end
+
+    let!(:dummy) {Dummy}
+    let!(:sensor) {PulseMeter::Sensor::Counter.new(:foo)}
+    before do
+      dummy.reset
+      [:incr, :error].each {|m| described_class.unobserve_class_method(Dummy, m)}
+    end
+
+    def create_observer(method = :incr, increment = 1)
+      described_class.observe_class_method(Dummy, method, sensor) do |*args|
+        event(increment)
+      end
+    end
+
+    def remove_observer(method = :incr)
+      described_class.unobserve_class_method(Dummy, method)
+    end
+
+    describe ".observe_class_method" do
+      it "executes block in context of sensor each time specified method of given class called" do
+        create_observer
+        5.times {dummy.incr}
+        sensor.value.should == 5
+      end
+      
+      it "passes arguments to observed method" do
+        create_observer
+        5.times {dummy.incr(10)}
+        dummy.count.should == 50
+      end
+
+      it "passes methods' params to block" do
+        described_class.observe_class_method(Dummy, :incr, sensor) do |time, cnt|
+          event(cnt)
+        end
+
+        5.times {dummy.incr(10)}
+        sensor.value.should == 50
+      end
+
+      it "passes execution time in milliseconds to block" do
+        Timecop.freeze do
+          described_class.observe_class_method(Dummy, :incr, sensor) do |time, cnt|
+            event(time)
+          end
+
+          dummy.incr
+          sensor.value.should == 1000
+        end
+      end
+
+      it "does not break observed method even is observer raises error" do
+        described_class.observe_class_method(Dummy, :incr, sensor) do |*args|
+          raise RuntimeError
+        end
+
+        lambda {dummy.incr}.should_not raise_error
+        dummy.count.should == 1
+      end
+
+      it "uses first observer in case of double observation" do
+        create_observer(:incr, 1)
+        create_observer(:incr, 2)
+        5.times {dummy.incr}
+        sensor.value.should == 5
+      end
+
+      it "keeps observed methods' errors" do
+        create_observer(:error)
+        lambda {dummy.error}.should raise_error(RuntimeError)
+        sensor.value.should == 1
+      end
+
+      it "makes observed method return its value" do
+        create_observer
+        dummy.incr.should == 1
+      end
+
+      it "allows to pass blocks to observed method" do
+        create_observer
+        dummy.incr do
+          2
+        end
+        dummy.count.should == 3
+      end
+    end
+
+    describe ".unobserve_class_method" do
+      it "does nothing unless method is observed" do
+        lambda {remove_observer}.should_not raise_error
+      end
+
+      it "removes observation from observed method" do
+        create_observer
+        dummy.incr
+        remove_observer
+        dummy.incr
+        sensor.value.should == 1
+      end
+    end
+  end
+end