pulse-meter 0.4.8 → 0.4.9

data/examples/full/client.rb

@@ -100,8 +100,9 @@ while true
   sensors.shortest_minute_request(request_time)
   sensors.perc90_minute_request(request_time)
 
-  agent_counter = sensors.sensor(agent_names.shuffle.first)
-  agent_counter.event(1)
+  sensors.sensor(agent_names.shuffle.first) do |s|
+    s.event(1)
+  end
 
   sensors.cpu(Random.rand(100))
 

data/lib/pulse-meter.rb

@@ -5,6 +5,7 @@ require "pulse-meter/mixins/dumper"
 require "pulse-meter/mixins/utils"
 require "pulse-meter/mixins/cmd"
 require "pulse-meter/observer"
+require "pulse-meter/observer/extended"
 require "pulse-meter/sensor"
 require "pulse-meter/sensor/configuration"
 

data/lib/pulse-meter/command_aggregator/async.rb

@@ -16,6 +16,7 @@ module PulseMeter
         @buffer = []
         @in_multi = false
         @consumer_thread = run_consumer
+        at_exit{ wait_for_pending_events }
       end
 
       def multi

data/lib/pulse-meter/mixins/utils.rb

@@ -88,6 +88,19 @@ module PulseMeter
         (first_letter_upper ? first.capitalize : first.downcase) + terms.map(&:capitalize).join
       end
 
+      # Converts string from CamelCase to snake_case
+      # @param str [String] string to be underscore
+      # @return [String]
+      # @raise [ArgumentError] unless passed value responds to to_s
+      def underscore(str)
+        raise ArgumentError unless str.respond_to?(:to_s)
+        str.to_s.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
+      end
+
       # Converts string of the form YYYYmmddHHMMSS (considered as UTC) to Time
       # @param str [String] string to be converted
       # @return [Time]

data/lib/pulse-meter/observer.rb

@@ -2,6 +2,8 @@ require 'pulse-meter'
 
 module PulseMeter
   class Observer
+  extend PulseMeter::Mixins::Utils
+
     class << self
       # Removes observation from instance method
       # @param klass [Class] class
@@ -53,19 +55,8 @@ module PulseMeter
         end
       end
 
-      private
+      protected
 
-      def unchain_block(method)
-        with_observer = method_with_observer(method)
-        without_observer = method_without_observer(method)
-
-        Proc.new do
-          alias_method(method, without_observer)
-          remove_method(with_observer)
-          remove_method(without_observer)
-        end
-      end
-    
       def define_instrumented_method(method_owner, method, receiver, &handler)
         with_observer = method_with_observer(method)
         without_observer = method_without_observer(method)
@@ -83,6 +74,19 @@ module PulseMeter
         end
       end
 
+      private
+
+      def unchain_block(method)
+        with_observer = method_with_observer(method)
+        without_observer = method_without_observer(method)
+
+        Proc.new do
+          alias_method(method, without_observer)
+          remove_method(with_observer)
+          remove_method(without_observer)
+        end
+      end
+
       def chain_block(method, receiver, &handler)
         with_observer = method_with_observer(method)
         without_observer = method_without_observer(method)
@@ -105,11 +109,11 @@ module PulseMeter
       end
 
       def method_with_observer(method)
-        "#{method}_with_observer"
+        "#{method}_with_#{underscore(self).tr('/', '_')}"
       end
 
       def method_without_observer(method)
-        "#{method}_without_observer"
+        "#{method}_without_#{underscore(self).tr('/', '_')}"
       end
     end
   end

data/lib/pulse-meter/observer/extended.rb

@@ -0,0 +1,34 @@
+require 'pulse-meter'
+
+module PulseMeter
+  class Observer::Extended < ::PulseMeter::Observer
+    class << self
+      protected
+
+      def define_instrumented_method(method_owner, method, receiver, &handler)
+        with_observer = method_with_observer(method)
+        without_observer = method_without_observer(method)
+        method_owner.send(:define_method, with_observer) do |*args, &block|
+          start_time = Time.now
+          begin
+            result = self.send(without_observer, *args, &block)
+          ensure
+            begin
+              delta = ((Time.now - start_time) * 1000).to_i
+              observe_parameters = {
+                self: self,
+                delta: delta,
+                result: result,
+                args: args,
+                exception: $!
+              }
+              receiver.instance_exec(observe_parameters, &handler)
+            rescue StandardError
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

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

@@ -1,5 +1,5 @@
 #main {
-  margin-top: 30px;
+  margin-top: 50px;
 }
 
 #plotarea{
@@ -49,3 +49,8 @@
   margin-top: 0px;
   margin-bottom: 4px;
 }
+
+select#extend-timespan-val {
+  display: inline;
+}
+

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

@@ -20,14 +20,11 @@
     = partial "widgets/#{wtype}"
   = partial "sensors"
 
-  .container#main
-    .row
-      .span10.offset1
-        .navbar
-          .navbar-inner
-            .container
-              %a{href: '#/custom'}
-                %span.brand= @title 
-                %ul.nav#page-titles
-        #widgets.row
+  .navbar.navbar-fixed-top
+    .navbar-inner
+      .container-fluid
+        %a.brand{href: '#/custom'}= @title
+        %ul.nav#page-titles
 
+  .container-fluid#main
+    .row-fluid#widgets

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

@@ -33,7 +33,7 @@
           Refresh chart
       .form-inline
         Timespan:
-        %select#extend-timespan-val.btn-mini.span1
+        %select#extend-timespan-val.btn-mini.span3
           = partial "widgets/extend_options"
         %button#extend-timespan.btn.btn-mini
           %i.icon-arrow-left
@@ -56,10 +56,7 @@
 
 
 %script#dynamic-widget{type: 'text/template'}
-  .span10
-    #dynamic-plotarea
-    #errors
-  .span10
+  .span6
     #sensor-controls.form-horizontal
       %p.form-inline
         Chart type 
@@ -74,6 +71,6 @@
           %i.icon-refresh
           Refresh sensor list
     #sensor-list-area
-        
-
-
+  .span6
+    #dynamic-plotarea
+    #errors

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

@@ -30,7 +30,7 @@
           %p
             %label
               Timespan:
-              %select#extend-timespan-val.btn-mini.span1
+              %select#extend-timespan-val.btn-mini.span3
                 = partial "widgets/extend_options"
               %button#extend-timespan.btn.btn-mini
                 %i.icon-arrow-left

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

@@ -30,7 +30,7 @@
           %p
             %label
               Timespan:
-              %select#extend-timespan-val.btn-mini.span1
+              %select#extend-timespan-val.btn-mini.span3
                 = partial "widgets/extend_options"
               %button#extend-timespan.btn.btn-mini
                 %i.icon-arrow-left

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

@@ -21,7 +21,7 @@
           %p
             %label
               Timespan:
-              %select#extend-timespan-val.btn-mini.span1
+              %select#extend-timespan-val.btn-mini.span3
                 = partial "widgets/extend_options"
               %button#extend-timespan.btn.btn-mini
                 %i.icon-arrow-left

data/spec/pulse_meter/mixins/utils_spec.rb

@@ -156,6 +156,14 @@ describe PulseMeter::Mixins::Utils do
     end
   end
 
+  describe "#underscore" do
+    it "should underscore string" do
+      dummy.underscore("aaBbCc").should == "aa_bb_cc"
+      dummy.underscore("AaBbCc").should == "aa_bb_cc"
+      dummy.underscore("aaBb::Cc").should == "aa_bb/cc"
+    end
+  end
+
   describe "#camelize_keys" do
     it "should deeply camelize keys in hashes" do
       dummy.camelize_keys({ :aa_bb_cc => [ { :dd_ee => 123 }, 456 ] }).should =={ 'aaBbCc' => [ { 'ddEe' => 123 }, 456 ] }

data/spec/pulse_meter/observer/extended_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe PulseMeter::Observer::Extended do
+  context "instance methods observation" do
+    let!(:dummy) {ObservedDummy.new}
+    let!(:sensor) {PulseMeter::Sensor::Counter.new(:foo)}
+    before do
+      [:incr, :error].each {|m| described_class.unobserve_method(ObservedDummy, m)}
+    end
+
+    describe ".observe_method" do
+      it "passes exended parameters to block in normal execution" do
+        Timecop.freeze do
+          parameters = {}
+
+          described_class.observe_method(ObservedDummy, :incr, sensor) do |params|
+            parameters = params
+          end
+
+          dummy.incr(40)
+
+          parameters[:self].should == dummy
+          parameters[:delta].should >= 1000
+          parameters[:result].should == 40
+          parameters[:exception].should be_nil
+          parameters[:args].should == [40]
+        end
+      end
+
+      it "passes exended parameters to block with exception" do
+        Timecop.freeze do
+          parameters = {}
+
+          described_class.observe_method(ObservedDummy, :error, sensor) do |params|
+            parameters = params
+          end
+
+          lambda { dummy.error }.should raise_error(RuntimeError)
+
+          parameters[:self].should == dummy
+          parameters[:result].should == nil
+          parameters[:exception].class.should == RuntimeError
+          parameters[:args].should == []
+        end
+      end
+    end
+  end
+
+  context "class methods observation" do
+    let!(:sensor) {PulseMeter::Sensor::Counter.new(:foo)}
+    before do
+      [:incr, :error].each {|m| described_class.unobserve_class_method(ObservedDummy, m)}
+    end
+
+    describe ".observe_class_method" do
+      it "passes exended parameters to block in normal execution" do
+        Timecop.freeze do
+          parameters = {}
+
+          described_class.observe_class_method(ObservedDummy, :incr, sensor) do |params|
+            parameters = params
+          end
+  
+          ObservedDummy.incr(40)
+
+          parameters[:self].should == ObservedDummy
+          parameters[:delta].should >= 1000
+          parameters[:result].should == 40
+          parameters[:exception].should be_nil
+          parameters[:args].should == [40]
+        end
+      end
+
+      it "passes exended parameters to block with exception" do
+        Timecop.freeze do
+          parameters = {}
+
+          described_class.observe_class_method(ObservedDummy, :error, sensor) do |params|
+            parameters = params
+          end
+  
+          lambda { ObservedDummy.error }.should raise_error(RuntimeError)
+
+          parameters[:self].should == ObservedDummy
+          parameters[:result].should == nil
+          parameters[:exception].class.should == RuntimeError
+          parameters[:args].should == []
+        end
+      end
+    end
+  end
+end

data/spec/pulse_meter/observer_spec.rb

@@ -3,26 +3,6 @@ require 'spec_helper'
 describe PulseMeter::Observer do
 
   context "instance methods observation" do
-  
-    class ObservedDummy
-      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) {ObservedDummy.new}
     let!(:sensor) {PulseMeter::Sensor::Counter.new(:foo)}
     before do
@@ -124,31 +104,6 @@ describe PulseMeter::Observer do
   end
 
   context "class methods observation" do
-  
-    class ObservedDummy
-      @@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) {ObservedDummy}
     let!(:sensor) {PulseMeter::Sensor::Counter.new(:foo)}
     before do

data/spec/support/observered.rb

@@ -0,0 +1,40 @@
+class ObservedDummy
+  attr_reader :count
+  @@count = 0
+
+  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
+
+  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