rack-insight 0.5.7 → 0.5.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.5.8 / 2012-09-03 (Peter Boling)
+
+  * Bug Fixes
+
+    * working template_root for rack-insight extension libraries
+
 == 0.5.7 / 2012-09-03 (Peter Boling)
 
   * Bug Fixes

data/Gemfile.lock

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

data/lib/rack/insight/app.rb

@@ -160,17 +160,17 @@ module Rack::Insight
     def ip_authorized?
       return true unless options["rack-insight.ip_masks"]
 
-      logger.info{ "Checking #{@original_request.ip} against ip_masks" } if verbose(:low)
+      logger.info{ "Checking #{@original_request.ip} against ip_masks" } if verbose(:high)
       ip = IPAddr.new(@original_request.ip)
 
       mask = options["rack-insight.ip_masks"].find do |ip_mask|
         ip_mask.include?(ip)
       end
       if mask
-        logger.info{ "Matched #{mask}" } unless verbose(:silent)
+        logger.info{ "Matched #{mask}" } if verbose(:high)
         return true
       else
-        logger.info{ "Matched no masks" } unless verbose(:silent)
+        logger.info{ "Matched no masks" } if verbose(:high)
         return false
       end
     end

data/lib/rack/insight/config.rb

@@ -30,7 +30,7 @@ module Rack::Insight
     @config ||= DEFAULTS
     def self.configure &block
       yield @config
-      logger.debug("Config#configure:\n  called from: #{caller[0]}\n  with: #{@config}")
+      logger.debug("Rack::Insight::Config#configure:\n  called from: #{caller[0]}\n  with: #{@config}") if config[:verbosity] == true || config[:verbosity].respond_to?(:<) && config[:verbosity] <= 1
       @logger = config[:logger]
       @log_level = config[:log_level]
       @log_file = config[:log_file]

data/lib/rack/insight/panel.rb

@@ -17,6 +17,9 @@ module Rack::Insight
     attr_reader :request
 
     class << self
+
+      include Rack::Insight::Logging
+
       attr_accessor :template_root
       def file_index
         return @file_index ||= Hash.new do |h,k|
@@ -41,31 +44,34 @@ module Rack::Insight
         Thread::current['rack-panel_file'] = old_rel
       end
 
+      def set_sub_class_template_root(sub_class, path)
+        sub_class.template_root = path
+      end
+
       def current_panel_file(sub)
-        return Thread::current['rack-panel_file'] ||
-          begin
-            file_name = nil
-            matched_line = nil
-            caller.each do |line|
-              # First make sure we are not matching rack-insight's own panel class, which will be in the caller stack,
-              # and which may match some custom load path added (try adding 'rack' as a custom load path!)
-              next if line =~ /rack-insight.*\/lib\/rack\/insight\/panel.rb:/
-              Rack::Insight::Config.config[:panel_load_paths].each do |load_path|
-                regex = %r{^[^:]*#{load_path}/([^:]*)\.rb:}
-                md = regex.match line
-                file_name = md[1] unless md.nil?
-                matched_line = line unless file_name.nil?
-                break unless file_name.nil?
-              end
-              break unless file_name.nil?
-            end
-            sub.template_root = File.dirname(matched_line.split(':')[0]) if matched_line.respond_to?(:split)
-            file_name
+        file_name = nil
+        matched_line = nil
+        caller.each do |line|
+          # First make sure we are not matching rack-insight's own panel class, which will be in the caller stack,
+          # and which may match some custom load path added (try adding 'rack' as a custom load path!)
+          # .*panel because the panels that ship with rack-insight also do not need custom template roots.
+          next if line =~ /rack-insight.*\/lib\/rack\/insight\/.*panel.rb:/
+          Rack::Insight::Config.config[:panel_load_paths].each do |load_path|
+            regex = %r{^[^:]*#{load_path}/([^:]*)\.rb:}
+            md = regex.match line
+            file_name = md[1] unless md.nil?
+            matched_line = line unless file_name.nil?
+            break unless file_name.nil?
           end
+          break unless file_name.nil?
+        end
+        set_sub_class_template_root(sub, File.dirname(matched_line.split(':')[0])) if matched_line.respond_to?(:split)
+        return Thread::current['rack-panel_file'] || file_name
       end
 
       def inherited(sub)
         if filename = current_panel_file(sub)
+          logger.debug("panel inherited by #{sub.inspect} with template_root: #{sub.template_root}") if verbose(:high)
           Panel::file_index[filename] << sub
         else
           warn "Rack::Insight::Panel inherited by #{sub.name} outside rack-insight's :panel_load_paths.  Discarded.  Configured panel load paths are: #{Rack::Insight::Config.config[:panel_load_paths].inspect}"

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

@@ -1,4 +1,3 @@
-
 module Rack::Insight
 
   class CachePanel < Panel

data/lib/rack/insight/public/__insight__/insight.css

@@ -22,22 +22,22 @@
   right:0;
   cursor: pointer;
 }
-.insight_bottom #rack-insight_toolbar {
+.rack-insight_bottom #rack-insight_toolbar {
   bottom:0;
   border-top: 2px solid #234f32;
 }
-.insight_top #rack-insight_toolbar {
+.rack-insight_top #rack-insight_toolbar {
   top:0;
   border-bottom: 2px solid #234f32;
 }
 
-.insight_error #rack-insight_toolbar {
+.rack-insight_error #rack-insight_toolbar {
   background: #ff0000;
   color: #fff;
   border: none;
 }
 
-.insight_error #rack-insight_toolbar p {
+.rack-insight_error #rack-insight_toolbar p {
   margin-top: 6px;
   margin-left: 15px;
   font-weight: bold;
@@ -104,11 +104,11 @@
   overflow: auto;
 }
 
-#rack-insight.insight_top .panel_content {
+#rack-insight.rack-insight_top .panel_content {
   top: 32px;
 }
 
-#rack-insight.insight_bottom .panel_content {
+#rack-insight.rack-insight_bottom .panel_content {
   bottom: 32px;
 }
 
@@ -202,10 +202,10 @@
   margin-left: 10px;
 }
 
-#rack-insight .panel_content table tr.odd td.insight_spinner,
-#rack-insight .panel_content table tr.even td.insight_spinner,
-#rack-insight .panel_content table td.insight_spinner,
-#rack-insight .insight_spinner {
+#rack-insight .panel_content table tr.odd td.rack-insight_spinner,
+#rack-insight .panel_content table tr.even td.rack-insight_spinner,
+#rack-insight .panel_content table td.rack-insight_spinner,
+#rack-insight .rack-insight_spinner {
   background-image: url(/__insight__/spinner.gif);
   background-repeat: no-repeat;
   background-position: center center;

data/lib/rack/insight/render.rb

@@ -49,33 +49,13 @@ module Rack::Insight
       end
     end
 
-    #def compiled_source(filename)
-    #  primary_file_path = ::File.join(::File.dirname(__FILE__), "views/#{filename}.html.erb")
-    #  file = nil
-    #  begin
-    #    file = ::File.read(primary_file_path)
-    #  rescue Errno::ENOENT
-    #  end
-    #  if file.nil?
-    #    Rack::Insight::Config.config[:panel_load_paths].each do |load_path|
-    #      begin
-    #        file = ::File.read(::File.join(load_path, "#{filename}.html.erb"))
-    #        break # If no error is raised then the file was read!
-    #      rescue Errno::ENOENT
-    #      end
-    #    end
-    #  end
-    #  if file
-    #    ::ERB.new(file, nil, "-").src
-    #  else
-    #    logger.fatal("Rack::Insight: Unable to find expected view template #{primary_file_path} or a #{filename}.html.erb template in rack-insight's :panel_load_paths.  Configured panel load paths are: #{Rack::Insight::Config.config[:panel_load_paths].inspect}")
-    #  end
-    #end
-
     def compiled_source(filename)
       templates = []
       templates << ::File.join(::File.dirname(__FILE__), "views/#{filename}.html.erb")
-      templates << ::File.join(::File.join(self.class.template_root, "#{filename}.html.erb")) if self.class.respond_to?(:template_root)
+      if self.class.respond_to?(:template_root) && !self.class.template_root.nil?
+        # Push onto the front of the array to try because if there is a template root it is the most likely place to find the view.
+        templates.unshift(::File.join(::File.join(self.class.template_root, "#{filename}.html.erb")))
+      end
       file = nil
       templates.each do |template_path|
         begin

data/lib/rack/insight/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Insight
 
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 
   end
 end

data/lib/rack/insight/views/enable-button.html.erb

@@ -13,7 +13,8 @@
   }
 
   #rack-insight-enabler:hover {
-    width: 50px;
+    width: auto;
+    padding:5px;
     height: 24px;
   }
 </style>

metadata

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