fozzie 0.0.11 → 0.0.12

data/lib/fozzie/rails/middleware.rb

@@ -5,16 +5,26 @@ module Fozzie
     class Middleware < Fozzie::Rack::Middleware
 
       def generate_key(env)
-        s = env['PATH_INFO']
-        return nil if s.nil?
+        path_str = env['PATH_INFO']
+        return nil unless path_str
+
         begin
-          path = ActionController::Routing::Routes.recognize_path(s)
+          routing = (rails_version == 3 ? ::Rails.application.routes : ::ActionController::Routing::Routes)
+          path    = routing.recognize_path(path_str)
+
           [path[:controller], path[:action], "render"].join('.')
+        rescue ActionController::RoutingError => exc
+          S.increment "routing.error"
+          nil
         rescue => exc
           nil
         end
       end
 
+      def rails_version
+        ::Rails.version.to_i
+      end
+
     end
   end
 end

data/lib/fozzie/version.rb

@@ -1,3 +1,3 @@
 module Fozzie
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

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

@@ -3,12 +3,17 @@ require 'action_controller'
 
 describe Fozzie::Rails::Middleware do
 
+  before :each do
+    ActionController::RoutingError = Class.new(StandardError) unless defined?(ActionController::RoutingError)
+  end
+
   subject do
     RailsApp = Class.new do
       def call(env)
         env
       end
     end unless defined?(RailsApp)
+    Rails = RailsApp unless defined?(Rails)
     Fozzie::Rails::Middleware.new RailsApp.new
   end
 
@@ -18,18 +23,59 @@ describe Fozzie::Rails::Middleware do
     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'
+  describe "rails 2" do
+
+    before :each do
+      RailsApp.stubs(:version).returns("2.3.1")
+    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
+
+    it "returns nil on routing error" do
+      s = '/somewhere/railsy'
+      fake_env = { 'PATH_INFO' => s }
+      ActionController::Routing::Routes.expects(:recognize_path).with(s).raises(ArgumentError)
+      subject.generate_key(fake_env).should == nil
+    end
+
   end
-  
-  it "returns nil on routing error" do
-    s = '/somewhere/railsy'
-    fake_env = { 'PATH_INFO' => s }
-    ActionController::Routing::Routes.expects(:recognize_path).with(s).raises(ArgumentError)
-    subject.generate_key(fake_env).should == nil
+
+  describe "rails 3" do
+
+    before :each do
+      RailsApp.stubs(:version).returns("3.1.1")
+      @app, @routing = Class.new, Class.new
+      @app.stubs(:routes).returns(@routing)
+      RailsApp.stubs(:application).returns(@app)
+    end
+
+    it "#generate_key" do
+      s = '/somewhere/railsy'
+      fake_env = { 'PATH_INFO' => s }
+      @routing.expects(:recognize_path).with(s).returns({:controller => 'somewhere', :action => 'railsy'})
+      subject.generate_key(fake_env).should == 'somewhere.railsy.render'
+    end
+
+    it "returns nil on error" do
+      s = '/somewhere/railsy'
+      fake_env = { 'PATH_INFO' => s }
+      @routing.expects(:recognize_path).with(s).raises(ArgumentError)
+      subject.generate_key(fake_env).should == nil
+    end
+    
+    it "returns nil on routing error" do
+      s = '/somewhere/railsy'
+      fake_env = { 'PATH_INFO' => s }
+      @routing.expects(:recognize_path).with(s).raises(ActionController::RoutingError)
+      S.expects(:increment).with('routing.error')
+      subject.generate_key(fake_env).should == nil
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
-  requirement: &70353720610060 !ruby/object:Gem::Requirement
+  requirement: &70337639228680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353720610060
+  version_requirements: *70337639228680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70353720609260 !ruby/object:Gem::Requirement
+  requirement: &70337639226940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720609260
+  version_requirements: *70337639226940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353720608300 !ruby/object:Gem::Requirement
+  requirement: &70337639226160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720608300
+  version_requirements: *70337639226160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70353720607280 !ruby/object:Gem::Requirement
+  requirement: &70337639225340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720607280
+  version_requirements: *70337639225340
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &70353720605940 !ruby/object:Gem::Requirement
+  requirement: &70337639224480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720605940
+  version_requirements: *70337639224480
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70353720604940 !ruby/object:Gem::Requirement
+  requirement: &70337639388800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720604940
+  version_requirements: *70337639388800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70353720603960 !ruby/object:Gem::Requirement
+  requirement: &70337639387980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720603960
+  version_requirements: *70337639387980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70353720601280 !ruby/object:Gem::Requirement
+  requirement: &70337639387300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720601280
+  version_requirements: *70337639387300
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70353720598520 !ruby/object:Gem::Requirement
+  requirement: &70337639386420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353720598520
+  version_requirements: *70337639386420
 description: Gem allows statistics gathering from Ruby and Ruby on Rails applications
   to Statsd
 email:
@@ -132,7 +132,6 @@ files:
 - 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
@@ -157,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 871105091290853865
+      hash: 2007942270524429698
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 871105091290853865
+      hash: 2007942270524429698
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.10

data/lib/fozzie/railtie.rb

@@ -1,11 +0,0 @@
-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