hallmonitor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa7771b4a13639ff7de87b023e02772dedc74f8f
-  data.tar.gz: f695b69bda1f8528ee71a50244ddd54770a605c7
+  metadata.gz: 42d53cff1626075b9bc669c136a0bf7983f5880a
+  data.tar.gz: bd47a1799c522220ea030ecadaa2af429cea63ca
 SHA512:
-  metadata.gz: 225ea818ac8fd73e71b61e5b6cb69364db2857259feef11dc241a9010c6144f1778b2e57a78bcf94851a3d64ad6d720d7b14363b38f351bb704333c988106414
-  data.tar.gz: 647f56b728f3cadec74281bb41d6aee0e4cfa9a458e4e907be22d9bbca3248f9eadf28b48177c0a6e049b14da4ff90d8962316f45283d5051caa8a5fa8bbdfcc
+  metadata.gz: 6a3b4472a87957f81d4fde0c5690a29d1e833b3565c1fd491d5fd121ac93e97d8276ca13b4a37dd634fd70d16cadf1a6e119bba9174bbd0e996591fc3231c6d5
+  data.tar.gz: b80bd2b03fe7879ad46230194c08885d78d972e0d065ca2abc310aed0d8fecfbba34fb10654c8d7362de304afc61ca639fdf0835f035cc712dd3f546732d9425

data/lib/hallmonitor/monitored.rb

@@ -3,35 +3,35 @@
 module Hallmonitor
   module Monitored
     module ClassMethods
-      def timer_for(method_sym, options={})
-        metric_name = options[:metric_name] || "#{self.underscore(self.name)}.#{method_sym.to_s}.time"
-        self.send(:define_method, "#{method_sym.to_s}_with_hallmonitor_timer") do |*args|
-          watch(metric_name) do 
-            self.send("#{method_sym.to_s}_without_hallmonitor_timer".to_sym, *args)
+      def timer_for(method_sym, options = {})
+        metric_name = options[:metric_name] || "#{underscore(name)}.#{method_sym}"
+        send(:define_method, "#{method_sym}_with_hallmonitor_timer") do |*args|
+          watch(metric_name) do
+            send("#{method_sym}_without_hallmonitor_timer".to_sym, *args)
           end
         end
 
-        alias_method "#{method_sym.to_s}_without_hallmonitor_timer".to_sym, method_sym
-        alias_method method_sym, "#{method_sym.to_s}_with_hallmonitor_timer".to_sym
+        alias_method "#{method_sym}_without_hallmonitor_timer".to_sym, method_sym
+        alias_method method_sym, "#{method_sym}_with_hallmonitor_timer".to_sym
       end
 
-      def count_for(method_sym, options={})
-        metric_name = options[:metric_name] || "#{self.underscore(self.name)}.#{method_sym.to_s}.count"
-        self.send(:define_method, "#{method_sym.to_s}_with_hallmonitor_counter") do |*args|
+      def count_for(method_sym, options = {})
+        metric_name = options[:metric_name] || "#{underscore(name)}.#{method_sym}"
+        send(:define_method, "#{method_sym}_with_hallmonitor_counter") do |*args|
           emit(metric_name)
-          self.send("#{method_sym.to_s}_without_hallmonitor_counter".to_sym, *args)
+          send("#{method_sym}_without_hallmonitor_counter".to_sym, *args)
         end
 
-        alias_method "#{method_sym.to_s}_without_hallmonitor_counter".to_sym, method_sym
-        alias_method method_sym, "#{method_sym.to_s}_with_hallmonitor_counter".to_sym
+        alias_method "#{method_sym}_without_hallmonitor_counter".to_sym, method_sym
+        alias_method method_sym, "#{method_sym}_with_hallmonitor_counter".to_sym
       end
 
       def underscore(value)
         word = value.dup
-        word.gsub!(/::/, '/')
-        word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-        word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-        word.tr!("-", "_")
+        word.gsub!(/::/, '.')
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr!('-', ' ')
         word.downcase!
         word
       end
@@ -48,14 +48,12 @@ module Hallmonitor
     # Otherwise, a new Hallmonitor::Event will be created with the parameter and emitted.
     def emit(event = nil)
       to_emit = self;
-      if(!event.nil?)
+      unless event.nil?
         to_emit = event.kind_of?(Hallmonitor::Event) ? event : Hallmonitor::Event.new(event)
       end
       
       # If we were given a block, then we want to execute that
-      if block_given?
-        yield(to_emit)
-      end
+      yield(to_emit) if block_given?
       
       Outputter.output(to_emit)
     end

data/lib/hallmonitor/version.rb

@@ -1,7 +1,7 @@
 module Hallmonitor
   module Version
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     BUILD = nil
 

data/spec/monitored_spec.rb

@@ -2,22 +2,52 @@ require 'spec_helper'
 
 class Thing
   include Hallmonitor::Monitored
+
+  def timer_for_test
+    # Nothing
+  end
+  timer_for :timer_for_test
+
+  def count_for_test
+    # Nothing
+  end
+  count_for :count_for_test
 end
 
 RSpec::Matchers.define :an_event_with_name do |expected_name|
-  match{ |actual| actual.name == expected_name}
+  match { |actual| actual.is_a?(Hallmonitor::Event) && actual.name == expected_name }
+end
+
+RSpec::Matchers.define :a_timed_event_with_name do |expected_name| 
+  match { |actual| actual.is_a?(Hallmonitor::TimedEvent) && actual.name == expected_name }
 end
 
 describe Hallmonitor::Monitored do
-  subject {Thing.new}
+  subject { Thing.new }
+
+  describe '#timer_for' do
+    it 'should emit a timer with an appropriate name' do
+      expect(Hallmonitor::Outputter).to(
+        receive(:output).with(a_timed_event_with_name('thing.timer_for_test')))
+      Thing.new.timer_for_test
+    end
+  end
+
+  describe '#count_for' do
+    it 'should emit an event with an appropriate name' do
+      expect(Hallmonitor::Outputter).to(
+        receive(:output).with(an_event_with_name('thing.count_for_test')))
+      Thing.new.count_for_test
+    end
+  end
 
-  describe "#watch" do
-    let(:retval) {"Hello World"}
-    let(:name) {"foo"}
+  describe '#watch' do
+    let(:retval) { 'Hello World' }
+    let(:name) { 'foo' }
     before do
-      expect(Hallmonitor::Outputter).to receive(:output).with(an_event_with_name(name))
+      expect(Hallmonitor::Outputter).to receive(:output).with(a_timed_event_with_name(name))
     end
-    it "should return the value the block returns" do
+    it 'should return the value the block returns' do
       value = subject.watch(name) do
         retval
       end
@@ -25,8 +55,8 @@ describe Hallmonitor::Monitored do
     end
   end
 
-  describe "#emit" do
-    describe "with a string parameter" do
+  describe '#emit' do
+    describe 'with a string parameter' do
       let(:name) {"foo"}
       before do
         expect(Hallmonitor::Outputter).to receive(:output).with(an_event_with_name(name))
@@ -37,27 +67,27 @@ describe Hallmonitor::Monitored do
       end
     end
 
-    describe "with a block" do
-      it "should yield to the block" do
+    describe 'with a block' do
+      it 'should yield to the block' do
         yielded = false
         var = nil
-        subject.emit("foo") do |thing|
+        subject.emit('foo') do |thing|
           var = thing
           yielded = true
         end
         expect(var).to_not be_nil
-        expect(var.name).to eq("foo")
+        expect(var.name).to eq('foo')
         expect(yielded).to be_truthy
       end
     end
 
     describe 'with an event parameter' do
-      let(:event) {Hallmonitor::Event.new("bar")}
+      let(:event) { Hallmonitor::Event.new('bar') }
       before do
         expect(Hallmonitor::Outputter).to receive(:output).with(event)
       end
 
-      it "should emit the passed in event" do
+      it 'should emit the passed in event' do
         subject.emit(event)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hallmonitor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris TenHarmsel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json