dev_panel 0.3 → 1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d68b76e17fb16c295f11fbc317d028bb76183d32
+  data.tar.gz: fd16f57f988688f96f7bf9ffe3448b7d40822805
+SHA512:
+  metadata.gz: a4c7001f981e3c99ba2f9c93b604aea7713b3ce0f197c8271723b7531f489e3726c26ec69ed5ffa025ada87dbebd5f806dce306323168b93d7a4d3576e00aee1
+  data.tar.gz: 35027e9b324f9ca22c6ca5392cd077db9a01227d206b6a251c67313a2d1c0d9a5340bae834dd9a6c2c91f33c80bde193ec323fe0513b368b33ae1da1e75f8491

data/lib/devpanel/extension.rb

@@ -6,74 +6,28 @@ module DevPanel
     end
 
     def dev_panel_output
-      self.response.body += dev_panel_ajax
+      self.response.body += panel
     end
 
-    def dev_panel_ajax
-      puts "#{jquery_cdn.nil?} + #{jquery_ui_cdn.nil?} + #{ajax_call}" 
-      jquery_cdn + jquery_ui_cdn + ajax_call
-    end
-
-    def ajax_call
+    def panel
       <<-html_code
-        <div id="DevPanel"></div><script type="text/javascript">
-          var $jq = jQuery.noConflict();  
-          $jq.ajax({
-            url: "/__DevPanel/main",
-            success: function(response) {
-              $jq("#DevPanel").html(response);
-              #{hide_container};
-              $jq("#consoleButton").click(function(e){
-                $("#console").toggle();
-                $jq("#console").css('top', e.pageY + 10 + 'px');
-                $jq("#console").css('left', e.pageX + 10 + 'px');                
-              })
-
-              previous = null;
-
-              $jq("#consoleInput").keydown(function(e) {
-                if(event.keyCode == 38) {
-                  $jq("#consoleInput").val(previous);
-                }
-
-                if(event.which == 13) {
-
-                  if($jq("#consoleInput").val() == "") {
-                    $jq("#consoleResults").append("><br>");
-                    return "";
-                    $jq("#consoleResults")[0].scrollTop = $jq("#consoleResults")[0].scrollHeight
-                  }
-                    $jq.ajax({
-                      url: "/__DevPanel/console?query=" + $jq("#consoleInput").val(),
-                      success: function(results) {
-                        previous = $jq("#consoleInput").val()
-                        $jq("#consoleResults").append(">" + results + "<br>");
-                        $jq("#consoleInput").val("");
-                        $jq("#consoleResults")[0].scrollTop = $jq("#consoleResults")[0].scrollHeight                        
-                      }
-
-                    })
-                  }
-              })
+        <script>
+        window.onload = function() {
+          body = document.getElementsByTagName('body')[0]
+          iframe = document.createElement('iframe')
+          iframe.setAttribute('src', '__DevPanel/main')
+          iframe.setAttribute('id', 'devPanel')
+          iframe.setAttribute('style', 'width: 100%; border: none;')
+          iframe.setAttribute('height', 50)
+          body.insertBefore(iframe ,body.children[0])
+        }
+
+        window.resizeDevPanel = function(height) {
+          element = document.getElementById('devPanel')
+          console.log(height)
+          element.setAttribute('height', height)
+        }
 
-              $jq("#viewTime").click(function(e) {
-                $jq("#partialList").css('top', e.pageY + 10 + 'px');
-                $jq("#partialList").css('left', e.pageX + 10 + 'px');
-                $jq("#partialList").toggle();
-              });
-              $jq("#devPanelHider").on("click", function(s) {
-                $jq("#devPanelContainer").slideToggle(110);
-                $jq("#partialList").hide();
-                $jq("#console").hide();
-                $jq.get("/__DevPanel/set_options?visible=" + $jq("#devPanelContainer").is(":visible"));
-              });
-              $jq("#devPanelWindow").draggable({stop: function() {
-                $jq.get("/__DevPanel/set_options?top=" + $jq("#devPanelWindow").position().top + "&left="
-                                                     + $jq("#devPanelWindow").position().left + "&zindex="
-                                                     + $jq("#devPanelWindow").zIndex() )
-              }});
-            }
-          });
         </script>
       html_code
     end
@@ -81,21 +35,5 @@ module DevPanel
     def hide_container
       (Stats.show?) ? '' : '$jq("#devPanelContainer").toggle()'
     end
-
-    def config_key(value)
-      begin
-        return Rails.application.config.send(value)
-      rescue
-        return nil
-      end
-    end
-
-    def jquery_cdn
-      '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>'
-    end
-
-    def jquery_ui_cdn
-      '<script src="http://code.jquery.com/ui/1.9.2/jquery-ui.js"></script>'
-    end
   end
 end

data/lib/devpanel/middleware.rb

@@ -5,174 +5,50 @@ module DevPanel
     end
 
     def call(env)
-      if env["REQUEST_URI"] =~ /__DevPanel\/main/
+      request_uri = env["REQUEST_URI"]
+      params = Rack::Utils.parse_query(env['QUERY_STRING'], "&")
+
+      if request_uri =~ /__DevPanel\/main/
         [200, { "Content-Type" => "text/html; charset=utf-8" }, [dev_panel_output]]
-      elsif env["REQUEST_URI"] =~ /__DevPanel\/set_options/
-         params = Rack::Utils.parse_query(env['QUERY_STRING'], "&")
-         Stats.set_by_params(params)
+      elsif request_uri =~ /__DevPanel\/set_options/
+        Stats.set_by_params(params)
         [200, { "Content-Type" => "text/plain; charset=utf-8" }, ["#{Stats.show?} #{Stats.left} #{Stats.top}"]]
-      elsif env["REQUEST_URI"] =~ /__DevPanel\/console/
-        params = Rack::Utils.parse_query(env['QUERY_STRING'], "&")
+      elsif request_uri =~ /__DevPanel\/console/
         query = params["query"]
         [200, { "Content-Type" => "text/plain; charset=utf-8" }, ["#{CGI::escapeHTML(eval(query).to_s)}"]]
+      elsif request_uri =~ /__DevPanel\/assets/
+        data = File.read(File.dirname(__FILE__) + '/assets/' + request_uri.split('/__DevPanel/assets/').last)
+        [200, { "Content-Type" => "text/plain; charset=utf-8" }, [data]]
+      elsif request_uri =~ /__DevPanel\/file/
+        filename = request_uri.split('/__DevPanel/file/').last
+        data = File.read('/' + filename)
+        template = ERB.new File.new("#{File.dirname(__FILE__)}/views/file_viewer.html.erb").read, nil, "%"
+        os = OpenStruct.new(data: stats(:data), filename: filename)
+        result = template.result(os.instance_eval { binding })
+        [200, { "Content-Type" => "text/html; charset=utf-8" }, [result]]
       else
         @app.call(env)
       end
     end
 
     def dev_panel_output
-      (css + html_containers + html_table).html_safe
-    end
-
-    def css
-      <<-css_code
-        <style>
-          table {
-            width: 100%
-          }
-
-          #devPanelWindow {
-            border-radius: 3px;
-            margin-bottom: 2px;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.03), 1px 1px 0 rgba(0, 0, 0, 0.05), -1px 1px 0 rgba(0, 0, 0, 0.05), 0 0 0 4px rgba(0, 0, 0, 0.04);
-            font-family: menlo, lucida console, monospace;
-            border: 3px solid #29488B;
-            z-index: 500000000;
-            padding: 3px; 
-            color: #000; 
-            background-color: #F0F0F5; 
-            position: absolute; 
-            float: left;             
-          }
-
-          #devPanelHider {
-            background: #5366EB;
-            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3);
-            font-family: arial;
-            font-size: 12.8px;
-            overflow: hidden;
-            padding: 6px 10px;
-            border: solid 1px #CCC;
-            border-bottom: 0;
-            border-top-left-radius: 2px;
-            border-top-right-radius: 2px;
-            text-align:left; 
-            border: solid 1px #fff;
-          }
-
-          .hider-color {
-            color: #fff
-          }
-
-          #devPanelContainer {
-            font-family: menlo, lucida console, monospace;
-            background-color: #fff;
-            box-shadow: inset 3px 3px 3px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-            width: 300px;
-            padding: 2px           
-          }
-
-          #devPanelContainer td {
-            font-family: arial;
-            font-size: 12px;
-            font-weight: normal;
-            padding: 5px;
-            overflow: auto;
-            letter-spacing: 1.5px
-          }
-
-          #devPanelContainer tr {
-            background-color: #2E2E2E;
-            color: rgb(238, 238, 238);
-            border-bottom: 1px solid #4B4444;
-          }
-
-          #devPanelContainer .alt {
-            background-color: #000000;
-            color: rgb(238, 238, 238);
-            border-bottom: 1px solid #4B4444;
-          }
-
-          #devPanelContainer td.firstColumn {
-            width: 90px;
-            font-weight: bold;
-          }
-
-          #viewTime {
-            font-size: 10px;
-            text-decoration: underline;
-          }
-
-          #partialList {
-            position: absolute;
-            top: 0px;
-            left: 0px;
-            background: #F1F1F1;
-            border: 2px solid #000;
-            background-color: #fff;
-            box-shadow: inset 3px 3px 3px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-            font-family: arial;
-            font-size: 10px;
-            overflow: hidden;
-            padding: 6px 10px;
-            border-top-left-radius: 2px;
-            border-top-right-radius: 2px;
-            display: none;
-            z-index: 500000001;
-          }
-
-          #console {
-            position: absolute;
-            top: 0px;
-            left: 0px;
-            background: #F1F1F1;
-            border: 2px solid #000;
-            background-color: #fff;
-            box-shadow: inset 3px 3px 3px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-            font-family: arial;
-            font-size: 10px;
-            overflow: hidden;
-            padding: 6px 10px;
-            border-top-left-radius: 2px;
-            border-top-right-radius: 2px;
-            display: none;
-            z-index: 500000001;
-            width: 600px;
-          }
-
-          #consoleResults {
-            width: 97%;
-            height: 250px;
-            font-size: 13px;
-            overflow-x: scroll;
-          }
-
-          #consoleInput {
-            width: 97%;
-            height: 20px;
-          }
-
-          .green { background: #21D61A !important}
-          .yellow { background: #BEBE00 !important }
-          .orange { background: #F0A811 !important }
-          .red { background: #B90000 !important }
-
-        </style>
-      css_code
-    end
-
-    def html_containers
-      <<-html_code
-        <div id='partialList'>#{partial_list}</div>
-        <div id='console'>
-          <div id="consoleResults">></div>        
-          <input id="consoleInput" type="text" placeholder="Type Command">
-
-        </div>
-        <div id="devPanelWindow" style="top: #{Stats.top.to_s}px; left: #{Stats.left.to_s}px;" >
-        <div id="devPanelHider" class="#{heat_color}"><a class="hider-color" href="#">#{stats(:controller)}##{stats(:action)}</a> / <span class="hider-color" style="font-size: 10px">#{Stats.data[:action_controller].duration.round(0).to_s}ms</span></div>
-        <div id="devPanelContainer">
-      html_code
+      template = ERB.new File.new("#{File.dirname(__FILE__)}/views/header.html.erb").read, nil, "%"
+      os = OpenStruct.new(
+        controller: stats(:controller),
+        action: stats(:action),
+        status: stats(:status),
+        partial_count: partial_count,
+        total_duration: Stats.total_duration.round(0).to_s,
+        controller_duration: Stats.controller_duration.round(0).to_s,
+        controller_percent: Stats.controller_duration_percent.to_s,
+        view_duration: Stats.view_duration.to_s,
+        view_duration_percent: Stats.view_duration_percent,
+        log: Stats.data[:log],
+        partial_list: Hash[Stats.data[:partials].to_a.reverse],
+        partial_paths: Stats.data[:partial_paths] || [],
+        params: stats(:params)
+        )
+      template.result(os.instance_eval { binding }).html_safe
     end
 
     def heat_color
@@ -192,53 +68,8 @@ module DevPanel
       Stats.data[:action_controller].payload[symbol]
     end
 
-    def html_table
-      table_rows = rowify([
-        first_td("Tools:")            + td("<a href='#' id='consoleButton'>Console</a>"),        
-        first_td("Total:")            + td("#{Stats.total_duration.to_s}ms"),
-        first_td("Controller:")       + td("#{Stats.controller_duration.to_s}ms (#{Stats.controller_duration_percent}%)"),
-        first_td("View:")             + td("#{Stats.view_duration.to_s}ms (#{Stats.view_duration_percent}%)"),
-        first_td("Partials:")         + td(partial_count),
-        first_td("Response:")         + td(stats(:status)),
-        first_td("Controller:")       + td(stats(:controller)),
-        first_td("Action:")           + td(stats(:action)),
-        first_td("Method:")           + td(stats(:method)),
-        first_td("Params:")           + td(stats(:params)),
-        first_td("Log:")              + td(Stats.data[:log])
-      ])
-
-      "<table style='margin: auto; table-layout: fixed'>#{table_rows}</table></div></div>"
-    end
-
     def partial_count
-      "<div id='viewTime'>#{Stats.data[:partial_count] || 0}</div>"
-    end
-
-    def partial_list
-      str = ""
-      Stats.data[:partials].each_pair {|k,v| str << "#{k}: #{Stats.data[:partials][k]}<br>" } if Stats.data[:partials].present?
-      str
-    end
-
-    def tr(content = "", klass="")
-      "<tr class=#{klass}>#{content}</tr>"
-    end
-
-    def td(content = "")
-      "<td>#{content}</td>"
-    end
-
-    def first_td(content = "")
-      "<td class='firstColumn'>#{content}</td>"
+      Stats.data[:partial_count] || 0
     end
-
-    def rowify(arr)
-      result = ""
-      arr.each_with_index do |data, index|
-        result += tr(data, index.even? ? "alt" : "")
-      end
-      result
-    end
-
   end
 end

data/lib/devpanel/rails.rb

@@ -1,60 +1,40 @@
 module DevPanel
+  class Config
+    def self.initial_value(key, default)
+      initial = Rails.application.config.send(key)
+      rescue
+        initial = default
+    end
+  end
+
   class Railtie < Rails::Railtie
     initializer "dev_panel.configure_rails_initialization" do
-      unless Rails.env.production?
-
-        Rails.application.middleware.use DevPanel::Middleware
-
-        ActiveSupport::Notifications.subscribe(//) do |*args|
-          event = ActiveSupport::Notifications::Event.new(*args)
-        end
+      Rails.application.middleware.use DevPanel::Middleware
 
-        ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |*args|
-          event = ActiveSupport::Notifications::Event.new(*args)
-          Stats.delete_data if event.payload[:format] == :html
-        end
-
-        ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
-          event = ActiveSupport::Notifications::Event.new(*args)
-          Stats.data[:action_controller] = event if event.payload[:format] == :html
-        end
-
-        ActiveSupport::Notifications.subscribe('render_partial.action_view') do |*args|
-          Stats.data[:partial_count] ||= 0
-          Stats.data[:partial_count] += 1
-          event = ActiveSupport::Notifications::Event.new(*args)
-          partial_name = event.payload[:identifier].split("app").last
-          Stats.data[:partials] ||= {}
-          Stats.data[:partials][partial_name] ||= 0
-          Stats.data[:partials][partial_name] += 1
-        end
+      ActiveSupport::Notifications.subscribe(/action/) do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+      end
 
+      ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        Stats.delete_data if event.payload[:format] == :html
+      end
 
-        top = nil
-        begin
-          top = Rails.application.config.dev_panel_initial_top
-        rescue
-          top = 0
-        end
-       
+      ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        Stats.data[:action_controller] = event if event.payload[:format] == :html
+      end
 
-        left = nil
-        begin
-          left = Rails.application.config.dev_panel_initial_left
-        rescue
-          left = 0
-        end
-        
-        zindex = nil
-        begin
-          zindex = Rails.application.config.dev_panel_initial_zindex
-        rescue
-          zindex = 1000
-        end
-          
-        DevPanel::Stats.top(top)
-        DevPanel::Stats.left(left)
-        DevPanel::Stats.zindex(zindex)
+      ActiveSupport::Notifications.subscribe('render_partial.action_view') do |*args|
+        Stats.data[:partial_count] ||= 0
+        Stats.data[:partial_count] += 1
+        event = ActiveSupport::Notifications::Event.new(*args)
+        partial_name = event.payload[:identifier].split("app").last
+        Stats.data[:partials] ||= {}
+        Stats.data[:partial_paths] ||= {}
+        Stats.data[:partials][partial_name] ||= 0
+        Stats.data[:partials][partial_name] += 1
+        Stats.data[:partial_paths][partial_name] = event.payload[:identifier]
       end
     end
   end

data/lib/devpanel/stats.rb

@@ -1,87 +1,96 @@
 module DevPanel
   class Stats
+    class << self
+      def defaults
+        {
+          data: { log: '' },
+          visible: 'false',
+          left: 0,
+          top: 0,
+          zindex: 1000
+        }
+      end
 
-    @@data      ||= { log: "" }
-    @@visible     = "false"
-    @@left        = 0
-    @@top         = 0
-
-    def self.set_by_params(params)
-      ['visible', 'left', 'top', 'zindex'].each do |str|
-        Stats.send(str, params[str]) if params[str].present?
+      def set_defaults
+        defaults.each_pair do |key, value|
+          self.class_variable_set(:"@@#{key}", value)
+        end
       end
-      Stats.log(" ")
-    end
 
-    def self.data
-      @@data ||= { log: "" }
-    end
+      def set_by_params(params)
+        ['visible', 'left', 'top', 'zindex'].each do |str|
+          Stats.send(str, params[str]) if params[str]
+        end
+      end
 
-    def self.total_duration
-      data[:action_controller].duration.round(2)
-    end
+      def method_missing(*arr)
+        if [:left, :top, :zindex].include?(arr.first)
+          return self.class_variable_get(:"@@#{arr.first}") if arr.size < 2 || (invalid_number?(arr.last.to_i))
+          self.class_variable_set(:"@@#{arr.first}", (arr.last || defaults[arr.first]))
+          return self.class_variable_get(:"@@#{arr.first}")
+        end
+      end
 
-    def self.controller_duration
-      (data[:action_controller].duration - stats(:view_runtime)).round(2)
-    end
+      def data
+        @@data
+      end
 
-    def self.view_duration
-      stats(:view_runtime).round(2)
-    end
+      def visible(val = @@visible)
+        @@visible = val
+      end
 
-    def self.controller_duration_percent
-      ((controller_duration / total_duration) * 100).round(0)
-    end
+      def invalid_number?(val)
+        val.class != Fixnum || val.nil?
+      end
 
-    def self.view_duration_percent
-      ((view_duration / total_duration) * 100).round(0)
-    end
+      def total_duration
+        data[:action_controller].duration.round(2)
+      end
 
-    def self.stats(symbol)
-      data[:action_controller].payload[symbol]
-    end
+      def controller_duration
+        (data[:action_controller].duration - stats(:view_runtime)).round(2)
+      end
 
+      def view_duration
+        stats(:view_runtime).round(2)
+      end
 
-    def self.delete_data
-      @@data = {}
-    end
+      def controller_duration_percent
+        ((controller_duration / total_duration) * 100).round(0)
+      end
 
-    def self.left(val = @@left)
-      return @@left if val.class != Fixnum && val.empty?
-      @@left = val || 0
-    end
+      def view_duration_percent
+        ((view_duration / total_duration) * 100).round(0)
+      end
 
-    def self.top(val = @@top)
-      return @@top if val.class != Fixnum && val.empty?
-      @@top = val
-    end
-    
-    def self.zindex(val = @@zindex)
-      return @@zindex if val.class != Fixnum && val.empty?
-      @@zindex = val || 1000
-    end
+      def stats(symbol)
+        data[:action_controller].payload[symbol]
+      end
 
-    def self.visible(val = @@visible)
-      @@visible = val
-    end
+      def delete_data
+        @@data = {}
+      end
 
-    def self.show?
-      @@visible == "true"
-    end
+      def show?
+        @@visible == "true"
+      end
 
-    def self.log(log)
-      @@data[:log] ||= ""
-      @@data[:log] += "<div style='border-bottom: 1px black solid'>"
-      @@data[:log] += CGI::escapeHTML("#{log}")
-      @@data[:log] += "</div>"
-    end
+      def log(log = nil)
+        return data[:log] unless log
+        data[:log] ||= ""
+        data[:log] += "<div style='border-bottom: 1px black solid'>"
+        data[:log] += CGI::escapeHTML("#{log}")
+        data[:log] += "</div>"
+      end
 
-    def self.time
-      start = Time.now
-      yield
-      time_spent = ((Time.now - start)*1000).round(2)
-      self.log("Time Elapsed: #{time_spent}ms")
+      def time(tag = nil)
+        start = Time.now
+        yield
+        time_spent = ((Time.now - start)*1000).round(2)
+        self.log("#{tag}: Time Elapsed: #{time_spent}ms")
+      end
     end
 
+    self.set_defaults
   end
 end

metadata

@@ -1,18 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: dev_panel
 version: !ruby/object:Gem::Version
-  version: '0.3'
-  prerelease: 
+  version: '1'
 platform: ruby
 authors:
 - Matthew Stopa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
-dependencies: []
-description: A panel that appears in the browser to provide stats on page load times
-  and other debugging information for Rails 3
+date: 2015-11-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A panel that appears in the browser to provide stats on page load times and other debugging information for Rails 3 & 4
 email: matthew.p.stopa@gmail.com
 executables: []
 extensions: []
@@ -25,27 +37,25 @@ files:
 - lib/devpanel/stats.rb
 homepage: http://github.com/MattStopa/DevPanel
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
+specification_version: 4
 summary: DevPanel, a gem for performance stats and debugging information
 test_files: []
-has_rdoc: