rack-webprofiler 0.1.0.pre.alpha1 → 0.1.0.pre.beta1

data/lib/rack/web_profiler/collector/sinatra/request_collector.rb

@@ -1,21 +1,29 @@
 module Rack
-  class WebProfiler::Collector::Sinatra::RequestCollector
+  class WebProfiler::Collector::Sinatra::RequestCollector < WebProfiler::Collector::Rack::RequestCollector
     include Rack::WebProfiler::Collector::DSL
 
-    icon nil
+    icon <<-'ICON'
+data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iMjBweCIgaGVpZ2h0PSIyMHB4IiB2aWV3Qm94PSIwIDAgMjAgMjAiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+T3ZhbCA3IENvcHkgMjwvdGl0bGU+ICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPiAgICA8ZGVmcz48L2RlZnM+ICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPiAgICAgICAgPGcgaWQ9IkRlc2t0b3AtMiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEwLjAwMDAwMCwgLTEzMC4wMDAwMDApIiBmaWxsPSIjNTg1NDczIj4gICAgICAgICAgICA8ZyBpZD0iUmVxdWVzdCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4wMDAwMDAsIDEyMC4wMDAwMDApIj4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTE3LjY3OTE5MTIsMTMuNDA2NDMyMiBDMTguMTAzNzAxMiwxMy4yNTUzNzMzIDE4LjU0NzA4OSwxMy4xNDQ1ODY0IDE5LjAwNDgzMTcsMTMuMDc4NjI3OCBMMTkuMDA0ODMxNywxMCBMMjAuOTk1MTY4MywxMCBMMjAuOTk1MTY4MywxMy4wNzg2Mjc4IEMyMS40NTI5MTEsMTMuMTQ0NTg2NCAyMS44OTYyOTg4LDEzLjI1NTM3MzMgMjIuMzIwODA4OCwxMy40MDY0MzIyIEwyMy43NjY1Mzg2LDEwLjY4NzQxIEwyNS41MjM5MDE1LDExLjYyMTgxNjUgTDI0LjA4MDM0MDcsMTQuMzM2NzU5NiBDMjQuNDU0NDUyLDE0LjYwOTU2NTUgMjQuODAwNTkwMywxNC45MTg5MDYzIDI1LjExMzU5ODIsMTUuMjU5NTg2NCBMMjcuNjI0NzkyLDEzLjUwMTIyOTYgTDI4Ljc2NjQwMjIsMTUuMTMxNjE3OSBMMjYuMjM5NDcyLDE2LjkwMDk5MzUgQzI2LjQ0Mjk1ODQsMTcuMzEyNjE1IDI2LjYwNzQ4OTQsMTcuNzQ3MjEzIDI2LjcyODIwMjgsMTguMTk5ODg5MyBMMjkuNzc1NjgxNCwxNy44MjU3MDU5IEwzMC4wMTgyNDI0LDE5LjgwMTIwNjkgTDI2Ljk2NDU5ODcsMjAuMTc2MTQ3MiBDMjYuOTU0Njg2MiwyMC42NDkzNjI3IDI2Ljg5ODI3NTUsMjEuMTExMDU1NiAyNi43OTk3ODQxLDIxLjU1Njc3NTkgTDI5LjY3NTIwODQsMjIuNjYwNTQ3OSBMMjguOTYxOTM1NiwyNC41MTg2ODcyIEwyNi4wOTg1NTE3LDIzLjQxOTUzNzEgQzI1Ljg3MzU5ODcsMjMuODI4ODI2IDI1LjYwOTIyNDgsMjQuMjEzMDczNSAyNS4zMTA1OTI0LDI0LjU2NzA3OTEgTDI3LjM2NTk4NjQsMjYuODQ5ODI1NCBMMjUuODg2ODc4LDI4LjE4MTYyMDYgTDIzLjgyNDc3MTQsMjUuODkxNDE5MSBDMjMuNDQ1Mzk3NywyNi4xNDI5NDcyIDIzLjA0MDE3MDgsMjYuMzU4MTMyMyAyMi42MTM5NzI3LDI2LjUzMjA1NjQgTDIzLjM1ODEzMTgsMjkuNTE2NzE1NCBMMjEuNDI2OTE2NiwyOS45OTgyMjE0IEwyMC42ODE3ODQ0LDI3LjAwOTY1OTQgQzIwLjQ1NzQ2NzgsMjcuMDMxNjA5MyAyMC4yMzAwMzYsMjcuMDQyODQxNiAyMCwyNy4wNDI4NDE2IEMxOS43Njk5NjQsMjcuMDQyODQxNiAxOS41NDI1MzIyLDI3LjAzMTYwOTMgMTkuMzE4MjE1NiwyNy4wMDk2NTk0IEwxOC41NzMwODM0LDI5Ljk5ODIyMTQgTDE2LjY0MTg2ODIsMjkuNTE2NzE1NCBMMTcuMzg2MDI3MywyNi41MzIwNTY0IEMxNi45NTk4MjkyLDI2LjM1ODEzMjMgMTYuNTU0NjAyMywyNi4xNDI5NDcyIDE2LjE3NTIyODYsMjUuODkxNDE5MSBMMTQuMTEzMTIyLDI4LjE4MTYyMDYgTDEyLjYzNDAxMzYsMjYuODQ5ODI1NCBMMTQuNjg5NDA3NiwyNC41NjcwNzkxIEMxNC4zOTA3NzUyLDI0LjIxMzA3MzUgMTQuMTI2NDAxMywyMy44Mjg4MjYgMTMuOTAxNDQ4MywyMy40MTk1MzcxIEwxMS4wMzgwNjQ0LDI0LjUxODY4NzIgTDEwLjMyNDc5MTYsMjIuNjYwNTQ3OSBMMTMuMjAwMjE1OSwyMS41NTY3NzU5IEMxMy4xMDE3MjQ1LDIxLjExMTA1NTYgMTMuMDQ1MzEzOCwyMC42NDkzNjI4IDEzLjAzNTQwMTMsMjAuMTc2MTQ3MyBMOS45ODE3NTc1OSwxOS44MDEyMDY5IEwxMC4yMjQzMTg2LDE3LjgyNTcwNTkgTDEzLjI3MTc5NzIsMTguMTk5ODg5MyBDMTMuMzkyNTEwNiwxNy43NDcyMTMgMTMuNTU3MDQxNiwxNy4zMTI2MTUgMTMuNzYwNTI4LDE2LjkwMDk5MzUgTDExLjIzMzU5NzgsMTUuMTMxNjE3OSBMMTIuMzc1MjA4LDEzLjUwMTIyOTYgTDE0Ljg4NjQwMTgsMTUuMjU5NTg2NCBDMTUuMTk5NDA5NywxNC45MTg5MDYzIDE1LjU0NTU0OCwxNC42MDk1NjU1IDE1LjkxOTY1OTMsMTQuMzM2NzU5NiBMMTQuNDc2MDk4NSwxMS42MjE4MTY1IEwxNi4yMzM0NjE0LDEwLjY4NzQxIEwxNy42NzkxOTEyLDEzLjQwNjQzMjIgWiBNMjAsMjMuMDMyNzYxMiBDMjEuNjQ4ODQ4OSwyMy4wMzI3NjEyIDIyLjk4NTUwNSwyMS42ODYyMzA2IDIyLjk4NTUwNSwyMC4wMjUyMDA5IEMyMi45ODU1MDUsMTguMzY0MTcxMyAyMS42NDg4NDg5LDE3LjAxNzY0MDYgMjAsMTcuMDE3NjQwNiBDMTguMzUxMTUxMSwxNy4wMTc2NDA2IDE3LjAxNDQ5NSwxOC4zNjQxNzEzIDE3LjAxNDQ5NSwyMC4wMjUyMDA5IEMxNy4wMTQ0OTUsMjEuNjg2MjMwNiAxOC4zNTExNTExLDIzLjAzMjc2MTIgMjAsMjMuMDMyNzYxMiBaIiBpZD0iT3ZhbC03LUNvcHktMiI+PC9wYXRoPiAgICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==
+ICON
 
     collector_name "sinatra_request"
     position       2
 
     collect do |request, response|
+      store :request_headers, get_request_headers(request)
       store :request_path,    request.path
       store :request_method,  request.request_method
       store :request_cookies, request.cookies
       store :request_get,     request.GET
       store :request_post,    request.POST
-      # store :rack_env,        request.env.each { |k, v| v.to_s }
-      # puts request.env.map{ |k, v| k => v.to_s }
-      store :response_status, response.status
+      store :request_session, request.session
+      store :request_cookies, request.cookies
+      store :request_body,    request.body.gets
+
+      # store :rack_env, get_env(request) #request.env.each { |k, v| v.to_s }
+
+      store :response_status,  response.status
+      store :response_headers, response.headers
 
       if response.successful?
         status :success
@@ -29,10 +37,180 @@ module Rack
     template __FILE__, type: :DATA
 
     is_enabled? -> { defined? Sinatra }
+
+    class << self
+      # Get request headers.
+      #
+      # @return [Hash]
+      def get_request_headers(request)
+        request.env.select {|k,v| k.start_with? 'HTTP_'}
+          .collect {|k,v| [k.sub(/^HTTP_/, ''), v]}
+          .collect {|k,v| [k.split('_').collect(&:capitalize).join('-'), v]}
+      end
+    end
   end
 end
 
 __END__
-<%# content_for :tab do %>
-  <%= data[:response_status] %> | <%= data[:request_method] %> <%= data[:request_path] %>
-<%# end %>
+<% content_for :tab do %>
+  <%= data[:response_status] %>
+  <div style="display: none">
+    <%= data[:request_method] %> <%= data[:request_path] %>
+    <%= data[:response_status] %> | <%= Rack::Utils::HTTP_STATUS_CODES[data[:response_status].to_i] %>
+  </div>
+<% end %>
+
+<% content_for :panel do %>
+  <div class="block">
+    <h3>GET</h3>
+    <% unless data[:request_get].empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Key</th>
+          <th>Value</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data[:request_get].each do |k, v| %>
+        <tr>
+          <th><%= k %></th>
+          <td class="code"><%= v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No GET parameters</span></p>
+    <% end %>
+  </div>
+
+  <div class="block">
+    <h3>POST</h3>
+    <% unless data[:request_post].empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Key</th>
+          <th>Value</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data[:request_post].each do |k, v| %>
+        <tr>
+          <th><%= k %></th>
+          <td class="code"><%= v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No POST parameters</span></p>
+    <% end %>
+  </div>
+
+  <div class="block">
+    <h3>Request headers</h3>
+    <% unless data[:request_headers].empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Version</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data[:request_headers].sort.each do |k, v| %>
+        <tr>
+          <th><%= k %></th>
+          <td class="code"><%= v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No request headers</span></p>
+    <% end %>
+  </div>
+
+  <div class="block">
+    <h3>Request content</h3>
+    <% unless data[:request_body].nil? %>
+    <code><%= data[:request_body] %></code>
+    <% else %>
+    <p><span class="text__no-value">No request content</span></p>
+    <% end %>
+  </div>
+
+  <div class="block">
+    <h3>Response headers</h3>
+    <% unless data[:response_headers].empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Version</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data[:response_headers].sort.each do |k, v| %>
+        <tr>
+          <th><%= k %></th>
+          <td class="code"><%= v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No response headers</span></p>
+    <% end %>
+  </div>
+
+  <div class="block">
+    <h3>Session</h3>
+    <% unless data[:request_session].empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Version</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data[:request_session].each do |k, v| %>
+        <tr>
+          <th><%= k %></th>
+          <td class="code"><%= v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No session data</span></p>
+    <% end %>
+  </div>
+
+  <div class="block">
+    <h3>Cookies</h3>
+    <% unless data[:request_cookies].empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Version</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data[:request_cookies].each do |k, v| %>
+        <tr>
+          <th><%= k %></th>
+          <td class="code"><%= v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No cookies data</span></p>
+    <% end %>
+  </div>
+<% end %>

data/lib/rack/web_profiler/collector/sinatra/sinatra_collector.rb

@@ -20,6 +20,6 @@ module Rack
 end
 
 __END__
-<%# content_for :tab do %>
+<% content_for :tab do %>
   <%= data[:sinatra_version] %> | <%= data[:sinatra_env] %>
-<%# end %>
+<% end %>

data/lib/rack/web_profiler/collector/time_collector.rb

@@ -2,7 +2,9 @@ module Rack
   class WebProfiler::Collector::TimeCollector
     include Rack::WebProfiler::Collector::DSL
 
-    icon nil
+    icon <<-'ICON'
+data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iMjBweCIgaGVpZ2h0PSIyMHB4IiB2aWV3Qm94PSIwIDAgMjAgMjAiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+R3JvdXAgMjwvdGl0bGU+ICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPiAgICA8ZGVmcz48L2RlZnM+ICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPiAgICAgICAgPGcgaWQ9IkRlc2t0b3AtMiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEwLjAwMDAwMCwgLTE3MC4wMDAwMDApIiBmaWxsPSIjNTg1NDczIj4gICAgICAgICAgICA8ZyBpZD0iUGVyZm9ybWFuY2UiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAuMDAwMDAwLCAxNjAuMDAwMDAwKSI+ICAgICAgICAgICAgICAgIDxnIGlkPSJHcm91cC0yIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMC4wMDAwMDAsIDEwLjAwMDAwMCkiPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTEwLDE4IEwxMCwxOCBDMTQuNDE4Mjc4LDE4IDE4LDE0LjQxODI3OCAxOCwxMCBDMTgsNS41ODE3MjIgMTQuNDE4Mjc4LDIgMTAsMiBDNS41ODE3MjIsMiAyLDUuNTgxNzIyIDIsMTAgQzIsMTQuNDE4Mjc4IDUuNTgxNzIyLDE4IDEwLDE4IEwxMCwxOCBMMTAsMTggWiBNMCwxMCBDMCw0LjQ3NzE1MjUgNC40NzcxNTI1LDAgMTAsMCBDMTUuNTIyODQ3NSwwIDIwLDQuNDc3MTUyNSAyMCwxMCBDMjAsMTUuNTIyODQ3NSAxNS41MjI4NDc1LDIwIDEwLDIwIEM0LjQ3NzE1MjUsMjAgMCwxNS41MjI4NDc1IDAsMTAgWiIgaWQ9IlNoYXBlIj48L3BhdGg+ICAgICAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTQzIiB4PSI5IiB5PSI0IiB3aWR0aD0iMiIgaGVpZ2h0PSI1Ij48L3JlY3Q+ICAgICAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTQzLUNvcHkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE0LjAwMDAwMCwgMTAuMDAwMDAwKSByb3RhdGUoLTI3MC4wMDAwMDApIHRyYW5zbGF0ZSgtMTQuMDAwMDAwLCAtMTAuMDAwMDAwKSAiIHg9IjEzIiB5PSI4IiB3aWR0aD0iMiIgaGVpZ2h0PSI0Ij48L3JlY3Q+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=
+ICON
 
     collector_name "time"
     position       3
@@ -18,6 +20,6 @@ module Rack
 end
 
 __END__
-<%# content_for :tab do %>
+<% content_for :tab do %>
   <%= (data[:runtime] * 1000.0).round(2) %> ms
-<%# end %>
+<% end %>

data/lib/rack/web_profiler/collector.rb

@@ -13,10 +13,10 @@ module Rack
     end
 
     module Rails
-      autoload :ActiveRecordCollector,  "rack/web_profiler/collector/rails/active_record_collector"
-      autoload :LoggerCollector,        "rack/web_profiler/collector/rails/logger_collector"
-      autoload :RailsCollector,         "rack/web_profiler/collector/rails/rails_collector"
-      autoload :RequestCollector,       "rack/web_profiler/collector/rails/request_collector"
+      autoload :ActiveRecordCollector, "rack/web_profiler/collector/rails/active_record_collector"
+      autoload :LoggerCollector,       "rack/web_profiler/collector/rails/logger_collector"
+      autoload :RailsCollector,        "rack/web_profiler/collector/rails/rails_collector"
+      autoload :RequestCollector,      "rack/web_profiler/collector/rails/request_collector"
     end
 
     module Sinatra
@@ -124,6 +124,7 @@ module Rack
       # @return [Symbol, nil]
       def status(v = nil)
         # @todo check status?
+        # raise Exception, "" unless [:success, :warning, :error].include?(v)
         @status = v.to_sym unless v.nil?
         @status
       end

data/lib/rack/web_profiler/collectors.rb

@@ -30,11 +30,15 @@ module Rack
 
     # Add a collector.
     #
-    # @param collector_class [Class]
+    # @param collector_class [Array, Class]
     #
     # @raise [ArgumentError] if `collector_class' is not a Class or is not an instance of Rack::WebProfiler::Collector::DSL
     #   or a collector with this name is already registrered.
     def add_collector(collector_class)
+      if collector_class.is_a? Array
+        return collector_class.each { |c| add_collector(c) }
+      end
+
       unless collector_class.is_a? Class
         raise ArgumentError, "`collector_class' must be a class"
       end
@@ -58,10 +62,14 @@ module Rack
 
     # Remove a collector.
     #
-    # @param collector_class [Class]
+    # @param collector_class [Array, Class]
     #
     # @raise [ArgumentError] if `collector_class' is not a Class or if this collector is not registered.
     def remove_collector(collector_class)
+      if collector_class.is_a? Array
+        return collector_class.each { |c| remove_collector(c) }
+      end
+
       unless collector_class.is_a? Class
         raise ArgumentError, "`collector_class' must be a class"
       end

data/lib/rack/web_profiler/controller.rb

@@ -28,9 +28,20 @@ module Rack
       return error404 if @collection.nil?
 
       @collectors = Rack::WebProfiler.config.collectors.all
+      @collector  = nil
+
+      unless @request.params['panel'].nil?
+        @collector = @collectors[@request.params['panel'].to_sym]
+      end
+
+      if @collector.nil?
+        @collector = @collectors.values.first
+      end
+
+      @current_panel = @collector.name
 
       # @todo return json if request.content_type ask json (same for xml?)
-      # @example json {} if @request.media_type.include? "json"
+      # @example json(@collectors) if @request.media_type.include? "json"
 
       erb "panel/show.erb", layout: "panel/layout.erb"
     end
@@ -108,10 +119,20 @@ module Rack
       ERB.new(read_template(path)).result(binding)
     end
 
-    def render_collector(path, data)
+    def render_collector(collector, data)
       @data = data
-      return "" if path.nil?
-      ERB.new(read_template(path)).result(binding)
+      return "" if collector.nil?
+      ERB.new(read_template(collector.template)).result(binding)
+    end
+
+    def content_for(name)
+      name = name.to_sym
+
+      if block_given?
+        @contents_for[name] = Proc.new
+      elsif @contents_for[name].respond_to?(:call)
+        @contents_for[name].call
+      end
     end
 
     def read_template(template)

data/lib/rack/web_profiler/router.rb

@@ -17,7 +17,7 @@ module Rack
         path     = Rack::Utils.unescape(request.path_info)
 
         # Stop process if the request path does not start
-        # by the BASE_PATH
+        # by the BASE_PATH.
         return false unless path.start_with?(BASE_PATH)
 
         path.slice!(BASE_PATH)
@@ -25,11 +25,17 @@ module Rack
         route(request, path)
       end
 
-      # Route!
+      # Route the request.
+      #
+      # @param request [Rack::WebProfiler::Request]
+      #
+      # @return [Rack::Reponse, false]
       def route(request, path)
         controller = WebProfiler::Controller.new(request)
 
-        if request.get? && path =~ %r{^\/toolbar\/([a-z0-9]*)(\/)?$}
+        if request.get? && path =~ %r{^\/assets\/(.*)(\/)?$}
+          serve_asset(Regexp.last_match(1))
+        elsif request.get? && path =~ %r{^\/toolbar\/([a-z0-9]*)(\/)?$}
           controller.show_toolbar(Regexp.last_match(1))
         elsif request.get? && path =~ %r{^\/clean(\/)?$}
           controller.delete
@@ -42,6 +48,32 @@ module Rack
         end
       end
 
+      # Serve assets.
+      #
+      # @param path [String]
+      #
+      # @return [Rack::Response]
+      def serve_asset(path)
+        rf = Rack::File.new(::File.expand_path("../../templates/assets/", __FILE__))
+        request = @request.dup
+        request.env[PATH_INFO] = path
+
+        path_info = Utils.unescape(request.env[PATH_INFO])
+        clean_path_info = Utils.clean_path_info(path_info)
+
+        status, headers, body = rf.call(request.env)
+        Rack::Response.new(body, status, headers)
+      end
+
+      # Get url for asset.
+      #
+      # @param path [String]
+      #
+      # @return [String]
+      def url_for_asset(path)
+        "#{@request.script_name}#{BASE_PATH}/assets/#{path}"
+      end
+
       # Get url for toobar.
       #
       # @param token [String]
@@ -54,10 +86,13 @@ module Rack
       # Get url for the webprofiler.
       #
       # @param token [String, nil]
+      # @param panel [String, nil]
       #
       # @return [String]
-      def url_for_profiler(token = nil)
-        "#{@request.script_name}#{BASE_PATH}/#{token}"
+      def url_for_profiler(token = nil, panel = nil)
+        query = ""
+        query = "?panel=#{panel}" unless panel.nil?
+        "#{@request.script_name}#{BASE_PATH}/#{token}#{query}"
       end
 
       # Get url to clean webprofiler.

data/lib/rack/web_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class WebProfiler
-    VERSION = "0.1.0-alpha1".freeze
+    VERSION = "0.1.0-beta1".freeze
   end
 end

data/rack-webprofiler.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Nicolas Brousse"]
   spec.email         = ["pro@nicolas-brousse.fr"]
 
-  spec.summary       = %q{A Rack profiler for web application.}
+  spec.summary       = %q{A Rack profiler for web applications.}
   # spec.description   = %q{}
   spec.homepage      = "http://github.com/nicolas-brousse/rack-webprofiler"
   spec.license       = "MIT"
@@ -22,7 +22,12 @@ Gem::Specification.new do |spec|
     # raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(bin|test|spec|features|examples)/}) \
+    || f.match(%r{^(Guardfile|Gemfile|Rakefile)$}) \
+    || f.match(%r{^(\..*)$})
+  end
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: rack-webprofiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha1
+  version: 0.1.0.pre.beta1
 platform: ruby
 authors:
 - Nicolas Brousse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -115,29 +115,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/ci-prepare
-- bin/console
-- bin/setup
-- examples/README.md
-- examples/rack/config.ru
-- examples/sinatra/app.rb
-- examples/sinatra/config.ru
 - lib/rack/templates/404.erb
-- lib/rack/templates/assets/rwpt.css
-- lib/rack/templates/assets/rwpt.js
+- lib/rack/templates/assets/css/profiler.css
+- lib/rack/templates/assets/css/rwpt.css
+- lib/rack/templates/assets/js/rwpt.js
+- lib/rack/templates/assets/js/rwpt.min.js
+- lib/rack/templates/assets/sass/_fonts.scss
+- lib/rack/templates/assets/sass/_normalize.scss
+- lib/rack/templates/assets/sass/_variables.scss
+- lib/rack/templates/assets/sass/profiler.scss
+- lib/rack/templates/assets/sass/rwpt.scss
 - lib/rack/templates/async.erb
+- lib/rack/templates/panel/_sidebar.erb
 - lib/rack/templates/panel/index.erb
 - lib/rack/templates/panel/layout.erb
 - lib/rack/templates/panel/show.erb
@@ -180,19 +173,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: A Rack profiler for web application.
+summary: A Rack profiler for web applications.
 test_files: []
-has_rdoc: 

data/.editorconfig

@@ -1,27 +0,0 @@
-; top-most EditorConfig file
-root = true
-
-; Unix-style newlines
-[*]
-end_of_line = LF
-indent_style = space
-indent_size = 2
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.rb]
-indent_style = space
-indent_size = 2
-
-[{*.css,*.scss}]
-indent_style = space
-ident_size = 4
-
-[*.js]
-indent_style = space
-ident_size = 2
-
-[*.yml]
-indent_style = space
-indent_size = 2