rack-insight 0.5.22 → 0.5.23

data/CHANGELOG

@@ -1,5 +1,27 @@
 == HEAD
 
+== 0.5.23 / 2012-09-14
+
+  * New Features
+
+    * No longer rescue Object, and instead rescue Standard Error.
+      If this is a problem strange non-StandardErrors should be wrapped. (pboling - Peter Boling)
+
+    * Refactor Panel error handling. (pboling - Peter Boling)
+
+      Create error handling method: `handle_error_for(method_name, exception)`
+        Logs the error.
+        Returns HTML for the view.
+        Simplifies error handling in any panel that overrides one of:
+          content, heading, content_for_request and heading_for_request
+        like this:
+
+          def content
+            # Do stuff
+          rescue StandardError => ex
+            handle_error_for(method_name, ex)
+          end
+
 == 0.5.22 / 2012-09-14
 
   * New Features

data/lib/rack/insight/database.rb

@@ -75,7 +75,7 @@ module Rack::Insight
         @db = SQLite3::Database.new(database_path)
         @db.execute("pragma foreign_keys = on")
         @db
-      rescue Object => ex
+      rescue StandardError => ex
         msg = "Issue while loading SQLite DB:" + [ex.class, ex.message, ex.backtrace[0..4]].inspect
         logger.error{ msg }
 

data/lib/rack/insight/panel.rb

@@ -244,13 +244,8 @@ module Rack::Insight
           heading
         end
       end
-    rescue Object => ex
-      nom = self.name rescue "xxx"
-      msg = ["Failed to create heading_for_request for #{nom}","#{ex.class}: #{ex.message}"] + ex.backtrace
-      logger.error(msg.join("\n"))
-      "Err3: #{nom}
-      <!-- Panel: #{self.inspect}\n
-      #{msg.join("\n")} -->"
+    rescue StandardError => exception
+      handle_error_for('heading_for_request', exception)
     end
 
     def content_for_request(number)
@@ -270,34 +265,29 @@ module Rack::Insight
       else
         content
       end
-    rescue Object => ex
-      nom = self.name rescue "xxx"
-      msg = ["Failed to create content_for_request for #{nom}","#{ex.class}: #{ex.message}"] + ex.backtrace
-      logger.error(msg.join("\n"))
-      "Err4: #{nom}
-      <!-- Panel: #{self.inspect}\n
-      #{msg.join("\n")} -->"
+    rescue StandardError => exception
+      handle_error_for('content_for_request', exception)
     end
 
     def heading
       self.camelized_name
-    rescue Object => ex
-      nom = self.name rescue "xxx"
-      msg = ["Failed to create heading for #{nom}","#{ex.class}: #{ex.message}"] + ex.backtrace
-      logger.error(msg.join("\n"))
-      "Err1: #{nom}
-      <!-- Panel: #{self.inspect}\n
-      #{msg.join("\n")} -->"
+    rescue StandardError => exception
+      handle_error_for('heading', exception)
     end
 
     def content
       logger.info("Rack::Insight is using default content for #{self.class}") if verbose(:med)
       render_template 'no_content', :name => self.camelized_name
-    rescue Object => ex
+    rescue StandardError => exception
+      handle_error_for('content', exception)
+    end
+
+    def handle_error_for(method_name, exception)
       nom = self.name rescue "xxx"
-      msg = ["Failed to create content for #{nom}","#{ex.class}: #{ex.message}"] + ex.backtrace
+      msg = ["#{self.class}##{method_name} failed","#{exception.class}: #{exception.message}"] + exception.backtrace
       logger.error(msg.join("\n"))
-      "Err2: #{nom}
+      # return HTML
+      "Error in #{nom}
       <!-- Panel: #{self.inspect}\n
       #{msg.join("\n")} -->"
     end

data/lib/rack/insight/render.rb

@@ -40,7 +40,7 @@ module Rack::Insight
 
       begin
         CompiledTemplates.module_eval(source, filename, 0)
-      rescue Object => ex
+      rescue StandardError => ex
         logger.error do
           "#{ex.class.name}: #{ex.message} in\n" +
           source +

data/lib/rack/insight/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Insight
 
-  VERSION = '0.5.22'
+  VERSION = '0.5.23'
 
   end
 end

data/lib/rack/insight/views/headers_fragment.html.erb

@@ -12,7 +12,7 @@
         <%= panel.heading_for_request(request_id) %>
       </a>
     <% end %>
-  <% rescue Object => ex %>
+  <% rescue StandardError => ex %>
     Err5: <%= panel.name rescue "xxx" %>
     <!-- Panel: <%= panel.inspect %> -->
     <!-- <%= ([ex.class.name, ex.message] + ex.backtrace).join("\n") %> -->

data/lib/rack/insight/views/request_fragment.html.erb

@@ -16,8 +16,8 @@
         </div>
         <% begin %>
           <%=  panel.content_for_request(request_id) %>
-        <% rescue Object => ex %>
-          <%= "Error #{ex.class.name}: #{ex.message} <!-- #{ex.backtrace[0..5]} -->" %>
+        <% rescue StandardError => ex %>
+          <%= "Error #{ex.class.name}: #{ex.message} <!-- #{ex.backtrace.join("\n")} -->" %>
         <% end %>
       </div>
     <% end %>

metadata

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