rack-perftools_profiler 0.4.0 → 0.4.1

data/.gitignore

@@ -0,0 +1,6 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+.rvmrc

data/README.rdoc

@@ -28,13 +28,13 @@ Include the middleware
 
 For Rails 2, add the following to config/environment.rb
 
- config.gem 'rack-perftools_profiler', :version => '~> 0.1', :lib => 'rack/perftools_profiler'
+ config.gem 'rack-perftools_profiler', :lib => 'rack/perftools_profiler'
  require 'rack/perftools_profiler'
  config.middleware.use ::Rack::PerftoolsProfiler, :default_printer => 'gif'
 
 For Rails 3, add the following to your Gemfile
 
-  gem 'rack-perftools_profiler', '~> 0.1', :require => 'rack/perftools_profiler'
+  gem 'rack-perftools_profiler', :require => 'rack/perftools_profiler'
 
 and add the following to config/application.rb
 
@@ -172,4 +172,4 @@ The basic idea and initial implementation of the middleware was heavily influenc
 
 == Copyright
 
-Copyright (c) 2010 Ben Brinckerhoff. See LICENSE for details.
+Copyright (c) 2010-2011 Ben Brinckerhoff. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/rack/perftools_profiler/action.rb

@@ -5,7 +5,7 @@ module Rack::PerftoolsProfiler
     def initialize(env, profiler, middleware)
       @env = env
       @request = Rack::Request.new(env)
-      @data_params = @request.params.clone
+      @get_params = @request.GET.clone
       @profiler = profiler
       @middleware = middleware
     end

data/lib/rack/perftools_profiler/profile_data_action.rb

@@ -4,7 +4,7 @@ module Rack::PerftoolsProfiler
     
     def check_printer_arg
       request = Rack::Request.new(@env)
-      printer = request.params['printer']
+      printer = request.GET['printer']
       self.class.check_printer(printer, @env)
     end
 

data/lib/rack/perftools_profiler/profile_once.rb

@@ -5,14 +5,14 @@ module Rack::PerftoolsProfiler
     include Rack::PerftoolsProfiler::Utils
 
     def self.has_special_param?(request)
-      request.params['profile'] != nil
+      request.GET['profile'] != nil
     end
 
     def initialize(*args)
       super
       request = Rack::Request.new(@env)
-      @times = (request.params.fetch('times') {1}).to_i
-      @mode = let(request.params['mode']) do |m|
+      @times = (request.GET.fetch('times') {1}).to_i
+      @mode = let(request.GET['mode']) do |m|
         if m.nil? || m.empty?
           nil
         else
@@ -30,23 +30,23 @@ module Rack::PerftoolsProfiler
     end
 
     def response
-      @middleware.profiler_data_response(@profiler.data(@data_params))
+      @middleware.profiler_data_response(@profiler.data(@get_params))
     end
 
     def delete_custom_params(env)
       new_env = env.clone
       
-      params = Rack::Request.new(new_env).params
-      params.delete('profile')
-      params.delete('times')
-      params.delete('printer')
-      params.delete('ignore')
-      params.delete('focus')
+      get_params = Rack::Request.new(new_env).GET
+      get_params.delete('profile')
+      get_params.delete('times')
+      get_params.delete('printer')
+      get_params.delete('ignore')
+      get_params.delete('focus')
 
       new_env.delete('rack.request.query_string')
       new_env.delete('rack.request.query_hash')
 
-      new_env['QUERY_STRING'] = build_query(params)
+      new_env['QUERY_STRING'] = build_query(get_params)
       new_env
     end
 

data/lib/rack/perftools_profiler/profiler_middleware.rb

@@ -8,7 +8,8 @@ module Rack::PerftoolsProfiler
     PRINTER_CONTENT_TYPE = {
       :text => 'text/plain',
       :gif => 'image/gif',
-      :pdf => 'application/pdf'
+      :pdf => 'application/pdf',
+      :callgrind => 'text/plain'
     }
     
     PRINTERS = PRINTER_CONTENT_TYPE.keys

data/lib/rack/perftools_profiler/return_data.rb

@@ -11,7 +11,7 @@ module Rack::PerftoolsProfiler
       if @profiler.profiling?
         [400, {'Content-Type' => 'text/plain'}, ["No profiling data available yet.\nVisit to /__stop__ to finish profiling."]]
       else
-        @middleware.profiler_data_response(@profiler.data(@data_params))
+        @middleware.profiler_data_response(@profiler.data(@get_params))
       end
     end
 

data/lib/rack/perftools_profiler/start_profiling.rb

@@ -6,7 +6,7 @@ module Rack::PerftoolsProfiler
     def initialize(*args)
       super
       request = Rack::Request.new(@env)
-      @mode = let(request.params['mode']) do |m|
+      @mode = let(request.GET['mode']) do |m|
         if m.nil? || m.empty?
           nil
         else

data/rack-perftools_profiler.gemspec

@@ -1,60 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rack-perftools_profiler}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Brinckerhoff"]
-  s.date = %q{2011-01-16}
+  s.date = %q{2011-04-21}
   s.description = %q{Middleware for profiling Rack-compatible apps using perftools.rb}
   s.email = %q{ben@bbrinck.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+     "README.rdoc"
   ]
   s.files = [
     ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/rack/perftools_profiler.rb",
-    "lib/rack/perftools_profiler/action.rb",
-    "lib/rack/perftools_profiler/call_app_directly.rb",
-    "lib/rack/perftools_profiler/profile_data_action.rb",
-    "lib/rack/perftools_profiler/profile_once.rb",
-    "lib/rack/perftools_profiler/profiler.rb",
-    "lib/rack/perftools_profiler/profiler_middleware.rb",
-    "lib/rack/perftools_profiler/return_data.rb",
-    "lib/rack/perftools_profiler/start_profiling.rb",
-    "lib/rack/perftools_profiler/stop_profiling.rb",
-    "lib/rack/perftools_profiler/utils.rb",
-    "rack-perftools_profiler.gemspec",
-    "test/multiple_request_profiling_test.rb",
-    "test/rack-perftools-profiler_test.rb",
-    "test/single_request_profiling_test.rb",
-    "test/test_helper.rb"
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/rack/perftools_profiler.rb",
+     "lib/rack/perftools_profiler/action.rb",
+     "lib/rack/perftools_profiler/call_app_directly.rb",
+     "lib/rack/perftools_profiler/profile_data_action.rb",
+     "lib/rack/perftools_profiler/profile_once.rb",
+     "lib/rack/perftools_profiler/profiler.rb",
+     "lib/rack/perftools_profiler/profiler_middleware.rb",
+     "lib/rack/perftools_profiler/return_data.rb",
+     "lib/rack/perftools_profiler/start_profiling.rb",
+     "lib/rack/perftools_profiler/stop_profiling.rb",
+     "lib/rack/perftools_profiler/utils.rb",
+     "rack-perftools_profiler.gemspec",
+     "test/multiple_request_profiling_test.rb",
+     "test/rack-perftools-profiler_test.rb",
+     "test/single_request_profiling_test.rb",
+     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/bhb/rack-perftools_profiler}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Middleware for profiling Rack-compatible apps using perftools.rb}
   s.test_files = [
     "test/multiple_request_profiling_test.rb",
-    "test/rack-perftools-profiler_test.rb",
-    "test/single_request_profiling_test.rb",
-    "test/test_helper.rb"
+     "test/rack-perftools-profiler_test.rb",
+     "test/single_request_profiling_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<perftools.rb>, ["~> 0.5"])
       s.add_runtime_dependency(%q<rack>, ["~> 1.0"])
       s.add_runtime_dependency(%q<open4>, ["~> 1.0"])

data/test/single_request_profiling_test.rb

@@ -275,4 +275,41 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
     assert_equal env, old_env
   end
 
+  context "when request is not GET" do
+
+    should "not return profiling data" do
+      app = @app.clone
+      env = Rack::MockRequest.env_for('/', 
+                                      :method => 'post', 
+                                      :params => {'profile' => 'true'})
+      status, headers, body = Rack::PerftoolsProfiler.new(app, :default_printer => 'gif').call(env)
+      assert_equal 200, status
+      assert_equal 'text/plain', headers['Content-Type']
+      assert_equal 'Oh hai der', RackResponseBody.new(body).to_s
+    end
+
+    should "call underlying app unchanged POST data" do
+      env = Rack::MockRequest.env_for('/', 
+                                      :method => 'post',
+                                      :params => 'profile=true&times=1&param=value&printer=gif&focus=foo&ignore=bar')
+      app = lambda do |env|
+        request = Rack::Request.new(env)
+        expected = 
+          {
+          'profile' => 'true',
+          'times' => '1',
+          'param' => 'value',
+          'printer' => 'gif',
+          'focus' => 'foo',
+          'ignore' => 'bar'
+        }
+        assert_equal expected, request.POST
+        [200, {}, ["hi"]]
+      end
+      
+      Rack::PerftoolsProfiler.new(app, :default_printer => 'gif').call(env)
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-perftools_profiler
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Ben Brinckerhoff
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -07:00
+date: 2011-04-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: perftools.rb
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 5
@@ -37,11 +34,9 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -52,11 +47,9 @@ dependencies:
   name: open4
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -67,11 +60,9 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -82,11 +73,9 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 10
@@ -97,11 +86,9 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
@@ -119,6 +106,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -144,32 +132,28 @@ homepage: http://github.com/bhb/rack-perftools_profiler
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Middleware for profiling Rack-compatible apps using perftools.rb