fozzie 0.0.27 → 1.0.0

data/spec/lib/fozzie/rack/sinatra_spec.rb

@@ -0,0 +1,31 @@
+require 'fozzie/rack/middleware'
+require 'sinatra/base'
+require 'rack/test'
+
+describe "Sinatra Server with Middleware" do
+  include Rack::Test::Methods
+
+  def app
+    Sinatra.new do
+      set :environment, :test
+      use Fozzie::Rack::Middleware
+      get('/') { "echo" }
+      get('/somewhere/nice') { "echo" }
+    end
+  end
+
+  it "sends stats request on root" do
+    S.should_receive(:timing).with('index.render', anything, anything)
+    get '/'
+    last_response.should be_ok
+    last_response.body.should == 'echo'
+  end
+
+  it "sends stats request on nested path" do
+    S.should_receive(:timing).with('somewhere.nice.render', anything, anything)
+
+    get '/somewhere/nice'
+    last_response.should be_ok
+    last_response.body.should == 'echo'
+  end
+end

data/spec/lib/fozzie/sniff_spec.rb

@@ -13,9 +13,15 @@ describe Fozzie::Sniff do
 
       def self.badger; :cares end
 
+      _monitor("my.awesome.class.bucket.name")
+      def self.class_method_with_non_default_bucket_name; true; end
+      
       _monitor
-      def foo; :foo end
+      def foo; :foo; end
 
+      _monitor("my.awesome.bucket.name")
+      def method_with_non_default_bucket_name; true; end
+      
       _monitor
       def sloth(a, b, c); [a,b,c] end
 
@@ -30,34 +36,23 @@ describe Fozzie::Sniff do
       def self.class_method_yielding_to_block
         yield(:retval_from_block) if block_given?
       end
-
-      self
-    end
-  end
-
-
-  context "environments" do
-    subject { klass }
-    
-    it "is disabled in test" do
-      Fozzie.c.stubs(:env).returns('test')
-      S.expects(:time_for).with(['foo_bar', 'bar!']).never
-
-      subject.bar!
     end
 
-    it "is enabled in development" do
-      Fozzie.c.stubs(:env).returns('development')
-      S.expects(:time_for).with(['foo_bar', 'bar!'])
+    FooBar
+  end
 
-      subject.bar!
-    end
+  # Turn on sniffing for the duration of this spec
+  before(:all) do
+    Fozzie.c.sniff_envs << :test
+  end
 
+  after(:all) do
+    Fozzie.c.sniff_envs.delete(:test)
   end
 
   context 'class methods' do
     subject { klass }
-    
+
     it "aliases methods for monitoring" do
       subject.methods.grep(/bar/).should =~ [:bar!, :"bar_with_monitor!", :"bar_without_monitor!"]
     end
@@ -67,7 +62,7 @@ describe Fozzie::Sniff do
     end
 
     it "utilises Fozzie" do
-      S.expects(:time_for).with(['foo_bar', 'bar!'])
+      S.should_receive(:time_for).with(['foo_bar', 'bar!'])
 
       subject.bar!
     end
@@ -78,23 +73,26 @@ describe Fozzie::Sniff do
     end
 
     it "does not monitor when mapped" do
-      S.expects(:time_for).with(['foo_bar', 'badger']).never
+      S.should_receive(:time_for).with(['foo_bar', 'badger']).never
 
       subject.badger.should eq :cares
     end
 
-    
-    it "yields to a block when given" do
-      subject.class_method_yielding_to_block do |value_from_block|
-        value_from_block
-      end.should eq :retval_from_block
+    it "optionally sets the bucket name" do
+      S.should_receive(:time_for).with("my.awesome.class.bucket.name")
+
+      subject.class_method_with_non_default_bucket_name
     end
 
+
+    it "yields to a block when given" do
+      subject.class_method_yielding_to_block {|val| val }.should eq :retval_from_block
+    end
   end
 
   context 'instance methods' do
-    subject { FooBar.new }
-    
+    subject { klass.new }
+
     it "aliases methods for monitoring" do
       subject.methods.grep(/foo/).should =~ [:foo, :foo_with_monitor, :foo_without_monitor]
     end
@@ -104,28 +102,30 @@ describe Fozzie::Sniff do
     end
 
     it "utilises Fozzie" do
-      S.expects(:time_for).with(['foo_bar', 'foo'])
+      S.should_receive(:time_for).with(['foo_bar', 'foo'])
 
       subject.foo
     end
 
+    it "optionally sets the bucket name" do
+      S.should_receive(:time_for).with("my.awesome.bucket.name")
+
+      subject.method_with_non_default_bucket_name
+    end
+
     it "handles arguments" do
       a = [:slow, :slower, :slowest]
       subject.sloth(*a).should eq a
     end
 
     it "does not monitor when mapped" do
-      S.expects(:time_for).with(['foo_bar', 'honeybadger']).never
+      S.should_receive(:time_for).with(['foo_bar', 'honeybadger']).never
 
       subject.honeybadger.should eq :dontcare
     end
 
     it "yields to a block when given" do
-      subject.method_yielding_to_block do |value_from_block|
-        value_from_block
-      end.should eq :retval_from_block
+      subject.method_yielding_to_block {|val| val }.should eq :retval_from_block
     end
-
   end
-
 end

data/spec/lib/fozzie/version_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Fozzie Version" do
 
-  it "exists" do
+  it "is correct formatted" do
     Fozzie::VERSION.should be_kind_of(String)
     Fozzie::VERSION.should match(/\d{1,3}?\.?/)
   end

data/spec/lib/fozzie_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
+require 'logger'
 
 describe Fozzie do
-
   it "allows dynamic assignment" do
     { :host => 'somewhere.local', :port => 99 }.each do |field, val|
       Fozzie.configure {|c| c.send("#{field}=", val) }
@@ -9,6 +9,23 @@ describe Fozzie do
     end
   end
 
+  describe ".logger" do
+    let(:logger) { double "logger" }
+
+    before do
+      @old_logger = Fozzie.logger
+    end
+    
+    it "assigns a logger" do
+      Fozzie.logger = logger
+      Fozzie.logger.should eq logger
+    end
+
+    after do
+      Fozzie.logger = @old_logger
+    end
+  end
+
   it "has configuration" do
     Fozzie.config.should be_kind_of(Fozzie::Configuration)
     Fozzie.c.should be_kind_of(Fozzie::Configuration)
@@ -19,5 +36,4 @@ describe Fozzie do
       Kernel.const_defined?(k).should == true
     end
   end
-
-end
+end

data/spec/shared_examples/fozzie_adapter.rb

@@ -0,0 +1,7 @@
+shared_examples_for "fozzie adapter" do
+
+  it { should respond_to(:register) }
+
+  it { should respond_to(:delimeter) }
+  
+end

data/spec/shared_examples/interface.rb

@@ -0,0 +1,160 @@
+shared_examples "interface" do
+
+  it "#increment" do
+    subject.should_receive(:send).with('wat', 1, :count, 1)
+    subject.increment 'wat'
+  end
+
+  it "#decrement" do
+    subject.should_receive(:send).with('wat', -1, :count, 1)
+    subject.decrement 'wat'
+  end
+
+  it "#count" do
+    subject.should_receive(:send).with('wat', 5, :count, 1)
+    subject.count 'wat', 5
+  end
+
+  it "#timing" do
+    subject.should_receive(:send).with('wat', 500, :timing, 1)
+    subject.timing 'wat', 500
+  end
+
+  it "times a given block" do
+    subject.should_receive(:timing).with do |b, val, timing|
+      b == 'data.bin' && (1..11).include?(val)
+    end.exactly(3).times
+
+    subject.time_for('data.bin')   { sleep 0.01 }
+    subject.time_to_do('data.bin') { sleep 0.01 }
+    subject.time('data.bin')       { sleep 0.01 }
+  end
+
+  describe "event" do
+    it "for a commit" do
+      subject.should_receive(:gauge).with(['event', 'commit', nil], anything).twice
+      subject.commit
+      subject.committed
+    end
+
+    it "for a build" do
+      subject.should_receive(:gauge).with(['event', 'build', nil], anything).twice
+      subject.build
+      subject.built
+    end
+
+    it "for a deploy" do
+      subject.should_receive(:gauge).with(['event', 'deploy', nil], anything).twice
+      subject.deploy
+      subject.deployed
+    end
+
+    it "for anything" do
+      subject.should_receive(:send).with(['event', 'foo', nil], anything, :gauge, 1)
+      subject.event 'foo'
+    end
+
+    it "accepts an app name" do
+      subject.should_receive(:send).with(['event', 'foo', 'fozzie'], anything, :gauge, 1)
+      subject.event 'foo', 'fozzie'
+    end
+  end
+
+  describe "#increment_on" do
+    it "registers success" do
+      subject.should_receive(:increment).with(["event.increment", "success"], 1)
+      subject.increment_on('event.increment', true).should == true
+    end
+
+    it "registers failure" do
+      subject.should_receive(:increment).with(["event.increment", "fail"], 1)
+      subject.increment_on('event.increment', false).should == false
+    end
+
+    it "simply questions the passed val with if" do
+      a = mock
+      a.should_receive(:save).and_return({})
+      subject.should_receive(:increment).with(["event.increment", "success"], 1)
+      subject.increment_on('event.increment', a.save).should == {}
+    end
+
+    it "registers fail on nil return" do
+      a = mock
+      a.should_receive(:save).and_return(nil)
+      subject.should_receive(:increment).with(["event.increment", "fail"], 1)
+      subject.increment_on('event.increment', a.save).should == nil
+    end
+
+    describe "performing actions" do
+      it "registers success" do
+        a = mock
+        a.should_receive(:save).and_return(true)
+        subject.should_receive(:increment).with(["event.increment", "success"], 1)
+        subject.increment_on('event.increment', a.save).should == true
+      end
+
+      it "registers failure" do
+        a = mock
+        a.should_receive(:save).and_return(false)
+        subject.should_receive(:increment).with(["event.increment", "fail"], 1)
+        subject.increment_on('event.increment', a.save).should == false
+      end
+
+      it "registers positive even when nested" do
+        a = mock
+        a.should_receive(:save).and_return(true)
+        subject.should_receive(:timing).with('event.run', anything, anything)
+        subject.should_receive(:increment).with(["event.increment", "success"], 1)
+
+        res = subject.time_to_do "event.run" do
+          subject.increment_on('event.increment', a.save)
+        end
+        res.should == true
+      end
+
+      it "registers negative even when nested" do
+        a = mock
+        a.should_receive(:save).and_return(false)
+        subject.should_receive(:timing).with('event.run', anything, anything)
+        subject.should_receive(:increment).with(["event.increment", "fail"], 1)
+
+        res = subject.time_to_do "event.run" do
+          subject.increment_on('event.increment', a.save)
+        end
+        res.should == false
+      end
+    end
+  end
+
+  describe "#bulk" do
+
+    it "registers statistics in a single call" do
+      Fozzie.c.adapter.should_receive(:register).once
+
+      subject.bulk do
+        increment :foo
+        decrement :bar
+      end
+    end
+
+  end
+
+  it "registers a gauge measurement" do
+    subject.should_receive(:send).with("mystat", 99, :gauge, 1)
+    subject.gauge("mystat", 99)
+  end
+
+  it "raises exception if natural exception from block" do
+    proc { subject.time_to_do('data.bin', 1, :gauge, 1) { raise ArgumentError, "testing" } }.should raise_error(ArgumentError)
+  end
+
+  it "only calls the block once on error" do
+    Fozzie.c.adapter.stub(:send) { raise SocketError }
+    i = 0
+    p = proc {|n| (n + 1) }
+    val = subject.time_to_do('data.bin') { i+= p.call(i) }
+
+    val.should == 1
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,19 +1,29 @@
 ENV['RACK_ENV'] ||= 'test'
 
-root = File.expand_path('../', File.dirname(__FILE__))
-lib  = File.expand_path('lib', root)
+# Basic path registers
+root   = File.expand_path('../', File.dirname(__FILE__))
+lib    = File.expand_path('lib', root)
 $:.unshift(root, lib)
 
-require 'simplecov'
-SimpleCov.start
-
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
+# Shared Examples
+Dir[File.expand_path('spec/shared_examples/*.rb')].each {|r| require r }
 
 require 'fozzie'
 
+module Fozzie
+  class Adapter::TestAdapter
+    def register(*params); end
+    def delimeter; ""; end
+    def safe_separator; ""; end
+  end
+end
+
 Fozzie.configure do |config|
-  config.host    = '127.0.0.1'
-  config.port    = 8809
+  config.host     = '127.0.0.1'
+  config.port     = 8809
+  config.adapter  = "TestAdapter"
+end
+
+RSpec.configure do |config|
+  config.order = :random
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
 - Marc Watts
-- Dave Nolan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-uname
@@ -77,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -93,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: syntax
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -109,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,57 +155,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "\n    Gem to make statistics sending to Statsd from Ruby applications
-  simple and efficient as possible.\n    Inspired by the original ruby-statsd gem
-  by Etsy, currently used by Lonely Planet Online.\n  "
+description: ! "\n    Gem to make statistics sending from Ruby applications simple
+  and efficient as possible.\n    Currently supports Statsd, and is inspired by the
+  original ruby-statsd gem by Etsy.\n  "
 email:
 - marc.watts@lonelyplanet.co.uk
 executables: []
@@ -222,31 +173,33 @@ files:
 - Rakefile
 - fozzie.gemspec
 - fozzie.yml.example
-- lib/core_ext/hash.rb
 - lib/core_ext/module/monitor.rb
 - lib/fozzie.rb
+- lib/fozzie/adapter.rb
+- lib/fozzie/adapter/statsd.rb
+- lib/fozzie/bulk_dsl.rb
 - lib/fozzie/configuration.rb
+- lib/fozzie/dsl.rb
+- lib/fozzie/exception.rb
 - lib/fozzie/interface.rb
-- lib/fozzie/mill.rb
 - lib/fozzie/rack/middleware.rb
-- lib/fozzie/rails/engine.rb
-- lib/fozzie/rails/middleware.rb
-- lib/fozzie/railtie.rb
 - lib/fozzie/sniff.rb
-- lib/fozzie/socket.rb
 - lib/fozzie/version.rb
 - resources/mill.js.example
 - resources/mill.min.js.example
 - spec/config/fozzie.yml
-- spec/lib/core_ext/hash_spec.rb
+- spec/lib/core_ext/module/monitor_spec.rb
+- spec/lib/fozzie/adapter/statsd_spec.rb
+- spec/lib/fozzie/bulk_dsl_spec.rb
 - spec/lib/fozzie/configuration_spec.rb
-- spec/lib/fozzie/interface_spec.rb
-- spec/lib/fozzie/mill_spec.rb
+- spec/lib/fozzie/dsl_spec.rb
 - spec/lib/fozzie/rack/middleware_spec.rb
-- spec/lib/fozzie/rails/middleware_spec.rb
+- spec/lib/fozzie/rack/sinatra_spec.rb
 - spec/lib/fozzie/sniff_spec.rb
 - spec/lib/fozzie/version_spec.rb
 - spec/lib/fozzie_spec.rb
+- spec/shared_examples/fozzie_adapter.rb
+- spec/shared_examples/interface.rb
 - spec/spec_helper.rb
 homepage: 
 licenses: []
@@ -262,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1975054614990968952
+      hash: 254608194485651365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,22 +224,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1975054614990968952
+      hash: 254608194485651365
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Statsd Ruby gem from Lonely Planet Online
+summary: Ruby gem from Lonely Planet Online to register statistics. Currently supports
+  Statsd.
 test_files:
 - spec/config/fozzie.yml
-- spec/lib/core_ext/hash_spec.rb
+- spec/lib/core_ext/module/monitor_spec.rb
+- spec/lib/fozzie/adapter/statsd_spec.rb
+- spec/lib/fozzie/bulk_dsl_spec.rb
 - spec/lib/fozzie/configuration_spec.rb
-- spec/lib/fozzie/interface_spec.rb
-- spec/lib/fozzie/mill_spec.rb
+- spec/lib/fozzie/dsl_spec.rb
 - spec/lib/fozzie/rack/middleware_spec.rb
-- spec/lib/fozzie/rails/middleware_spec.rb
+- spec/lib/fozzie/rack/sinatra_spec.rb
 - spec/lib/fozzie/sniff_spec.rb
 - spec/lib/fozzie/version_spec.rb
 - spec/lib/fozzie_spec.rb
+- spec/shared_examples/fozzie_adapter.rb
+- spec/shared_examples/interface.rb
 - spec/spec_helper.rb