oink 0.9.2 → 0.9.3

data/Rakefile

@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name         = "oink"
-    s.version      = "0.9.2"
+    s.version      = "0.9.3"
     s.author       = "Noah Davis"
     s.email        = "noahd1" + "@" + "yahoo.com"
     s.homepage     = "http://github.com/noahd1/oink"

data/lib/oink/middleware.rb

@@ -28,9 +28,10 @@ module Oink
     end
 
     def log_routing(env)
-      if env.has_key?('action_dispatch.request.parameters')
-        controller = env['action_dispatch.request.parameters']['controller']
-        action     = env['action_dispatch.request.parameters']['action']
+      routing_info = rails3_routing_info(env) || rails2_routing_info(env)
+      if routing_info
+        controller = routing_info['controller']
+        action     = routing_info['action']
         @logger.info("Oink Action: #{controller}##{action}")
       end
     end
@@ -53,6 +54,14 @@ module Oink
 
   private
 
+    def rails3_routing_info(env)
+      env['action_dispatch.request.parameters']
+    end
+
+    def rails2_routing_info(env)
+      env['action_controller.request.path_parameters']
+    end
+
     def reset_objects_instantiated
       ActiveRecord::Base.reset_instance_type_count
     end

data/lib/oink/reports/active_record_instantiation_report.rb

@@ -26,7 +26,7 @@ module Oink
               @pids[pid][:buffer] << line
             end
 
-            if line =~ /Oink Action: ((\w+)#(\w+))/
+            if line =~ /Oink Action: (([\w\/]+)#(\w+))/
 
               @pids[pid][:action] = $1
               unless @pids[pid][:request_finished]

data/lib/oink/reports/memory_usage_report.rb

@@ -25,7 +25,7 @@ module Oink
               @pids[pid][:buffer] << line
             end
 
-            if line =~ /Oink Action: ((\w+)#(\w+))/
+            if line =~ /Oink Action: (([\w\/]+)#(\w+))/
 
               unless @pids[pid][:request_finished]
                 @pids[pid][:last_memory_reading] = -1

data/spec/oink/middleware_spec.rb

@@ -42,10 +42,20 @@ describe Oink::Middleware do
       log_output.string.should include("Oink Log Entry Complete")
     end
 
-    it "logs the action and controller" do
+    it "logs the action and controller in rails 3.x" do
       get "/no_pigs", {}, {'action_dispatch.request.parameters' => {'controller' => 'oinkoink', 'action' => 'piggie'}}
       log_output.string.should include("Oink Action: oinkoink#piggie")
     end
+
+    it "logs the action and controller in rails 2.3.x" do
+      get "/no_pigs", {}, {'action_controller.request.path_parameters' => {'controller' => 'oinkoink', 'action' => 'piggie'}}
+      log_output.string.should include("Oink Action: oinkoink#piggie")
+    end
+
+    it "logs the action and controller within a module" do
+      get "/no_pigs", {}, {'action_dispatch.request.parameters' => {'controller' => 'oinkoink/admin', 'action' => 'piggie'}}
+      log_output.string.should include("Oink Action: oinkoink/admin#piggie")
+    end
   end
 
   it "reports 0 totals" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oink
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Noah Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -04:00
+date: 2011-07-08 00:00:00 -04:00
 default_executable: oink
 dependencies: 
 - !ruby/object:Gem::Dependency