fozzie 0.0.5 → 0.0.6

data/fozzie.gemspec

@@ -21,5 +21,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'mocha'
+  s.add_development_dependency 'syntax'
+  s.add_development_dependency 'rack-test'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'sinatra'
+  s.add_development_dependency 'actionpack'
 end

data/lib/fozzie.rb

@@ -1,7 +1,12 @@
+# generic
 require "fozzie/config"
 require "fozzie/classes"
 require "fozzie/version"
 
+# middleware
+require "fozzie/rack/middleware"
+require "fozzie/rails/middleware"
+
 module Fozzie
   extend Fozzie::Config
   include Fozzie::Classes

data/lib/fozzie/classes.rb

@@ -36,7 +36,7 @@ module Fozzie
       def event(type)
         timing "event.#{type.to_s}", Time.now.usec
       end
-      
+
       def send_to_socket(message)
         begin
           super(message)

data/lib/fozzie/configuration.rb

@@ -40,7 +40,7 @@ module Fozzie
         :host        => '127.0.0.1',
         :port        => 8125,
         :config_path => '',
-        :env         => (ENV['RAILS_ENV'] || 'development'),
+        :env         => (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'),
         :appname     => ''
       }.dup
     end

data/lib/fozzie/rack/middleware.rb

@@ -0,0 +1,39 @@
+module Fozzie
+  module Rack
+    class Middleware
+
+      attr_reader :app
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        k = generate_key(env)
+        if k.nil?
+          self.call_without_timer(env)
+        else
+          self.call_with_timer(k, env)
+        end
+      end
+
+      def call_without_timer(env)
+        @app.call(env)
+      end
+
+      def call_with_timer(key, env)
+        S.time_to_do key do
+          @app.call(env)
+        end
+      end
+
+      def generate_key(env)
+        s = env['PATH_INFO']
+        return nil if s.nil?
+        s = (s == '/' ? 'index' : s.gsub(/.(\/)./) {|m| m.gsub('/', '.') }.gsub(/\//, '').strip)
+        (s.nil? || s.empty? ? nil : "#{s}.render")
+      end
+
+    end
+  end
+end

data/lib/fozzie/rails/middleware.rb

@@ -0,0 +1,16 @@
+require 'fozzie/rack/middleware'
+
+module Fozzie
+  module Rails
+    class Middleware < Fozzie::Rack::Middleware
+
+      def generate_key(env)
+        s = env['PATH_INFO']
+        return nil if s.nil?
+        path = ActionController::Routing::Routes.recognize_path(s)
+        [path[:controller], path[:action], "render"].join('.')
+      end
+
+    end
+  end
+end

data/lib/fozzie/railtie.rb

@@ -0,0 +1,11 @@
+module Fozzie
+  module Rack
+    class Railtie < Rails::Railtie
+
+      initializer "fozzie.rack.insert_middleware" do |app|
+        app.config.middleware.use "Fozzie::Rails::Middleware"
+      end
+
+    end
+  end
+end

data/lib/fozzie/version.rb

@@ -1,3 +1,3 @@
 module Fozzie
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/fozzie/config_spec.rb

@@ -10,7 +10,7 @@ describe Fozzie::Config do
   it { should respond_to(:configure) }
   it { should respond_to(:config) }
   it { should respond_to(:c) }
-  
+
   it "allows dynamic assignment" do
     {
       :host    => 'somewhere.local',

data/spec/lib/fozzie/configuration_spec.rb

@@ -21,16 +21,16 @@ describe Fozzie::Configuration do
   it "defaults env" do
     subject.env.should == 'development'
   end
-  
+
   it "creates a data prefix" do
     subject.data_prefix.should == 'development'
   end
-  
+
   it "creates a data prefix with appname when set" do
     subject.appname = 'astoria'
     subject.data_prefix.should == 'astoria.development'
   end
-  
+
   it "handles missing configuration namespace" do
     proc { Fozzie::Configuration.new({:env => 'blbala', :config_path => 'spec/'}) }.should_not raise_error
   end

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

@@ -0,0 +1,102 @@
+require 'spec_helper'
+require 'sinatra/base'
+require 'rack/test'
+
+describe Fozzie::Rack::Middleware do
+
+  subject do
+    RackApp = Class.new do
+      def call(env)
+        env
+      end
+    end unless defined?(RackApp)
+    Fozzie::Rack::Middleware.new RackApp.new
+  end
+
+  it { should respond_to(:call) }
+  it { should respond_to(:generate_key) }
+
+  describe "subject" do
+    it "returns env on call for testing" do
+      subject.call({}).should == {}
+    end
+  end
+
+  describe "#call" do
+
+    it "ignored stats request when path not valid" do
+      fake_env = { 'PATH_INFO' => '' }
+      subject.expects(:call_without_timer).with(fake_env)
+      subject.call(fake_env)
+    end
+
+    it "passes request with timer on index" do
+      fake_env = { 'PATH_INFO' => '/' }
+      subject.expects(:call_with_timer).with('index.render', fake_env)
+      subject.call(fake_env)
+    end
+
+    it "passes request with timer on full path" do
+      fake_env = { 'PATH_INFO' => '/somewhere/nice' }
+      subject.expects(:call_with_timer).with('somewhere.nice.render', fake_env)
+      subject.call(fake_env)
+    end
+
+    it "passes request onto app" do
+      envs = ['', '/', '/somewhere/nice'].each do |p|
+        fake_env = { 'PATH_INFO' => p }
+        subject.app.expects(:call).with(fake_env)
+        subject.call(fake_env)
+      end
+    end
+
+  end
+
+  describe "#generate_key" do
+
+    it "returns nil when applicable" do
+      fake_env = { 'PATH_INFO' => '' }
+      subject.generate_key(fake_env).should be_nil
+    end
+
+    it "returns index when root" do
+      fake_env = { 'PATH_INFO' => '/' }
+      subject.generate_key(fake_env).should == 'index.render'
+    end
+
+    it "returns dotted value" do
+      fake_env = { 'PATH_INFO' => '/somewhere/nice' }
+      subject.generate_key(fake_env).should == 'somewhere.nice.render'
+    end
+
+  end
+
+end
+
+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.expects(:timing).with('index.render', any_parameters)
+    get '/'
+    last_response.should be_ok
+    last_response.body.should == 'echo'
+  end
+
+  it "sends stats request on nested path" do
+    S.expects(:timing).with('somewhere.nice.render', any_parameters)
+    get '/somewhere/nice'
+    last_response.should be_ok
+    last_response.body.should == 'echo'
+  end
+
+end

data/spec/lib/fozzie/rails/middleware_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'action_controller'
+
+describe Fozzie::Rails::Middleware do
+
+  subject do
+    RailsApp = Class.new do
+      def call(env)
+        env
+      end
+    end unless defined?(RailsApp)
+    Fozzie::Rails::Middleware.new RailsApp.new
+  end
+
+  describe "subject" do
+    it "returns env on call for testing" do
+      subject.call({}).should == {}
+    end
+  end
+
+  it "#generate_key" do
+    s = '/somewhere/railsy'
+    fake_env = { 'PATH_INFO' => s }
+    ActionController::Routing::Routes.expects(:recognize_path).with(s).returns({:controller => 'somewhere', :action => 'railsy'})
+    subject.generate_key(fake_env).should == 'somewhere.railsy.render'
+  end
+
+end

data/spec/lib/fozzie_spec.rb

@@ -5,18 +5,18 @@ describe Fozzie do
 
   it { should respond_to(:c) }
   it { should respond_to(:config) }
-  
+
   it "has configuration" do
     Fozzie.config.should be_kind_of(Fozzie::Configuration)
     Fozzie.c.should be_kind_of(Fozzie::Configuration)
   end
-  
+
   it "creates new classes for statistics gathering" do
     Fozzie::Classes::NAMESPACES.each do |k|
       Kernel.const_defined?(k).should == true
     end
   end
-  
+
   it "acts like its inherited parent" do
     Fozzie::Classes::NAMESPACES.each do |k|
       kl = Kernel.const_get(k)
@@ -27,52 +27,52 @@ describe Fozzie do
       kl.should respond_to(:time)
     end
   end
-  
+
   it "acts an a singleton" do
     Fozzie::Classes::NAMESPACES.each do |k|
       kl1, kl2 = Kernel.const_get(k), Kernel.const_get(k)
       kl1.should == kl2
     end
   end
-  
+
   it "assigns namespace when passed" do
     Fozzie::AbstractFozzie.new(1,2, 'a').namespace.should == 'a'
   end
-  
+
   it "times a given block" do
     Stats.expects(:timing).with() {|b, val, timing| b == 'data.bin' && (1000..1200).include?(val) }.twice
     Stats.time_for('data.bin') { sleep 1 }
     Stats.time_to_do('data.bin') { sleep 1 }
   end
-  
+
   it "registers a commit" do
     Stats.expects(:timing).with('event.commit', anything).twice
     Stats.commit
     Stats.committed
   end
-  
+
   it "registers a build" do
     Stats.expects(:timing).with('event.build', anything).twice
     Stats.build
     Stats.built
   end
-  
+
   it "registers a deploy" do
     Stats.expects(:timing).with('event.deploy', anything).twice
     Stats.deploy
     Stats.deployed
   end
-  
+
   it "ensures block is called on socket error" do
     UDPSocket.any_instance.stubs(:send).raises(SocketError)
     proc { Stats.time_for('data.bin') { sleep 1 } }.should_not raise_error
     proc { Stats.time_to_do('data.bin') { sleep 1 } }.should_not raise_error
   end
-  
+
   it "raises exception if natural exception from block" do
     proc { Stats.time_for('data.bin') { raise ArgumentError, "testing" } }.should raise_error(ArgumentError)
   end
-  
+
   it "only calls the block once on SocketError" do
     UDPSocket.any_instance.stubs(:send).raises(SocketError)
     i = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
-  requirement: &70172749402340 !ruby/object:Gem::Requirement
+  requirement: &70225957503840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172749402340
+  version_requirements: *70225957503840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172749401920 !ruby/object:Gem::Requirement
+  requirement: &70225957670940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172749401920
+  version_requirements: *70225957670940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172749401240 !ruby/object:Gem::Requirement
+  requirement: &70225957670120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172749401240
+  version_requirements: *70225957670120
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70172749400660 !ruby/object:Gem::Requirement
+  requirement: &70225957669480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,54 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172749400660
+  version_requirements: *70225957669480
+- !ruby/object:Gem::Dependency
+  name: syntax
+  requirement: &70225957668900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70225957668900
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70225957668200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70225957668200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70172749400240 !ruby/object:Gem::Requirement
+  requirement: &70225957667320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70225957667320
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70225957664940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70225957664940
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70225957664380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172749400240
+  version_requirements: *70225957664380
 description: Gem allows statistics gathering from Ruby and Ruby on Rails applications
   to Statsd
 email:
@@ -86,11 +130,16 @@ files:
 - lib/fozzie/classes.rb
 - lib/fozzie/config.rb
 - lib/fozzie/configuration.rb
+- lib/fozzie/rack/middleware.rb
+- lib/fozzie/rails/middleware.rb
+- lib/fozzie/railtie.rb
 - lib/fozzie/version.rb
 - spec/config/fozzie.yml
 - spec/lib/core_ext/hash_spec.rb
 - spec/lib/fozzie/config_spec.rb
 - spec/lib/fozzie/configuration_spec.rb
+- spec/lib/fozzie/rack/middleware_spec.rb
+- spec/lib/fozzie/rails/middleware_spec.rb
 - spec/lib/fozzie/version_spec.rb
 - spec/lib/fozzie_spec.rb
 - spec/spec_helper.rb
@@ -108,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3461329709865678557
+      hash: 2608603561307742535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3461329709865678557
+      hash: 2608603561307742535
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.10
@@ -129,6 +178,8 @@ test_files:
 - spec/lib/core_ext/hash_spec.rb
 - spec/lib/fozzie/config_spec.rb
 - spec/lib/fozzie/configuration_spec.rb
+- spec/lib/fozzie/rack/middleware_spec.rb
+- spec/lib/fozzie/rails/middleware_spec.rb
 - spec/lib/fozzie/version_spec.rb
 - spec/lib/fozzie_spec.rb
 - spec/spec_helper.rb