fozzie 0.0.21 → 0.0.22

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode

data/README.md

@@ -1,6 +1,11 @@
-# Fozzie
+# Fozzie [![travis-ci](https://secure.travis-ci.org/lonelyplanet/fozzie.png)](https://secure.travis-ci.org/lonelyplanet/fozzie)
 
-Ruby gem for registering statistics to Statsd in various ways.
+Ruby gem for registering statistics to a [Statsd](https://github.com/etsy/statsd) server in various ways.
+
+## Requirements
+
+* A Statsd server
+* Ruby 1.9
 
 ## Basic Usage
 
@@ -8,8 +13,9 @@ Send through statistics depending on the type you want to provide:
 
 ### Increment counter
 
-    Stats.increment 'wat'
-
+    Stats.increment 'wat' # increments the value in a Statsd bucket called 'some.prefix.wat' -
+                          # the exact bucket name depends on the bucket name prefix (see below)
+                           
 ### Decrement counter
 
     Stats.decrement 'wat'
@@ -142,21 +148,26 @@ To time and register the controller actions within your Rails application, Fozzi
 
 ### Rails
 
-Based on the Rack middleware above, but is more involved in it's construction of the bucket value.
+Based on the Rack middleware above, but is more involved in its construction of the bucket value.
 
 Fozzie::Rails::Middleware will automatically be invoked on Rails initialization.
 
 ## Bucket name prefixes
 
-Fozzie will construct bucket name prefixes according to your settings and environment. Example would be
+Fozzie automatically constructs bucket name prefixes from app name,
+hostname, and environment. For example:
 
-    Stats.increment 'foo'
+    Stats.increment 'wat'
+
+increments the bucket named
 
-Would be represented as the following Graphite bucket:
+    app-name.your-computer-name.development.wat
 
-    wat.your-computer-name.development.foo
+When working on your development machine. This allows multiple
+application instances, in different environments, to be distinguished
+easily and collated in Graphite quickly.
 
-When working on your development machine. This allows multiple application instances, in different environments, to be distinguished easily, and collated in Graphite quickly.
+The app name can be configured via the YAML configuration.
 
 ## Low level behaviour
 
@@ -178,16 +189,18 @@ If you also require UI metrics, you can also include the Mill script in the bott
 
 ## Credits
 
-Currently supported and maintained by [Marc Watts](marc.watts@lonelyplanet.co.uk) @Lonely Planet Online.
+Currently supported and maintained by [Marc Watts](marc.watts@lonelyplanet.co.uk) @ Lonely Planet Online.
 
-Big thanks to:
+Big thanks and Credits:
 
 * [Mark Barger](mark.barger@lonelyplanet.co.uk) for support in trying to make this Gem useful.
 
-* [Etsy](http://codeascraft.etsy.com/) who's [Statsd](https://github.com/etsy/statsd) product has enabled us to come such a long way in a very short period of time. We love Etsy.
+* [Dave Nolan](https://github.com/textgoeshere)
+
+* [Etsy](http://codeascraft.etsy.com/) whose [Statsd](https://github.com/etsy/statsd) product has enabled us to come such a long way in a very short period of time. We love Etsy.
 
 * [reinh](https://github.com/reinh/statsd) for his [statsd](https://github.com/reinh/statsd) Gem.
 
 ## Comments and Feedback
 
-Please [contact](marc.watts@lonelyplanet.co.uk) me on anything... improvements will be needed and are welcomed greatly.
+Please [contact](marc.watts@lonelyplanet.co.uk) me on anything... improvements will be needed and are welcomed greatly.

data/Rakefile

@@ -1 +1,7 @@
-require "bundler/gem_tasks"
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/fozzie.gemspec

@@ -35,8 +35,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-rocco'
-  s.add_development_dependency 'fl-rocco'
 
   s.add_development_dependency 'ruby_gntp'
 end

data/lib/fozzie/sniff.rb

@@ -31,8 +31,10 @@ module Fozzie
 
       def method_added(target)
         _monitor_meth(target) do |with, without, feature, bin|
-          define_method(with) do |*args|
-            S.time_for(bin) { args.empty? ? self.send(without) : self.send(without, *args) }
+          define_method(with) do |*args, &blk|
+            S.time_for(bin) do
+              args.empty? ? self.send(without, &blk) : self.send(without, *args, &blk)
+            end
           end
           self.alias_method_chain(target, feature)
         end
@@ -40,8 +42,10 @@ module Fozzie
 
       def singleton_method_added(target)
         _monitor_meth(target) do |with, without, feature, bin|
-          define_singleton_method(with) do |*args|
-            S.time_for(bin) { args.empty? ? send(without) : send(without, *args) }
+          define_singleton_method(with) do |*args, &blk|
+            S.time_for(bin) do
+              args.empty? ? send(without, &blk) : send(without, *args, &blk)
+            end
           end
           self.singleton_class.class_eval { alias_method_chain target, feature }
         end
@@ -50,4 +54,4 @@ module Fozzie
     end
 
   end
-end
+end

data/lib/fozzie/version.rb

@@ -1,3 +1,3 @@
 module Fozzie
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/spec/lib/fozzie/configuration_spec.rb

@@ -21,24 +21,24 @@ describe Fozzie::Configuration do
   end
 
   it "defaults env" do
-    subject.env.should eq 'development'
+    subject.env.should eq 'test'
   end
 
   it "creates a data prefix" do
     subject.stubs(:origin_name).returns("")
-    subject.data_prefix.should eq 'development'
+    subject.data_prefix.should eq 'test'
   end
 
   it "creates a data prefix with appname when set" do
     subject.stubs(:origin_name).returns("")
     subject.appname = 'astoria'
-    subject.data_prefix.should eq 'astoria.development'
+    subject.data_prefix.should eq 'astoria.test'
   end
 
   it "creates a prefix with origin" do
     subject.stubs(:origin_name).returns("app.server.local")
     subject.appname = 'astoria'
-    subject.data_prefix.should eq 'astoria.app-server-local.development'
+    subject.data_prefix.should eq 'astoria.app-server-local.test'
   end
 
   it "handles missing configuration namespace" do

data/spec/lib/fozzie/sniff_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'fozzie/sniff'
 
 describe Fozzie::Sniff do
-
-  subject do
+  let(:klass) do
     class FooBar
 
       _monitor
@@ -22,13 +21,24 @@ describe Fozzie::Sniff do
 
       def honeybadger; :dontcare end
 
-    end
+      _monitor
+      def method_yielding_to_block
+        yield(:retval_from_block) if block_given?
+      end
 
-    FooBar
+      _monitor
+      def self.class_method_yielding_to_block
+        yield(:retval_from_block) if block_given?
+      end
+
+      self
+    end
   end
 
-  context "environments" do
 
+  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
@@ -46,10 +56,10 @@ describe Fozzie::Sniff do
   end
 
   context 'class methods' do
-    let!(:env) { Fozzie.c.stubs(:env).returns('development') }
-
+    subject { klass }
+    
     it "aliases methods for monitoring" do
-      subject.methods.grep(/bar/).should eq [:bar!, :"bar_with_monitor!", :"bar_without_monitor!"]
+      subject.methods.grep(/bar/).should =~ [:bar!, :"bar_with_monitor!", :"bar_without_monitor!"]
     end
 
     it "behaves like original" do
@@ -73,35 +83,49 @@ describe Fozzie::Sniff do
       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
+    end
+
   end
 
   context 'instance methods' do
-
+    subject { FooBar.new }
+    
     it "aliases methods for monitoring" do
-      subject.new.methods.grep(/foo/).should eq [:foo, :foo_with_monitor, :foo_without_monitor]
+      subject.methods.grep(/foo/).should =~ [:foo, :foo_with_monitor, :foo_without_monitor]
     end
 
     it "behaves like original" do
-      subject.new.foo.should eq :foo
+      subject.foo.should eq :foo
     end
 
     it "utilises Fozzie" do
       S.expects(:time_for).with(['foo_bar', 'foo'])
 
-      subject.new.foo
+      subject.foo
     end
 
     it "handles arguments" do
       a = [:slow, :slower, :slowest]
-      subject.new.sloth(*a).should eq a
+      subject.sloth(*a).should eq a
     end
 
     it "does not monitor when mapped" do
       S.expects(:time_for).with(['foo_bar', 'honeybadger']).never
 
-      subject.new.honeybadger.should eq :dontcare
+      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
     end
 
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] ||= 'test'
+
 root = File.expand_path('../', File.dirname(__FILE__))
 lib  = File.expand_path('lib', root)
 $:.unshift(root, lib)
@@ -10,6 +12,7 @@ RSpec.configure do |config|
 end
 
 require 'fozzie'
+
 Fozzie.configure do |config|
   config.host    = '127.0.0.1'
   config.port    = 8809

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-uname
@@ -204,38 +204,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rocco
-  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: fl-rocco
-  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: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +231,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.md
@@ -309,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2575257041287680433
+      hash: 1130845935272544581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -318,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2575257041287680433
+      hash: 1130845935272544581
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.24