rack-mini-profiler 0.1.7 → 0.1.12.pre

data/CHANGELOG

@@ -24,3 +24,31 @@
 	* Added some more client probing built in to rails
 	* More tests
 
+18-July-2012 - Sam 
+  
+  * Added First Paint time for chrome
+  * Bug fix to ensure non Rails installs have mini profiler
+  * Version 0.1.7
+
+30-July-2012 - Sam 
+  
+  * Made compliant with ancient versions of Rack (including Rack used by Rails2)
+  * Fixed broken share link 
+  * Fixed crashes on startup (in MemoryStore and FileStore)
+  * Version 0.1.8
+  * Unicode fix 
+  * Version 0.1.9
+
+7-August-2012 - Sam
+
+  * Added option to disable profiler for the current session (pp=disable / pp=enable)
+  * yajl compatability contributed by Sven Riedel 
+
+10-August-2012 - Sam 
+
+  * Added basic prepared statement profiling for postgres 
+
+20-August-2012 - Sam 
+  
+  * 1.12.pre 
+  * Cap X-MiniProfiler-Ids at 10, otherwise the header can get killed

data/README.md

@@ -47,6 +47,24 @@ class MyApp < Sinatra::Base
 end
 ```
 
+## Storage
+
+By default, rack-mini-profiler stores its results in a memory store: 
+
+```ruby 
+# our default
+Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
+```
+
+There are 2 other available storage engines, `RedisStore` and `FileStore`. 
+
+MemoryStore is stores results in a processes heap - something that does not work well in a multi process environment. 
+FileStore stores results in the file system - something that may not work well in a multi machine environment. 
+
+Additionally you may implement an AbstractStore for your own provider. 
+
+Rails hooks up a FileStore for all environments. 
+
 ## Running the Specs
 
 ```
@@ -67,11 +85,18 @@ Rack::MiniProfiler.config.position = 'right'
 
 In a Rails app, this can be done conveniently in an initializer such as config/initializers/mini_profiler.rb.
 
+## Rails 2.X support
+
+MiniProfiler uses [railtie](https://github.com/SamSaffron/MiniProfiler/blob/master/Ruby/lib/mini_profiler_rails/railtie.rb) to bootstrap itself. This will not be called in a Rails 2 app. You are going to need to hook it up manually. (TODO: document this - pull request please)
+
 ## Available Options
 
 * pre_authorize_cb - A lambda callback you can set to determine whether or not mini_profiler should be visible on a given request. Default in a Rails environment is only on in development mode. If in a Rack app, the default is always on.
 * position - Can either be 'right' or 'left'. Default is 'left'.
 * skip_schema_queries - Whether or not you want to log the queries about the schema of your tables. Default is 'false', 'true' in rails development.
+* use_existing_jquery - Use the version of jQuery on the page as opposed to the self contained one
+* auto_inject (default true) - when false the miniprofiler script is not injected in the page
+* backtrace_filter - a regex you can use to filter out unwanted lines from the backtraces
 
 ## Special query strings 
 

data/lib/html/profile_handler.js

@@ -1,6 +1,6 @@
-<script type="text/javascript">    
+<script type="text/javascript">
     (function(){{
-        var init = function() {{        
+        var init = function() {{
                 var load = function(s,f){{
                     var sc = document.createElement('script');
                     sc.async = 'async';
@@ -14,8 +14,8 @@
                     }};
 
                     document.getElementsByTagName('head')[0].appendChild(sc);
-                }};                
-                
+                }};
+
                 var initMp = function(){{
                     load('{path}includes.js?v={version}',function(){{
                         MiniProfiler.init({{
@@ -32,18 +32,18 @@
                         }});
                     }});
                 }};
-                if ({useExistingjQuery}) {{
+                if ({useExistingjQuery} && typeof(jQuery) === 'function') {{
                     jQueryMP = jQuery;
                     initMp();
                 }} else {{
                     load('{path}jquery.1.7.1.js?v={version}', initMp);
                 }}
-                
+
         }};
 
-        var w = 0;        
+        var w = 0;
         var f = false;
-        var deferInit = function(){{ 
+        var deferInit = function(){{
             if (f) return;
             if (window.performance && window.performance.timing && window.performance.timing.loadEventEnd == 0 && w < 10000){{
                 setTimeout(deferInit, 100);
@@ -59,4 +59,4 @@
         var o = window.onload;
         window.onload = function(){{if(o)o; deferInit()}};
     }})();
-</script>
+</script>

data/lib/html/share.html

@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <title>{name} ({duration} ms) - Profiling Results</title>
+        <script type='text/javascript' src='{path}jquery.1.7.1.js?v={version}'></script>
+        <script type='text/javascript'> var profiler = {json}; </script>
+        {includes} 
+    </head>
+    <body>
+        <div class='profiler-result-full'></div>
+    </body>
+</html>

data/lib/mini_profiler/client_timer_struct.rb

@@ -23,7 +23,7 @@ module Rack
         super
       end
 
-      def init_from_form_data(env, page_struct)
+      def self.init_from_form_data(env, page_struct)
         timings = []
         clientTimes, clientPerf, baseTime = nil 
         form = env['rack.request.form_hash']
@@ -67,8 +67,10 @@ module Rack
           timings.push("Name" => k, "Start" => clientTimes[k].to_i - baseTime, "Duration" => -1)
         end
 
-        self['RedirectCount'] = env['rack.request.form_hash']['clientPerformance']['navigation']['redirectCount']
-        self['Timings'] = timings
+        rval = self.new
+        rval['RedirectCount'] = env['rack.request.form_hash']['clientPerformance']['navigation']['redirectCount']
+        rval['Timings'] = timings
+        rval
       end
     end
 

data/lib/mini_profiler/config.rb

@@ -14,7 +14,7 @@ module Rack
 
     attr_accessor :auto_inject, :base_url_path, :pre_authorize_cb, :position,
         :backtrace_remove, :backtrace_filter, :skip_schema_queries, 
-        :storage, :user_provider, :storage_instance, :storage_options, :skip_paths, :authorization_mode
+        :storage, :user_provider, :storage_instance, :storage_options, :skip_paths, :authorization_mode, :use_existing_jquery
       
       def self.default
         new.instance_eval {
@@ -30,6 +30,7 @@ module Rack
           @storage = MiniProfiler::MemoryStore
           @user_provider = Proc.new{|env| Rack::Request.new(env).ip}
           @authorization_mode = :allow_all
+          @use_existing_jquery = false
           self
         }
       end

data/lib/mini_profiler/page_timer_struct.rb

@@ -16,7 +16,7 @@ module Rack
               "Level" => 0,
               "User" => "unknown user",
               "HasUserViewed" => false,
-              "ClientTimings" => ClientTimerStruct.new,
+              "ClientTimings" => nil,
               "DurationMilliseconds" => 0,
               "HasTrivialTimings" => true,
               "HasAllTrivialTimigs" => false,

data/lib/mini_profiler/profiler.rb

@@ -6,7 +6,6 @@ require 'mini_profiler/page_timer_struct'
 require 'mini_profiler/sql_timer_struct'
 require 'mini_profiler/client_timer_struct'
 require 'mini_profiler/request_timer_struct'
-require 'mini_profiler/body_add_proxy'
 require 'mini_profiler/storage/abstract_store'
 require 'mini_profiler/storage/memory_store'
 require 'mini_profiler/storage/redis_store'
@@ -64,11 +63,26 @@ module Rack
 
       # remove the mini profiler cookie, only used when config.authorization_mode == :whitelist
       def remove_profiling_cookie(headers)
-        Rack::Utils.delete_cookie_header!(headers, '__profilin')
+        Rack::Utils.set_cookie_header!(headers, '__profilin', :value => 'notstylin', :path => '/')
       end
 
       def set_profiling_cookie(headers)
-        Rack::Utils.set_cookie_header!(headers, '__profilin', 'stylin')
+        Rack::Utils.set_cookie_header!(headers, '__profilin', :value => 'stylin', :path => '/')
+      end
+
+      # user has the mini profiler cookie, only used when config.authorization_mode == :whitelist
+      def has_disable_profiling_cookie?(env)
+        env['HTTP_COOKIE'] && env['HTTP_COOKIE'].include?("__profilin_disable=stylin")
+      end
+
+      # remove the mini profiler cookie, only used when config.authorization_mode == :whitelist
+      def remove_disable_profiling_cookie(headers)
+        #something is odd with delete_cookie_header
+        Rack::Utils.set_cookie_header!(headers, '__profilin_disable', :value => 'notstylin', :path => '/')
+      end
+
+      def set_disable_profiling_cookie(headers)
+        Rack::Utils.set_cookie_header!(headers, '__profilin_disable', :value => 'stylin', :path => '/')
       end
 
       def create_current(env={}, options={})
@@ -101,8 +115,9 @@ module Rack
 			@app = app
 			@config.base_url_path << "/" unless @config.base_url_path.end_with? "/"
       unless @config.storage_instance
-        @storage = @config.storage_instance = @config.storage.new(@config.storage_options)
+        @config.storage_instance = @config.storage.new(@config.storage_options)
       end
+      @storage = @config.storage_instance 
 		end
     
     def user(env)
@@ -118,7 +133,7 @@ module Rack
         return [404, {}, ["Request not found: #{request['id']} - user #{user(env)}"]] 
       end
 			unless page_struct['HasUserViewed']
-				page_struct['ClientTimings'].init_from_form_data(env, page_struct)
+        page_struct['ClientTimings'] = ClientTimerStruct.init_from_form_data(env, page_struct)
 				page_struct['HasUserViewed'] = true
         @storage.save(page_struct) 
         @storage.set_viewed(user(env), id) 
@@ -151,8 +166,17 @@ module Rack
 			return [404, {}, ["Not found"]] unless ::File.exists? full_path
 			f = Rack::File.new nil
 			f.path = full_path
-			f.cache_control = "max-age:86400"
-			f.serving env
+
+      begin 
+        f.cache_control = "max-age:86400"
+        f.serving env
+      rescue
+        # old versions of rack have a different api 
+        status, headers, body = f.serving
+        headers.merge! 'Cache-Control' => "max-age:86400"
+        [status, headers, body]
+      end
+
 		end
 
     
@@ -172,11 +196,12 @@ module Rack
 
 		def call(env)
       status = headers = body = nil
+      query_string = env['QUERY_STRING']
       path = env['PATH_INFO']
 
       skip_it = (@config.pre_authorize_cb && !@config.pre_authorize_cb.call(env)) ||
                 (@config.skip_paths && @config.skip_paths.any?{ |p| path[0,p.length] == p}) ||
-                env["QUERY_STRING"] =~ /pp=skip/ 
+                query_string =~ /pp=skip/ 
       
       has_profiling_cookie = MiniProfiler.has_profiling_cookie?(env)
     
@@ -189,13 +214,29 @@ module Rack
       end
 
       # handle all /mini-profiler requests here
-			return serve_html(env) if env['PATH_INFO'].start_with? @config.base_url_path
+			return serve_html(env) if path.start_with? @config.base_url_path
+
+      has_disable_cookie = MiniProfiler.has_disable_profiling_cookie?(env)
+      # manual session disable / enable
+      if query_string =~ /pp=disable/ || has_disable_cookie
+        skip_it = true
+      end
+
+      if query_string =~ /pp=enable/
+        skip_it = false
+      end
+
+      if skip_it
+        status,headers,body = @app.call(env)
+        MiniProfiler.set_disable_profiling_cookie(headers) unless has_disable_cookie
+        return [status,headers,body]
+      end
 
       MiniProfiler.create_current(env, @config)
       MiniProfiler.deauthorize_request if @config.authorization_mode == :whitelist
-      if env["QUERY_STRING"] =~ /pp=no-backtrace/
+      if query_string =~ /pp=no-backtrace/
         current.skip_backtrace = true
-      elsif env["QUERY_STRING"] =~ /pp=full-backtrace/
+      elsif query_string =~ /pp=full-backtrace/
         current.full_backtrace = true
       end
 
@@ -203,7 +244,7 @@ module Rack
       quit_sampler = false
       backtraces = nil
       missing_stacktrace = false
-      if env["QUERY_STRING"] =~ /pp=sample/
+      if query_string =~ /pp=sample/
         backtraces = []
         t = Thread.current
         Thread.new {
@@ -231,6 +272,9 @@ module Rack
       start = Time.now 
       begin 
         status,headers,body = @app.call(env)
+        if has_disable_cookie
+          MiniProfiler.remove_disable_profiling_cookie(headers)
+        end
       ensure
         if backtraces 
           done_sampling = true
@@ -245,14 +289,14 @@ module Rack
       end
       
       return [status,headers,body] if skip_it
-      
+
       # we must do this here, otherwise current[:discard] is not being properly treated
-      if env["QUERY_STRING"] =~ /pp=env/
+      if query_string =~ /pp=env/
         body.close if body.respond_to? :close
         return dump_env env
       end
 
-      if env["QUERY_STRING"] =~ /pp=help/
+      if query_string =~ /pp=help/
         body.close if body.respond_to? :close
         return help
       end
@@ -274,6 +318,12 @@ module Rack
       # inject headers, script
 			if status == 200
         
+        # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
+        # Rack::ETag has already inserted some nonesense in the chain
+        headers.delete('ETag')
+        headers.delete('Date')
+        headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
+
 				# inject header
         if headers.is_a? Hash
           headers['X-MiniProfiler-Ids'] = ids_json(env)
@@ -283,21 +333,37 @@ module Rack
 				if current.inject_js \
 					&& headers.has_key?('Content-Type') \
 					&& !headers['Content-Type'].match(/text\/html/).nil? then
-					body = MiniProfiler::BodyAddProxy.new(body, self.get_profile_script(env))
+					
+          response = Rack::Response.new([], status, headers)
+          script = self.get_profile_script(env)
+          if String === body
+            response.write inject(body,script)
+          else
+            body.each { |fragment| response.write inject(fragment, script) }
+          end
+          body.close if body.respond_to? :close
+          return response.finish
 				end
 			end
 
-      # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
-      # Rack::ETag has already inserted some nonesense in the chain
-      headers.delete('ETag')
-      headers.delete('Date')
-      headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
 			[status, headers, body]
     ensure
       # Make sure this always happens
       current = nil
 		end
 
+    def inject(fragment, script)
+      fragment.sub(/<\/body>/i) do 
+        # if for whatever crazy reason we dont get a utf string, 
+        #   just force the encoding, no utf in the mp scripts anyway 
+        if script.respond_to?(:encoding) && script.respond_to?(:force_encoding)
+          (script + "</body>").force_encoding(fragment.encoding)
+        else
+          script + "</body>"
+        end
+      end
+    end
+
     def dump_env(env)
       headers = {'Content-Type' => 'text/plain'}
       body = "" 
@@ -317,6 +383,8 @@ module Rack
   pp=no-backtrace : don't collect stack traces from all the SQL executed
   pp=full-backtrace : enable full backtrace for SQL executed
   pp=sample : sample stack traces and return a report isolating heavy usage (requires the stacktrace gem)
+  pp=disable : disable profiling for this session 
+  pp=enable : enable profiling for this session (if previously disabled)
 "
       if (category == :stacktrace)
         body = "pp=stacktrace requires the stacktrace gem - add gem 'stacktrace' to your Gemfile"
@@ -359,7 +427,8 @@ module Rack
     end
 
     def ids_json(env)
-      ids = [current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])
+      # cap at 10 ids, otherwise there is a chance you can blow the header
+      ids = [current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])[0..8]
       ::JSON.generate(ids.uniq)
     end
 
@@ -380,7 +449,7 @@ module Rack
 			showControls = false
 			currentId = current.page_struct["Id"]
 			authorized = true
-      useExistingjQuery = false
+			useExistingjQuery = @config.use_existing_jquery
 			# TODO : cache this snippet 
 			script = IO.read(::File.expand_path('../html/profile_handler.js', ::File.dirname(__FILE__)))
 			# replace the variables

data/lib/mini_profiler/storage/file_store.rb

@@ -39,9 +39,14 @@ module Rack
 
         me = self
         Thread.new do
-          while true do
-            me.cleanup_cache if MiniProfiler.instance
-            sleep(3600)
+          begin 
+            while true do
+              # TODO: a sane retry count before bailing
+              me.cleanup_cache
+              sleep(3600)
+            end
+          rescue
+            # don't crash the thread, we can clean up next time 
           end
         end
       end
@@ -83,10 +88,6 @@ module Rack
         }
       end
       
-
-      private 
-
-
       def cleanup_cache
         files = Dir.entries(@path)
         @timer_struct_lock.synchronize {

data/lib/mini_profiler/storage/memory_store.rb

@@ -52,10 +52,6 @@ module Rack
         }
       end
       
-
-      private 
-
-
       def cleanup_cache
         expire_older_than = ((Time.now.to_f - MiniProfiler::MemoryStore::EXPIRE_TIMER_CACHE) * 1000).to_i
         @timer_struct_lock.synchronize {

data/lib/mini_profiler/timer_struct.rb

@@ -22,7 +22,9 @@ module Rack
       end
 
       def to_json(*a)
-        ::JSON.generate(@attributes, a[0])
+        # this does could take in an option hash, but the only interesting there is max_nesting.
+        #   if this becomes an option we could increase
+        ::JSON.generate( @attributes, :max_nesting => 100 )
       end
 
     end

data/lib/mini_profiler_rails/railtie.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module MiniProfilerRails
 
   class Railtie < ::Rails::Railtie
@@ -22,7 +24,7 @@ module MiniProfilerRails
 
       # The file store is just so much less flaky
       tmp = Rails.root.to_s + "/tmp/miniprofiler"
-      Dir::mkdir(tmp) unless File.exists?(tmp)
+      FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
 
       c.storage_options = {:path => tmp}
       c.storage = Rack::MiniProfiler::FileStore

data/lib/patches/sql_patches.rb

@@ -91,6 +91,23 @@ if SqlPatches.class_exists? "PG::Result"
   class PG::Connection
     alias_method :exec_without_profiling, :exec
     alias_method :async_exec_without_profiling, :async_exec
+    alias_method :exec_prepared_without_profiling, :exec_prepared
+    alias_method :send_query_prepared_without_profiling, :send_query_prepared
+    alias_method :prepare_without_profiling, :prepare
+
+    def prepare(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return prepare_without_profiling(*args,&blk) unless current
+
+      @prepare_map ||= {}
+      @prepare_map[args[0]] = args[1]
+
+      # dont leak more than 10k ever
+      @prepare_map = {} if @prepare_map.length > 10000
+
+      prepare_without_profiling(*args,&blk) 
+
+    end
 
     def exec(*args,&blk)
       current = ::Rack::MiniProfiler.current
@@ -104,6 +121,34 @@ if SqlPatches.class_exists? "PG::Result"
       result
     end
 
+    def exec_prepared(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return exec_prepared_without_profiling(*args,&blk) unless current
+
+      start = Time.now
+      result = exec_prepared_without_profiling(*args,&blk)
+      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
+      mapped = args[0]
+      mapped = @prepare_map[mapped] || args[0] if @prepare_map
+      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(mapped, elapsed_time))
+
+      result
+    end
+    
+    def send_query_prepared(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return send_query_prepared_without_profiling(*args,&blk) unless current
+
+      start = Time.now
+      result = send_query_prepared_without_profiling(*args,&blk)
+      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
+      mapped = args[0]
+      mapped = @prepare_map[mapped] || args[0] if @prepare_map
+      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(mapped, elapsed_time))
+
+      result
+    end
+    
     def async_exec(*args,&blk)
       current = ::Rack::MiniProfiler.current
       return exec_without_profiling(*args,&blk) unless current

data/lib/rack-mini-profiler.rb

@@ -1,6 +1,6 @@
-require File.expand_path('mini_profiler/profiler', File.dirname(__FILE__) )
-require File.expand_path('patches/sql_patches', File.dirname(__FILE__) )
+require 'mini_profiler/profiler'
+require 'patches/sql_patches'
 
 if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
-  require File.expand_path('mini_profiler_rails/railtie', File.dirname(__FILE__) )
+  require 'mini_profiler_rails/railtie'
 end

data/rack-mini-profiler.gemspec

@@ -1,9 +1,8 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.7"
+	s.version = "0.1.12.pre"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Aleks Totic","Sam Saffron", "Robin Ward"]
-	s.date = "2012-04-02"
 	s.description = "Page loading speed displayed on every page. Optimize while you develop, performance is a feature."
 	s.email = "sam.saffron@gmail.com"
 	s.homepage = "http://miniprofiler.com"
@@ -14,9 +13,9 @@ Gem::Specification.new do |s|
 		"README.md",
     "CHANGELOG"
 	]
-	s.add_runtime_dependency 'rack', '>= 1.1.3' 
+	s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
-    s.add_runtime_dependency 'json', '>= 1.6' 
+    s.add_runtime_dependency 'json', '>= 1.6'
   end
 
   s.add_development_dependency 'rake'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.12.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Aleks Totic
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -93,7 +93,6 @@ files:
 - lib/mini_profiler/page_timer_struct.rb
 - lib/mini_profiler/context.rb
 - lib/mini_profiler/config.rb
-- lib/mini_profiler/body_add_proxy.rb
 - lib/mini_profiler/profiling_methods.rb
 - lib/mini_profiler/client_timer_struct.rb
 - lib/mini_profiler/profiler.rb
@@ -104,6 +103,7 @@ files:
 - lib/rack-mini-profiler.rb
 - lib/html/jquery.1.7.1.js
 - lib/html/includes.tmpl
+- lib/html/share.html
 - lib/html/includes.less
 - lib/html/list.css
 - lib/html/includes.js
@@ -130,16 +130,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -348401747
+      hash: -1045845709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -348401747
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/mini_profiler/body_add_proxy.rb

@@ -1,45 +0,0 @@
-module Rack
-  class MiniProfiler
-
-    # This class acts as a proxy to the Body so that we can
-    # safely append to the end without knowing about the internals
-    # of the body class.    
-    class BodyAddProxy
-      def initialize(body, additional_text)
-        @body = body
-        @additional_text = additional_text
-      end
-
-      def respond_to?(*args)
-        super or @body.respond_to?(*args)
-      end
-
-      def method_missing(*args, &block)
-        @body.__send__(*args, &block)
-      end
-
-      # In the case of to_str we don't want to use method_missing as it might avoid
-      # a call to each (such as in Rack::Test)
-      def to_str
-        result = ""
-        each {|token| result << token}
-        result
-      end
-
-      def each(&block)
-
-        # In ruby 1.9 we don't support String#each
-        if @body.is_a?(String)
-          yield @body
-        else
-          @body.each(&block)
-        end
-
-        yield @additional_text
-        self
-      end
-
-    end
-
-  end
-end