rack-bug 0.2.1 → 0.3.0

data/lib/rack/bug/panels/templates_panel/trace.rb

@@ -1,34 +1,34 @@
 module Rack
   module Bug
     class TemplatesPanel
-      
+
       class Trace
-        
+
         def start(template_name)
           rendering = Rendering.new(template_name)
           rendering.start_time = Time.now
           @current.add(rendering)
           @current = rendering
         end
-        
+
         def finished(template_name)
           @current.end_time = Time.now
           @current = @current.parent
         end
-        
+
         def initialize
           @current = root
         end
-        
+
         def total_time
           root.child_time
         end
-        
+
         def root
           @root ||= Rendering.new("root")
         end
       end
-      
+
     end
   end
-end
+end

data/lib/rack/bug/panels/timer_panel.rb

@@ -2,39 +2,39 @@ require "benchmark"
 
 module Rack
   module Bug
-    
+
     class TimerPanel < Panel
-      
+
       def name
         "timer"
       end
-      
+
       def call(env)
         status, headers, body = nil
         @times = Benchmark.measure do
           status, headers, body = @app.call(env)
         end
-        
+
         @measurements = [
           ["User CPU time",   "%.2fms" % (@times.utime * 1_000)],
           ["System CPU time", "%.2fms" % (@times.stime * 1_000)],
           ["Total CPU time",  "%.2fms" % (@times.total * 1_000)],
           ["Elapsed time",    "%.2fms" % (@times.real  * 1_000)]
         ]
-        
+
         env["rack-bug.panels"] << self
         return [status, headers, body]
       end
-      
+
       def heading
         "%.2fms" % (@times.real * 1_000)
       end
-      
+
       def content
         render_template "panels/timer", :measurements => @measurements
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/rack/bug/params_signature.rb

@@ -2,64 +2,64 @@ require "digest"
 
 module Rack
   module Bug
-    
+
     class ParamsSignature
       extend ERB::Util
-      
+
       def self.sign(request, hash)
         parts = []
-        
+
         hash.keys.sort.each do |key|
           parts << "#{key}=#{u(hash[key])}"
         end
-        
+
         signature = new(request).signature(hash)
         parts << "hash=#{u(signature)}"
-        
+
         parts.join("&amp;")
       end
-      
+
       attr_reader :request
-      
+
       def initialize(request)
         @request = request
       end
-      
+
       def secret_key
         @request.env['rack-bug.secret_key']
       end
-      
+
       def secret_key_blank?
         secret_key.nil? || secret_key == ""
       end
-      
+
       def validate!
         if secret_key_blank?
           raise SecurityError.new("Missing secret key")
         end
-        
+
         if secret_key_blank? || request.params["hash"] != signature(request.params)
           raise SecurityError.new("Invalid query hash.")
         end
       end
-      
+
       def signature(params)
         Digest::SHA1.hexdigest(signature_base(params))
       end
-      
+
       def signature_base(params)
         signature = []
         signature << secret_key
-        
+
         params.keys.sort.each do |key|
           next if key == "hash"
           signature << params[key].to_s
         end
-        
+
         signature.join(":")
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/rack/bug/public/__rack_bug__/bookmarklet.js

@@ -203,12 +203,14 @@ document.rackBugBookmarklet = function() {
   if (document.readCookie('rack_bug_password')) {
     document.eraseCookie('rack_bug_password');
     document.eraseCookie('rack_bug_enabled');
-    alert('Rack::Bug Disabled');
+    window.location.reload();
   } else {
-    var password = prompt("Rack::Bug password:", "")
-    document.createCookie('rack_bug_password', document.SHA1('rack_bug:'+password));
-    document.createCookie('rack_bug_enabled', "1");
-    alert('Rack::Bug Enabled');
+    var password = prompt("Rack::Bug password:", "");
+    if (password != null) {
+      document.createCookie('rack_bug_password', document.SHA1('rack_bug:'+password));
+      document.createCookie('rack_bug_enabled', "1");
+      window.location.reload();
+    }
   }
 }
 

data/lib/rack/bug/render.rb

@@ -2,50 +2,50 @@ require "erb"
 
 module Rack
   module Bug
-    
+
     module Render
       include ERB::Util
-      
+
       def signed_params(hash)
         ParamsSignature.sign(request, hash)
       end
-      
+
       module CompiledTemplates
       end
       include CompiledTemplates
-      
+
       def render_template(filename, local_assigns = {})
         compile(filename, local_assigns)
         render_symbol = method_name(filename, local_assigns)
         send(render_symbol, local_assigns)
       end
-      
+
       def compile(filename, local_assigns)
         render_symbol = method_name(filename, local_assigns)
-        
+
         if !CompiledTemplates.instance_methods.include?(render_symbol.to_s)
           compile!(filename, local_assigns)
         end
       end
-      
+
       def compile!(filename, local_assigns)
-        render_symbol = method_name(filename, local_assigns) 
+        render_symbol = method_name(filename, local_assigns)
         locals_code = local_assigns.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
-        
+
         source = <<-end_src
           def #{render_symbol}(local_assigns)
             #{locals_code}
             #{compiled_source(filename)}
           end
         end_src
-        
+
         CompiledTemplates.module_eval(source, filename, 0)
       end
-      
+
       def compiled_source(filename)
         ::ERB.new(::File.read(::File.dirname(__FILE__) + "/../bug/views/#{filename}.html.erb"), nil, "-").src
       end
-      
+
       def method_name(filename, local_assigns)
         if local_assigns && local_assigns.any?
           method_name = method_name_without_locals(filename).dup
@@ -55,12 +55,12 @@ module Rack
         end
         method_name.to_sym
       end
-      
+
       def method_name_without_locals(filename)
         filename.split("/").join("_")
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/rack/bug/toolbar.rb

@@ -8,7 +8,7 @@ module Rack
         @app = app
         @static_app = static_app
       end
-      
+
       def call(env)
         if env["PATH_INFO"]
           @static_app.call(env)
@@ -17,27 +17,27 @@ module Rack
         end
       end
     end
-    
+
     class Toolbar
       include Options
       include Render
-      
+
       MIME_TYPES = ["text/html", "application/xhtml+xml"]
-      
+
       def initialize(app, options = {})
         @app = asset_server(app)
         initialize_options options
         instance_eval(&block) if block_given?
       end
-      
+
       def asset_server(app)
         RackStaticBugAvoider.new(app, Rack::Static.new(app, :urls => ["/__rack_bug__"], :root => public_path))
       end
-      
+
       def public_path
         ::File.expand_path(::File.dirname(__FILE__) + "/../bug/public")
       end
-      
+
       def call(env)
         env.replace @default_options.merge(env)
         @env = env
@@ -49,29 +49,30 @@ module Rack
           pass
         end
       end
-      
+
       def pass
         @app.call(@env)
       end
-      
+
       def dispatch
         @env["rack-bug.panels"] = []
-        
+
         Rack::Bug.enable
         status, headers, body = builder.call(@env)
         Rack::Bug.disable
-        
+
         @response = Rack::Response.new(body, status, headers)
-        
+
         if @response.redirect? && options["rack-bug.intercept_redirects"]
           intercept_redirect
-        elsif modify?
+        end
+        if modify?
           inject_toolbar
         end
-        
+
         return @response.to_a
       end
-      
+
       def intercept_redirect
         redirect_to = @response.location
         new_body = render_template("redirect", :redirect_to => @response.location)
@@ -79,59 +80,64 @@ module Rack
         new_response["Content-Length"] = new_body.size.to_s
         @response = new_response
       end
-      
+
       def toolbar_requested?
         @original_request.cookies["rack_bug_enabled"]
       end
-      
+
       def ip_authorized?
         return true unless options["rack-bug.ip_masks"]
-        
+
         options["rack-bug.ip_masks"].any? do |ip_mask|
           ip_mask.include?(IPAddr.new(@original_request.ip))
         end
       end
-      
+
       def password_authorized?
         return true unless options["rack-bug.password"]
-        
+
         expected_sha = Digest::SHA1.hexdigest ["rack_bug", options["rack-bug.password"]].join(":")
         actual_sha = @original_request.cookies["rack_bug_password"]
-        
+
         actual_sha == expected_sha
       end
-      
+
       def modify?
         @response.ok? &&
-        @env["X-Requested-With"] != "XMLHttpRequest" &&
+        @env["HTTP_X_REQUESTED_WITH"] != "XMLHttpRequest" &&
         MIME_TYPES.include?(@response.content_type.split(";").first)
       end
-      
+
       def builder
         builder = Rack::Builder.new
-        
+
         options["rack-bug.panel_classes"].each do |panel_class|
           builder.use panel_class
         end
-        
+
         builder.run @app
-        
+
         return builder
       end
-      
+
       def inject_toolbar
         full_body = @response.body.join
         full_body.sub! /<\/body>/, render + "</body>"
-        
+
         @response["Content-Length"] = full_body.size.to_s
+
+        # Ensure that browser does
+        @response["Etag"] = ""
+        @response["Cache-Control"] = "no-cache"
+
         @response.body = [full_body]
       end
-      
+
       def render
         render_template("toolbar", :panels => @env["rack-bug.panels"].reverse)
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/rack/bug/views/panels/log.html.erb

@@ -5,17 +5,15 @@
       <th>Level</th>
       <th>Time</th>
       <th>Message</th>
-      <th>Location</th>
     </tr>
   </thead>
   <tbody>
     <% i = 1 %>
-    <% logs.each do |log| %>
+    <% logs.each do |entry| %>
       <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
-        <td></td>
-        <td></td>
-        <td><%= log.to_s.gsub(/\e\[[;\d]+m/, "") %></td>
-        <td></td>
+        <td><%= entry.level %></td>
+        <td><%= entry.time %>ms</td>
+        <td><%= entry.cleaned_message %></td>
       </tr>
       <% i += 1 %>
     <% end %>