maiha-merb_inspector 0.2.4 → 0.2.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME    = "merb_inspector"
-GEM_VERSION = "0.2.4"
+GEM_VERSION = "0.2.5"
 AUTHOR      = "Maiha"
 EMAIL       = "maiha@wota.jp"
 HOMEPAGE    = "http://github.com/maiha/merb_inspector"

data/inspectors/basic.rb

@@ -0,0 +1,3 @@
+class BasicInspector < Merb::Inspector
+  model Merb::Request, StringIO, IO, String, Symbol, Numeric, Class
+end

data/inspectors/object.rb

@@ -0,0 +1,10 @@
+class ObjectInspector < Merb::Inspector
+  private
+    def template
+      if instance_variables.empty?
+        :plain
+      else
+        :default
+      end
+    end
+end

data/lib/merb_inspector/helper.rb

@@ -2,13 +2,18 @@ module Merb
   class Inspector
     module Helper
       def inspect(object = nil, options = {})
-        return super() unless object
+        return h(super()) unless object
 
         options = options.is_a?(Hash) ? options : {:action=>options}
-        options[:action] ||= :show
-        options[:level]  ||= 1
-        inspector = (Manager.lookup(object) || Merb::Inspector.default).new(Merb::Request.new({}))
+        options[:action]    ||= :show
+        options[:level]     ||= 1
+        options[:max_level] ||= 3
 
+        inspector_class = BasicInspector if object == self
+        inspector_class = BasicInspector if options[:level] >= options[:max_level]
+        inspector_class ||= Manager.lookup(object) || Merb::Inspector.default
+
+        inspector = inspector_class.new(Merb::Request.new({}))
         if inspector.respond_to?(options[:action])
           inspector.send options[:action], object, options
         else

data/lib/merb_inspector/inspector.rb

@@ -13,14 +13,16 @@ module Merb
     end
 
     def self.default
-      Inspector
+      ObjectInspector
     end
 
     ######################################################################
     ### for class
 
-    def self.model(model, inspector = self)
-      Merb::Inspector::Manager.register(model, inspector)
+    def self.model(*models)
+      models.each do |model|
+        Merb::Inspector::Manager.register(model, self)
+      end
     end
 
     def self.lead(options = {})
@@ -113,7 +115,7 @@ module Merb
       end
 
       def child_options
-        {:level=>@options[:level]+1}
+        {:level=>@options[:level]+1, :max_level=>@options[:max_level]}
       end
 
       def wrapped_main

data/lib/merb_inspector/manager.rb

@@ -13,7 +13,8 @@ module Merb
         self.stores = Hash.new
         self.caches = Hash.new
 
-        File.unlink Merb.root / "log" / "inspector.log"
+        log = Merb.root / "log" / "inspector.log"
+        File.unlink log if File.exist?(log)
         load_builtin_inspectors
       end
 
@@ -22,8 +23,8 @@ module Merb
         Dir["#{inspector_dir}/*.rb"].sort.each do |file|
           begin
             require file
-          rescue Exeption  => error
-            message = "[MerbInspector] load error: #{error} (#{error.class})"
+          rescue Exception => error
+            message = "[MerbInspector] load error: #{error} (#{error.class})\n#{error.backtraces.first rescue nil}"
             Merb.logger.error message
           end
         end

data/templates/basic/_default.html.erb

@@ -0,0 +1 @@
+<span class=nowrap><%=h @object.inspect.truncate(80) %></span>

data/templates/object/_default.html.erb

@@ -0,0 +1,19 @@
+<table class="inspector">
+<tr>
+  <th><p>key</p></th>
+  <th><p>value</p></th>
+  <th><p>type</p></th>
+</tr>
+<%- @object.instance_variables.sort.each_with_index do |key, i| -%>
+<%-   obj = @object.instance_variable_get(key) -%>
+<%-
+tr_class = (i % 2 == 0) ? "even-record" : ""
+tr_class += " #{list_row_class(obj)}" if respond_to? :list_row_class
+-%>
+<tr class="record <%=tr_class%>">
+  <td><%=h key %></td>
+  <td><%#h obj.inspect %><%= inspect obj, child_options rescue "error" %></td>
+  <td><%=h obj.class.name %></td>
+</tr>
+<%- end -%>
+</table>

data/templates/object/_plain.html.erb

@@ -0,0 +1 @@
+<%=h @object.inspect %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Maiha
@@ -44,14 +44,21 @@ files:
 - lib/merb_inspector.rb
 - spec/spec_helper.rb
 - spec/merb_inspector_spec.rb
+- inspectors/object.rb
 - inspectors/hash.rb
+- inspectors/basic.rb
 - inspectors/data_mapper.rb
 - inspectors/array.rb
 - templates/hash
 - templates/hash/_default.html.erb
 - templates/_default.html.erb
+- templates/basic
+- templates/basic/_default.html.erb
 - templates/array
 - templates/array/_default.html.erb
+- templates/object
+- templates/object/_plain.html.erb
+- templates/object/_default.html.erb
 - templates/data_mapper
 - templates/data_mapper/resource
 - templates/data_mapper/resource/_record.html.erb