rack-insight 0.5.12 → 0.5.13

data/.gitignore

@@ -11,4 +11,3 @@ pkg/
 .sass-cache/
 .yardoc/
 gh-pages/
-aaaa

data/CHANGELOG

@@ -1,5 +1,13 @@
 == HEAD
 
+  * New Features
+
+    * Panel level configuration options for all panels, including extension gems.
+      Currently this is implemented in the log_panel, and configured as:
+        Rack::Insight::Config.configure do |config|
+          config[:panel_configs][:log_panel] = {:watch => {'Logger' => :add}}
+        end
+    * Count number of Log Entries
 
 == 0.5.12 / 2012-09-10
 
@@ -7,7 +15,6 @@
 
     * Improving documentation by Peter Boling
 
-
   * New Features
 
     * persistent toolbar position by Alif Rachmawadi

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-insight (0.5.11)
+    rack-insight (0.5.12)
       rack
       sqlite3 (>= 1.3.3)
       uuidtools (>= 2.1.2)

data/README.md

@@ -1,19 +1,22 @@
 Rack::Insight
-=========
-
-Rack::Insight began life as an fork of Logical::Insight by LRDesign.  I started a
-fork because LogicalInsight was namespaced as "Insight", which is causing namespace
-collisions everywhere I have an Insight model.  I had to re-namespace all the code.
-I also needed to build a few extension gems with additional panels, and added the
-Config class to allow for custom panel load paths, and other future extensions
-that don't work in the *use Middleware* declaration.  It should be *even* easier
-to extend than LogicalInsight was, because extension gems can access the Config class
+=============
+
+Rack::Insight began life as an fork of Logical::Insight by LRDesign.
+
+* I started a fork because:
+    * LogicalInsight was namespaced as "Insight"
+        * Causing namespace collisions everywhere I have an Insight model.  I had to re-namespace all the code.
+    * I also needed to build a few extension gems with additional panels, which didn't fully work in LI
+        * Added the Config class to allow for custom panel load paths
+          and many other extensions that don't work in the *use Middleware* declaration.
+
+It should be *even* easier to extend than LogicalInsight was, because extension gems can access the Config class
 and truly bolt-on cleanly.
 
 Having made really significant architectural changes, I'll be keeping Rack::Insight
-a separate project for the forseeable future.
+a separate project for the foreseeable future.
 
-* Forked From: [logical-insight](http://github.com/LRDesign/logical-insight), [documentation](http://lrdesign.github.com/rack-insight/)
+* Forked From: [logical-insight](http://github.com/LRDesign/logical-insight)
 * Which Was Forked From: [rack-bug](http://github.com/brynary/rack-bug)
 
 Description
@@ -33,12 +36,12 @@ Features
         * Rails Info
         * Timer
         * Request Variables
-        * SQL
-        * Active Record
         * Cache
         * Templates
-        * Log
+        * Log               (can configure which loggers to watch!)
         * Memory
+        * SQL               (Failing specs, and I don't use it, someone please pull me a fix!)
+        * Active Record     (Failing specs, and I don't use it, someone please pull me a fix!)
     * Other bundled panels:
         * Redis
         * Speedtracer
@@ -49,7 +52,7 @@ Features
         * Consistent interface to instrument application code
         * Consistent timing across panels
         * Easy to add sub-applications for more detailed reports (c.f. SQLPanel)
-        * The documentation is scarce, so there's a feeling of adventure :/
+        * Ask me (pboling) if you need help with this.
 
 Rails quick start
 ---------------------------
@@ -105,6 +108,24 @@ Options:
     :panel_load_paths => [File::join('rack', 'insight', 'panels')] (default)
                          See *Configuring custom panels* section for example usage
 
+    :panel_configs => This is a nested config, se below:
+
+      Panel level configuration options for all panels, including extension gems.
+      Currently this is implemented in the log_panel, and configured as:
+
+        Rack::Insight::Config.configure do |config|
+          config[:panel_configs][:log_panel] = {:watch => {'Logger' => :add}}
+        end
+
+      Example:  If you want all of your log statements in Rails to be traced twice by Rack::Insight,
+                this will do that because ActiveSupport::BufferedLogger utilizes Logger under the hood:
+
+        config[:panel_configs][:log_panel] = {:watch => {
+                "ActiveSupport::BufferedLogger" => :add,
+                "Logger" => :add
+        }}
+
+
 Configure Middleware
 --------------------
 
@@ -207,7 +228,7 @@ and Rack::Cache
 License
 -------
 
-See LICENSE in this directory.
+MIT. See LICENSE in this directory.
 
 Notes
 -----

data/lib/rack/insight/config.rb

@@ -9,6 +9,7 @@ module Rack::Insight
     @verbosity = true
     @rails_log_copy = true
     @filtered_backtrace = true
+    @panel_configs = {}
 
     DEFAULTS = {
       # You can augment or replace the default set of panel load paths.
@@ -26,7 +27,8 @@ module Rack::Insight
       :rails_log_copy => @rails_log_copy, # Only has effect when logger is the Rack::Insight::Logger, or a logger behaving like it
       # Can set a specific verbosity: Rack::Insight::Logging::VERBOSITY[:debug]
       :verbosity => @verbosity, # true is equivalent to relying soley on the log level of each logged message
-      :filtered_backtrace => @filtered_backtrace # Full backtraces, or filtered ones?
+      :filtered_backtrace => @filtered_backtrace, # Full backtraces, or filtered ones?
+      :panel_configs => @panel_configs # Allow specific panels to have their own configurations, and make it extensible
     }
 
     @config ||= DEFAULTS
@@ -38,9 +40,13 @@ module Rack::Insight
       @log_file = config[:log_file]
       @verbosity = config[:verbosity]
       @filtered_backtrace = config[:filtered_backtrace]
+      @panel_configs = config[:panel_configs]
       unless config[:panel_load_paths].kind_of?(Array)
         raise "Rack::Insight::Config.config[:panel_load_paths] is invalid: Expected kind of Array but got #{config[:panel_load_paths].class}"
       end
+      unless config[:panel_configs].kind_of?(Hash)
+        raise "Rack::Insight::Config.config[:panel_configs] is invalid: Expected kind of Hash but got #{config[:panel_configs].class}"
+      end
     end
 
     def self.logger

data/lib/rack/insight/database.rb

@@ -30,7 +30,10 @@ module Rack::Insight
       def retrieve(request_id)
         @table.for_request(request_id)
       end
-      alias retreive retrieve #JDL cannot spell
+
+      def count(request_id)
+        @table.count_for_request(request_id)
+      end
 
       def table_length
         @table.length
@@ -107,6 +110,10 @@ module Rack::Insight
         execute("select #{which_sql} from #@table_name where #{condition_sql}")
       end
 
+      def count(condition_sql)
+        execute("select count(*) from #@table_name where #{condition_sql}")
+      end
+
       def fields_sql
         "#{@keys.join(",")}"
       end
@@ -179,10 +186,18 @@ module Rack::Insight
         select("value", key_sql).map{|value| decode_value(value.first)}
       end
 
+      def count_entries(key_sql)
+        count(key_sql).first.first
+      end
+
       def for_request(id)
         retrieve("request_id = #{id}")
       end
 
+      def count_for_request(id)
+        count_entries("request_id = #{id}")
+      end
+
       def to_a
         super.map do |row|
           row[-1] = decode_value(row[-1])

data/lib/rack/insight/panels/cache_panel.rb

@@ -57,8 +57,6 @@ module Rack::Insight
     end
 
     def content_for_request(number)
-      # TODO: What is this syntax with the double {{}}?
-      logger.debug{{ :req_num => number }} if verbose(:debug)
       stats = retrieve(number).first
       render_template "panels/cache", :stats => stats
     end

data/lib/rack/insight/panels/log_panel.rb

@@ -23,12 +23,27 @@ module Rack::Insight
 
     def initialize(app)
       probe(self) do
-        instrument "ActiveSupport::BufferedLogger" do
-          instance_probe :add
-        end
-
-        instrument "Logger" do
-          instance_probe :add
+        if !Rack::Insight::Config.config[:panel_configs][:log_panel].respond_to?(:[])
+          # Trying to be smart...
+          if defined?(ActiveSupport)
+            instrument "ActiveSupport::BufferedLogger" do
+              instance_probe :add
+            end
+          else
+            instrument "Logger" do
+              instance_probe :add
+            end
+          end
+        else
+          # User has explicitly declared what log classes to monitor:
+          #   Rack::Insight::Config.configure do |config|
+          #     config[:panel_configs][:log_panel] = {:watch => {'Logger' => :add}}
+          #   end
+          Rack::Insight::Config.config[:panel_configs][:log_panel][:watch].each do |klass, method_probe|
+            instrument klass do
+              instance_probe method_probe
+            end
+          end
         end
       end
 
@@ -41,8 +56,9 @@ module Rack::Insight
       "log"
     end
 
-    def heading
-      "Log"
+    def heading_for_request(number)
+      num = count(number)
+      "Logs (#{num})"
     end
 
     def content_for_request(number)

data/lib/rack/insight/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Insight
 
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 
   end
 end

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

@@ -3,7 +3,7 @@
 <thead>
   <tr>
     <th>Level</th>
-    <th>Time</th>
+    <th>&#916 Time</th>
     <th>Message</th>
   </tr>
 </thead>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-insight
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors: