rack-webprofiler 0.1.0.pre.beta2 → 0.1.0

data/lib/rack/templates/assets/sass/rwpt.scss

@@ -217,7 +217,8 @@ body {
       -webkit-user-select: none;
               user-select: none;
 
-      &:hover {
+      &:hover,
+      &.active {
         background-color: $profiler_panel__sidebar_item_hover;
       }
       &.sidebar__item--blank {
@@ -263,7 +264,6 @@ body {
     width: 100%;
     min-height: calc(100% - 80px);
     padding: 20px;
-    margin-bottom: 50px;
   }
   .wrapper__container {
     box-sizing: border-box;

data/lib/rack/templates/panel/show.erb

@@ -7,13 +7,13 @@
 <% content_for :sidebar do %>
   <% @collectors.each do |_k, collector| %>
     <% if collector_has_panel?(collector, @collection) %>
-    <div class="sidebar__item">
+    <div class="sidebar__item<%= collector == @collector ? " active" : nil %>">
       <div class="sidebar__item-inner">
-        <a href="<%=h WebProfiler::Router.url_for_profiler(@collection.token, collector.name) %>">
+        <a href="<%=h WebProfiler::Router.url_for_profiler(@collection.token, collector.identifier) %>">
           <i class="icn">
             <% unless collector.icon.nil? %><img alt="" src="<%=h collector.icon %>" /><% end %>
           </i>
-          <span><%=h collector.name.capitalize.gsub(/_/, ' ') %></span>
+          <span><%=h collector.label %></span>
         </a>
       </div>
     </div>
@@ -21,6 +21,6 @@
   <% end %>
 <% end %>
 
-<div class="rack-webprofiler_collectors_<%=h @collector.name.to_s %>">
+<div class="rack-webprofiler_collectors_<%=h @collector.identifier.to_s %>">
   <%= collector_panel(@collector, @collection) %>
 </div>

data/lib/rack/templates/profiler.erb

@@ -9,6 +9,8 @@
     <div class="rack-webprofiler__item rack-webprofiler_collectors_<%=h name.to_s %>">
     <% if collector_has_panel?(collector, @collection) %>
       <a href="<%=h WebProfiler::Router.url_for_profiler(@collection.token, name) %>">
+    <% else %>
+      <span class="rack-webprofiler__item-content">
     <% end %>
       <% unless collector.icon.nil? %>
         <i class="icn"><img alt="" src="<%=h collector.icon %>" /></i>
@@ -19,6 +21,8 @@
         <span class="rack-webprofiler__item__status-color <%=h status.to_s %>"></span>
     <% if collector_has_panel?(collector, @collection) %>
       </a>
+    <% else %>
+      </span>
     <% end %>
     </div>
   <% end %>

data/lib/rack/web_profiler/collector.rb

@@ -1,155 +1,227 @@
 require "docile"
 
 module Rack
+  class WebProfiler
+    # Collector
+    class Collector
+      # DSL
+      module DSL
+        def self.included(base)
+          base.extend(ClassMethods)
+          base.class_eval do
+            @definition            = Definition.new
+            @definition.position   = 1
+            @definition.is_enabled = true
+            @definition.klass      = self
+          end
+        end
 
-  # Collector
-  class WebProfiler::Collector
-    autoload :RubyCollector, "rack/web_profiler/collector/ruby_collector"
-    autoload :TimeCollector, "rack/web_profiler/collector/time_collector"
-    autoload :View, "rack/web_profiler/collector/view"
+        module ClassMethods
+          attr_reader :definition
+
+          # Set the icon of the {Rack::WebProfiler::Collector}.
+          #
+          # @param icon [String, nil]
+          def icon(icon = nil); definition.icon = icon; end
+
+          # Set the identifier of the {Rack::WebProfiler::Collector}.
+          #
+          # @param identifier [String, nil]
+          def identifier(identifier = nil); definition.identifier = identifier; end
+
+          # Set the label of the {Rack::WebProfiler::Collector}.
+          #
+          # @param label [String, nil]
+          def label(label = nil); definition.label = label; end
+
+          #
+          def position(position = nil); definition.position = position.to_i; end
+
+          #
+          def collect(&block); definition.collect = block; end
+
+          # Set the template of the {Rack::WebProfiler::Collector}.
+          #
+          # @param template [String, nil]
+          # @option type [Symbol] :file or :DATA
+          def template(template = nil, type: :file)
+            template = get_data_contents(template) if type == :DATA
+            definition.template = template
+          end
 
-    module Rack
-      autoload :RackCollector,    "rack/web_profiler/collector/rack/rack_collector"
-      autoload :RequestCollector, "rack/web_profiler/collector/rack/request_collector"
-    end
+          # Tell if the {Rack::WebProfiler::Collector} is enabled.
+          #
+          # @param is_enabled [Boolean, Block]
+          def is_enabled?(is_enabled = true)
+            definition.is_enabled = Proc.new if block_given?
+            definition.is_enabled = is_enabled
+          end
 
-    # DSL
-    module DSL
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.class_eval do
-          @definition            = Definition.new
-          @definition.position   = 1
-          @definition.is_enabled = true
-          @definition.klass      = self
+          private
+
+          def get_data_contents(path)
+            data = ""
+            ::File.open(path, "rb") do |f|
+              begin
+                line = f.gets
+              end until line.nil? || /^__END__$/ === line
+              data << line while line = f.gets
+            end
+            data
+          end
         end
       end
 
-      module ClassMethods
-        attr_reader :definition
+      # Definition
+      #
+      # Collector definition.
+      class Definition
+        attr_accessor :icon, :identifier, :label, :position, :collect, :template, :is_enabled, :klass
+        attr_reader   :data_storage
+
+        # Collect the data who the Collector need.
+        #
+        # @param request [Rack::WebProfiler::Request]
+        # @param response [Rack::Response]
+        #
+        # @return [Rack::WebProfiler::Collector::DSL::DataStorage]
+        def collect!(request, response)
+          @data_storage = Docile.dsl_eval(DataStorage.new, request, response, &collect)
+        end
 
-        def icon(icon = nil);           definition.icon     = icon;          end
-        def collector_name(name = nil); definition.name     = name;          end
-        def position(position = nil);   definition.position = position.to_i; end
-        def collect(&block);            definition.collect  = block;         end
+        # Is the collector enabled.
+        #
+        # @return [Boolean]
+        def is_enabled?
+          return !!@is_enabled.call if @is_enabled.is_a?(Proc)
+          !!@is_enabled
+        end
+      end
 
-        def template(template = nil, type: :file)
-          template = get_data_contents(template) if type == :DATA
-          definition.template = template
+      # DataStorage
+      #
+      # Used to store datas who Collector needs.
+      #
+      # @todo do DataStorage compatible with Marshal
+      class DataStorage
+        attr_reader :datas
+
+        def initialize
+          @datas      = Hash.new
+          @status     = nil
+          @show_tab   = true
+          @show_panel = true
         end
 
-        def is_enabled?(is_enabled = true)
-          definition.is_enabled = Proc.new if block_given?
-          definition.is_enabled = is_enabled
+        # Store a value.
+        #
+        # @param k [String, Symbol]
+        # @param v
+        def store(k, v)
+          # @todo check data format (must be compatible with Marshal)
+          @datas[k.to_sym] = v
         end
 
-        private
+        # Status.
+        #
+        # @param v [Symbol, nil]
+        #
+        # @return [Symbol, nil]
+        def status(v = nil)
+          # @todo check status?
+          # raise Exception, "" unless [:success, :warning, :danger].include?(v)
+          @status = v.to_sym unless v.nil?
+          @status
+        end
 
-        def get_data_contents(path)
-          data = ""
-          ::File.open(path, "rb") do |f|
-            begin
-              line = f.gets
-            end until line.nil? || /^__END__$/ === line
-            data << line while line = f.gets
-          end
-          data
+        #
+        #
+        # @param b [Boolean, nil]
+        #
+        # @return [Boolean]
+        def show_panel(b = nil)
+          @show_panel = !!b unless b.nil?
+          @show_panel
         end
-      end
-    end
 
-    # Definition
-    #
-    # Collector definition.
-    class Definition
-      attr_accessor :icon, :name, :position, :collect, :template, :is_enabled, :klass
-      attr_reader   :data_storage
+        #
+        #
+        # @param b [Boolean, nil]
+        #
+        # @return [Boolean]
+        def show_tab(b = nil)
+          @show_tab = !!b unless b.nil?
+          @show_tab
+        end
 
-      # Collect the data who the Collector need.
-      #
-      # @param request [Rack::WebProfiler::Request]
-      # @param response [Rack::Response]
-      #
-      # @return [Rack::WebProfiler::Collector::DSL::DataStorage]
-      def collect!(request, response)
-        @data_storage = Docile.dsl_eval(DataStorage.new, request, response, &collect)
+        # Transform DataStorage to an Hash
+        #
+        # @return [Hash<Symbol, Object>]
+        def to_h
+          {
+            datas:      @datas,
+            status:     @status,
+            show_panel: @show_panel,
+            show_tab:   @show_tab,
+          }
+        end
       end
 
-      # Is the collector enabled.
-      #
-      # @return [Boolean]
-      def is_enabled?
-        return !!@is_enabled.call if @is_enabled.is_a?(Proc)
-        !!@is_enabled
-      end
-    end
+      # View
+      class View < WebProfiler::View
+        #
+        def context
+          @context ||= Context.new
+        end
 
-    # DataStorage
-    #
-    # Used to store datas who Collector needs.
-    #
-    # @todo do DataStorage compatible with Marshal
-    class DataStorage
-      attr_reader :datas
-
-      def initialize
-        @datas      = Hash.new
-        @status     = nil
-        @show_tab   = true
-        @show_panel = true
-      end
+        # Read a template. Returns file content if template is a file path.
+        #
+        # @param template [String] template file path or content
+        #
+        # @return [String]
+        def read_template(template)
+          unless template.empty?
+            return ::File.read(template) if ::File.exist?(template)
+          end
+          template
+        end
 
-      # Store a value.
-      #
-      # @param k [String, Symbol]
-      # @param v
-      def store(k, v)
-        # @todo check data format (must be compatible with Marshal)
-        @datas[k.to_sym] = v
-      end
+        # Helpers
+        module Helpers
+          # @todo comment
+          def tab_content
+            if block_given?
+              @tab_content ||= capture(&Proc.new)
+            elsif !@tab_content.nil?
+              @tab_content
+            end
+          end
 
-      # Status.
-      #
-      # @param v [Symbol, nil]
-      #
-      # @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
+          # @todo comment
+          def panel_content
+            if block_given?
+              @panel_content ||= capture(&Proc.new)
+            elsif !@panel_content.nil?
+              @panel_content
+            end
+          end
 
-      #
-      #
-      # @param b [Boolean, nil]
-      #
-      # @return [Boolean]
-      def show_panel(b = nil)
-        @show_panel = !!b unless b.nil?
-        @show_panel
-      end
+          # @todo comment
+          def data(k, default = nil)
+            return nil if @collection.nil?
 
-      #
-      #
-      # @param b [Boolean, nil]
-      #
-      # @return [Boolean]
-      def show_tab(b = nil)
-        @show_tab = !!b unless b.nil?
-        @show_tab
-      end
+            datas = @collection.datas[@collector.identifier.to_sym][:datas]
+            return datas[k] if datas.has_key?(k)
 
-      # Transform DataStorage to an Hash
-      #
-      # @return [Hash<Symbol, Object>]
-      def to_h
-        {
-          datas:      @datas,
-          status:     @status,
-          show_panel: @show_panel,
-          show_tab:   @show_tab,
-        }
+            default
+          end
+        end
+
+        # @todo comment
+        class Context
+          include WebProfiler::View::Helpers::Common
+          include Helpers
+        end
       end
     end
   end

data/lib/rack/web_profiler/collectors/rack_collector.rb

@@ -0,0 +1,74 @@
+module Rack
+  class WebProfiler::Collectors::RackCollector
+    include Rack::WebProfiler::Collector::DSL
+
+    icon <<-'ICON'
+data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iMjJweCIgaGVpZ2h0PSIyMnB4IiB2aWV3Qm94PSIwIDAgMjIgMjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+R3JvdXA8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJEZXYtYmFyLSstRHJvcCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTkuMDAwMDAwLCAtMTc2LjAwMDAwMCkiIHN0cm9rZT0iIzQ1NDI1QSI+ICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMC4wMDAwMDAsIDE3Ny4wMDAwMDApIj4gICAgICAgICAgICAgICAgPHBvbHlnb24gaWQ9IlJlY3RhbmdsZS0yNzgiIHBvaW50cz0iMCA0IDYgMCAyMCA1IDIwIDE2IDE0IDIwIDAgMTUiPjwvcG9seWdvbj4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTE1Ljg2Njg2Miw4LjUxMzUwOTA5IEwyMCwxMCIgaWQ9IlJlY3RhbmdsZS0yNzgtQ29weS04Ij48L3BhdGg+ICAgICAgICAgICAgICAgIDxwYXRoIGQ9Ik0xNS44NjY4NjIsMTMuNTEzNTA5MSBMMjAsMTUiIGlkPSJSZWN0YW5nbGUtMjc4LUNvcHktOSI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMCw5IEw1LDYiIGlkPSJSZWN0YW5nbGUtMjc4LUNvcHktNiI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMTQsOSBMMTQsMTkuNTExODk4IiBpZD0iTGluZSIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSI+PC9wYXRoPiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMCwxNCBMNSwxMSIgaWQ9IlJlY3RhbmdsZS0yNzgtQ29weS03Ij48L3BhdGg+ICAgICAgICAgICAgICAgIDxwb2x5bGluZSBpZD0iUmVjdGFuZ2xlLTI3OC1Db3B5IiBwb2ludHM9IjIwIDUgMTQgOSAwIDQiPjwvcG9seWxpbmU+ICAgICAgICAgICAgICAgIDxwb2x5bGluZSBpZD0iUmVjdGFuZ2xlLTI3OC1Db3B5LTIiIHBvaW50cz0iMjAgMTUgMTQgMTkgMCAxNCI+PC9wb2x5bGluZT4gICAgICAgICAgICAgICAgPHBvbHlsaW5lIGlkPSJSZWN0YW5nbGUtMjc4LUNvcHktNCIgcG9pbnRzPSIyMCAxMSAxNCAxNSAwIDEwIj48L3BvbHlsaW5lPiAgICAgICAgICAgICAgICA8cG9seWxpbmUgaWQ9IlJlY3RhbmdsZS0yNzgtQ29weS01IiBwb2ludHM9IjIwIDEwIDE0IDE0IDAgOSI+PC9wb2x5bGluZT4gICAgICAgICAgICAgICAgPHBvbHlsaW5lIGlkPSJSZWN0YW5nbGUtMjc4LUNvcHktMyIgcG9pbnRzPSIyMCA2IDE0IDEwIDAgNSI+PC9wb2x5bGluZT4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=
+ICON
+
+    identifier "rack"
+    label      "Rack"
+    position   1
+
+    collect do |request, _response|
+      store :rack_version, Rack.release
+      store :rack_env,     hash_stringify_values(request.env)
+    end
+
+    template __FILE__, type: :DATA
+
+    class << self
+      def hash_stringify_values(hash)
+        return {} unless hash.kind_of?(Hash)
+        hash.collect do |k,v|
+          v = v.inspect unless v.kind_of?(String)
+          [k, v]
+        end
+      end
+    end
+  end
+end
+
+__END__
+<% tab_content do %>
+  <%=h data(:rack_version) %>
+<% end %>
+
+<% panel_content do %>
+  <div class="block">
+    <h3>Rack informations</h3>
+
+    <table>
+      <tbody>
+        <tr>
+          <th>Version</th>
+          <td><%=h data(:rack_version) %></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  <div class="block">
+    <h3>Env</h3>
+    <% if data(:rack_env) && !data(:rack_env).empty? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Key</th>
+          <th>Value</th>
+        </tr>
+      <thead>
+      <tbody>
+      <% data(:rack_env).sort.each do |k, v| %>
+        <tr>
+          <th><%=h k %></th>
+          <td class="code"><%=h v %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <% else %>
+    <p><span class="text__no-value">No rack env datas</span></p>
+    <% end %>
+  </div>
+<% end %>

data/lib/rack/web_profiler/{collector/rack → collectors}/request_collector.rb

@@ -1,66 +1,52 @@
 module Rack
-  class WebProfiler::Collector::Rack::RequestCollector
+  class WebProfiler::Collectors::RequestCollector
     include Rack::WebProfiler::Collector::DSL
 
     icon <<-'ICON'
 data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iMjBweCIgaGVpZ2h0PSIyMHB4IiB2aWV3Qm94PSIwIDAgMjAgMjAiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+T3ZhbCA3IENvcHkgMjwvdGl0bGU+ICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPiAgICA8ZGVmcz48L2RlZnM+ICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPiAgICAgICAgPGcgaWQ9IkRlc2t0b3AtMiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEwLjAwMDAwMCwgLTEzMC4wMDAwMDApIiBmaWxsPSIjNTg1NDczIj4gICAgICAgICAgICA8ZyBpZD0iUmVxdWVzdCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4wMDAwMDAsIDEyMC4wMDAwMDApIj4gICAgICAgICAgICAgICAgPHBhdGggZD0iTTE3LjY3OTE5MTIsMTMuNDA2NDMyMiBDMTguMTAzNzAxMiwxMy4yNTUzNzMzIDE4LjU0NzA4OSwxMy4xNDQ1ODY0IDE5LjAwNDgzMTcsMTMuMDc4NjI3OCBMMTkuMDA0ODMxNywxMCBMMjAuOTk1MTY4MywxMCBMMjAuOTk1MTY4MywxMy4wNzg2Mjc4IEMyMS40NTI5MTEsMTMuMTQ0NTg2NCAyMS44OTYyOTg4LDEzLjI1NTM3MzMgMjIuMzIwODA4OCwxMy40MDY0MzIyIEwyMy43NjY1Mzg2LDEwLjY4NzQxIEwyNS41MjM5MDE1LDExLjYyMTgxNjUgTDI0LjA4MDM0MDcsMTQuMzM2NzU5NiBDMjQuNDU0NDUyLDE0LjYwOTU2NTUgMjQuODAwNTkwMywxNC45MTg5MDYzIDI1LjExMzU5ODIsMTUuMjU5NTg2NCBMMjcuNjI0NzkyLDEzLjUwMTIyOTYgTDI4Ljc2NjQwMjIsMTUuMTMxNjE3OSBMMjYuMjM5NDcyLDE2LjkwMDk5MzUgQzI2LjQ0Mjk1ODQsMTcuMzEyNjE1IDI2LjYwNzQ4OTQsMTcuNzQ3MjEzIDI2LjcyODIwMjgsMTguMTk5ODg5MyBMMjkuNzc1NjgxNCwxNy44MjU3MDU5IEwzMC4wMTgyNDI0LDE5LjgwMTIwNjkgTDI2Ljk2NDU5ODcsMjAuMTc2MTQ3MiBDMjYuOTU0Njg2MiwyMC42NDkzNjI3IDI2Ljg5ODI3NTUsMjEuMTExMDU1NiAyNi43OTk3ODQxLDIxLjU1Njc3NTkgTDI5LjY3NTIwODQsMjIuNjYwNTQ3OSBMMjguOTYxOTM1NiwyNC41MTg2ODcyIEwyNi4wOTg1NTE3LDIzLjQxOTUzNzEgQzI1Ljg3MzU5ODcsMjMuODI4ODI2IDI1LjYwOTIyNDgsMjQuMjEzMDczNSAyNS4zMTA1OTI0LDI0LjU2NzA3OTEgTDI3LjM2NTk4NjQsMjYuODQ5ODI1NCBMMjUuODg2ODc4LDI4LjE4MTYyMDYgTDIzLjgyNDc3MTQsMjUuODkxNDE5MSBDMjMuNDQ1Mzk3NywyNi4xNDI5NDcyIDIzLjA0MDE3MDgsMjYuMzU4MTMyMyAyMi42MTM5NzI3LDI2LjUzMjA1NjQgTDIzLjM1ODEzMTgsMjkuNTE2NzE1NCBMMjEuNDI2OTE2NiwyOS45OTgyMjE0IEwyMC42ODE3ODQ0LDI3LjAwOTY1OTQgQzIwLjQ1NzQ2NzgsMjcuMDMxNjA5MyAyMC4yMzAwMzYsMjcuMDQyODQxNiAyMCwyNy4wNDI4NDE2IEMxOS43Njk5NjQsMjcuMDQyODQxNiAxOS41NDI1MzIyLDI3LjAzMTYwOTMgMTkuMzE4MjE1NiwyNy4wMDk2NTk0IEwxOC41NzMwODM0LDI5Ljk5ODIyMTQgTDE2LjY0MTg2ODIsMjkuNTE2NzE1NCBMMTcuMzg2MDI3MywyNi41MzIwNTY0IEMxNi45NTk4MjkyLDI2LjM1ODEzMjMgMTYuNTU0NjAyMywyNi4xNDI5NDcyIDE2LjE3NTIyODYsMjUuODkxNDE5MSBMMTQuMTEzMTIyLDI4LjE4MTYyMDYgTDEyLjYzNDAxMzYsMjYuODQ5ODI1NCBMMTQuNjg5NDA3NiwyNC41NjcwNzkxIEMxNC4zOTA3NzUyLDI0LjIxMzA3MzUgMTQuMTI2NDAxMywyMy44Mjg4MjYgMTMuOTAxNDQ4MywyMy40MTk1MzcxIEwxMS4wMzgwNjQ0LDI0LjUxODY4NzIgTDEwLjMyNDc5MTYsMjIuNjYwNTQ3OSBMMTMuMjAwMjE1OSwyMS41NTY3NzU5IEMxMy4xMDE3MjQ1LDIxLjExMTA1NTYgMTMuMDQ1MzEzOCwyMC42NDkzNjI4IDEzLjAzNTQwMTMsMjAuMTc2MTQ3MyBMOS45ODE3NTc1OSwxOS44MDEyMDY5IEwxMC4yMjQzMTg2LDE3LjgyNTcwNTkgTDEzLjI3MTc5NzIsMTguMTk5ODg5MyBDMTMuMzkyNTEwNiwxNy43NDcyMTMgMTMuNTU3MDQxNiwxNy4zMTI2MTUgMTMuNzYwNTI4LDE2LjkwMDk5MzUgTDExLjIzMzU5NzgsMTUuMTMxNjE3OSBMMTIuMzc1MjA4LDEzLjUwMTIyOTYgTDE0Ljg4NjQwMTgsMTUuMjU5NTg2NCBDMTUuMTk5NDA5NywxNC45MTg5MDYzIDE1LjU0NTU0OCwxNC42MDk1NjU1IDE1LjkxOTY1OTMsMTQuMzM2NzU5NiBMMTQuNDc2MDk4NSwxMS42MjE4MTY1IEwxNi4yMzM0NjE0LDEwLjY4NzQxIEwxNy42NzkxOTEyLDEzLjQwNjQzMjIgWiBNMjAsMjMuMDMyNzYxMiBDMjEuNjQ4ODQ4OSwyMy4wMzI3NjEyIDIyLjk4NTUwNSwyMS42ODYyMzA2IDIyLjk4NTUwNSwyMC4wMjUyMDA5IEMyMi45ODU1MDUsMTguMzY0MTcxMyAyMS42NDg4NDg5LDE3LjAxNzY0MDYgMjAsMTcuMDE3NjQwNiBDMTguMzUxMTUxMSwxNy4wMTc2NDA2IDE3LjAxNDQ5NSwxOC4zNjQxNzEzIDE3LjAxNDQ5NSwyMC4wMjUyMDA5IEMxNy4wMTQ0OTUsMjEuNjg2MjMwNiAxOC4zNTExNTExLDIzLjAzMjc2MTIgMjAsMjMuMDMyNzYxMiBaIiBpZD0iT3ZhbC03LUNvcHktMiI+PC9wYXRoPiAgICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==
 ICON
 
-    collector_name "rack_request"
-    # collector_key  "rack_request"
-    # collector_name "Request"
-    position       2
+    identifier "rack.request"
+    label      "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,    get_request_post(request)
-      store :request_session, hash_to_s(request.session)
-      store :request_cookies, request.cookies
-      store :request_body,    get_request_body(request)
-
-      store :rack_env, hash_to_s(request.env)
+      store :request_headers,   request.http_headers
+      store :request_fullpath,  request.fullpath
+      store :request_method,    request.request_method
+      store :request_cookies,   request.cookies
+      store :request_get,       request.GET
+      store :request_post,      request_post(request)
+      store :request_session,   hash_stringify_values(request.session)
+      store :request_cookies,   request.cookies
+      store :request_body,      request.body_string
+      store :request_mediatype, request.media_type
+      store :request_raw,       request.raw
 
       store :response_status,  response.status
       store :response_headers, response.headers
+      store :response_raw,     response.raw
 
       if response.successful?
         status :success
       elsif response.redirection?
         status :warning
       else
-        status :error
+        status :danger
       end
     end
 
     template __FILE__, type: :DATA
 
     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
-
-      def get_request_post(request)
+      def request_post(request)
         request.POST if request.POST && !request.POST.empty?
       rescue Exception
         nil
       end
 
-      def get_request_body(request)
-        return nil if request.body.nil? || request.get?
-        body = request.body.dup
-        body.read
-      end
-
-      def hash_to_s(hash)
+      def hash_stringify_values(hash)
+        return {} unless hash.kind_of?(Hash)
         hash.collect {|k,v| [k, v.to_s]}
       end
     end
@@ -70,6 +56,17 @@ end
 __END__
 <% tab_content do %>
   <%=h data(:response_status) %>
+
+  <div class="details">
+    <div class="wrapper">
+      <dl>
+        <dt>Status</dt>
+        <dd><%=h data(:response_status) %> - <%=h Rack::Utils::HTTP_STATUS_CODES[data(:response_status).to_i] %></dd>
+        <dt>Path</dt>
+        <dd><%=h data(:request_method) %> <%=h data(:request_fullpath) %></dd>
+      </dl>
+    </div>
+  </div>
 <% end %>
 
 <% panel_content do %>
@@ -147,12 +144,22 @@ __END__
 
   <div class="block">
     <h3>Request content</h3>
-    <% unless data(:request_body).nil? %>
-    <%=highlight code: data(:request_body) %>
+    <% unless data(:request_body).empty? %>
+    <%=highlight mimetype: data(:request_mediatype), code: data(:request_body) %>
     <% else %>
     <p><span class="text__no-value">No request content</span></p>
     <% end %>
   </div>
+  </div>
+
+  <div class="block">
+    <h3>Request raw</h3>
+    <% unless data(:request_raw).nil? %>
+    <%=highlight language: :http, code: data(:request_raw) %>
+    <% else %>
+    <p><span class="text__no-value">No request raw</span></p>
+    <% end %>
+  </div>
 
   <div class="block">
     <h3>Response headers</h3>
@@ -225,28 +232,4 @@ __END__
     <p><span class="text__no-value">No cookies data</span></p>
     <% end %>
   </div>
-
-  <div class="block">
-    <h3>Env</h3>
-    <% if data(:rack_env) && !data(:rack_env).empty? %>
-    <table>
-      <thead>
-        <tr>
-          <th>Key</th>
-          <th>Value</th>
-        </tr>
-      <thead>
-      <tbody>
-      <% data(:rack_env).sort.each do |k, v| %>
-        <tr>
-          <th><%=h k %></th>
-          <td class="code"><%=h v %></td>
-        </tr>
-      <% end %>
-      </tbody>
-    </table>
-    <% else %>
-    <p><span class="text__no-value">No rack env datas</span></p>
-    <% end %>
-  </div>
 <% end %>

data/lib/rack/web_profiler/{collector → collectors}/ruby_collector.rb

@@ -1,13 +1,14 @@
 module Rack
-  class WebProfiler::Collector::RubyCollector
+  class WebProfiler::Collectors::RubyCollector
     include Rack::WebProfiler::Collector::DSL
 
     icon <<-'ICON'
 data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iMjBweCIgaGVpZ2h0PSIyMHB4IiB2aWV3Qm94PSIwIDAgMjAgMjAiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+VHJpYW5nbGUgMTwvdGl0bGU+ICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPiAgICA8ZGVmcz48L2RlZnM+ICAgIDxnIGlkPSJQYWdlLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPiAgICAgICAgPGcgaWQ9IkRlc2t0b3AtMiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTcxLjAwMDAwMCwgLTEwLjAwMDAwMCkiIGZpbGw9IiM1ODU0NzMiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik04MSwzMCBMNzEsMTUgTDkxLDE1IEw4MSwzMCBaIE05MSwxNCBMNzEsMTQgTDc1LDEwIEw4NywxMCBMOTEsMTQgWiIgaWQ9IlRyaWFuZ2xlLTEiPjwvcGF0aD4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==
 ICON
 
-    collector_name "ruby"
-    position       0
+    identifier "ruby"
+    label      "Ruby"
+    position   0
 
     collect do |_request, _response|
       store :ruby_version,      RUBY_VERSION