maiha-merb_inspector 0.2.2 → 0.2.3

data/Rakefile

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

data/inspectors/data_mapper.rb

@@ -18,9 +18,9 @@ class DataMapper::ResourceInspector < Merb::Inspector
       model.properties
     end
 
-    def record_id
+    def dom_id
       oid = @object.new_record? ? "new" : @object.id
-      "#{resource_name}_#{oid}"
+      "#{resource_name}-#{oid}"
     end
 
     def template
@@ -31,10 +31,6 @@ class DataMapper::ResourceInspector < Merb::Inspector
       end
     end
 
-    def toggle
-      "$('##{record_id} .record').toggle();return false;"
-    end
-
     def save_action
       if @object.new_record?
         "/" + resource_name
@@ -68,6 +64,38 @@ class DataMapper::ResourceInspector < Merb::Inspector
       link_to label, resource(record, :edit), opts
     rescue Merb::Router::GenerationError
     end
+
+    ######################################################################
+    ### form builder for DataMapper
+
+    def column_header(p)
+      label = p.name.to_s
+      h(label)
+#       link_to label, "#", :onclick=>"return false;"
+    end
+
+    def column_value(record, p)
+      h(record.send p.name.to_s)
+    end
+
+    def column_form(record, p)
+      # first, search class prefixed method that user override
+      method = "#{Extlib::Inflection.demodulize(record.class.name)}_#{p.name}_form"
+      return send(method, record, p) if respond_to?(method, true)
+
+      # second, search method that user override
+      method = "#{p.name}_form"
+      return send(method, record, p) if respond_to?(method, true)
+
+      # second, guess form from property type
+      if p.type == ::DataMapper::Types::Serial
+        record.send p.name
+      elsif p.type == ::DataMapper::Types::Text
+        text_area p.name
+      else
+        text_field p.name
+      end
+    end
 end
 
 

data/lib/merb_inspector/helper.rb

@@ -4,46 +4,22 @@ module Merb
       def inspect(object = nil, options = {})
         return super() unless object
 
-        options = {:action=>options} if options.is_a?(Symbol)
-        action    = options[:action] || :show
+        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({}))
 
-        if inspector.respond_to?(action)
-          inspector.send action, object, options
+        if inspector.respond_to?(options[:action])
+          inspector.send options[:action], object, options
         else
-          message = "%s doesn't recognize '%s' action" % [inspector.class, action]
+          message = "%s doesn't recognize '%s' action" % [inspector.class, options[:action]]
           raise Merb::Inspector::ActionNotFound, message
         end
       end
-
-      def column_header(p)
-        label = p.name.to_s
-        h(label)
-#       link_to label, "#", :onclick=>"return false;"
-      end
-
-      def column_value(record, p)
-        h(record.send p.name.to_s)
-      end
-
-      def column_form(record, p)
-        # first, search class prefixed method that user override
-        method = "#{Extlib::Inflection.demodulize(record.class.name)}_#{p.name}_form"
-        return send(method, record, p) if respond_to?(method, true)
-
-        # second, search method that user override
-        method = "#{p.name}_form"
-        return send(method, record, p) if respond_to?(method, true)
-
-        # second, guess form from property type
-        if p.type == ::DataMapper::Types::Serial
-          record.send p.name
-        elsif p.type == ::DataMapper::Types::Text
-          text_area p.name
-        else
-          text_field p.name
-        end
-      end
     end
   end
 end
+
+class Merb::Controller
+  include Merb::Inspector::Helper
+end

data/lib/merb_inspector/inspector.rb

@@ -1,5 +1,5 @@
 module Merb
-  class Inspector < Application
+  class Inspector < Merb::Controller
     ######################################################################
     ### for exceptins
 
@@ -16,19 +16,13 @@ module Merb
       Inspector
     end
 
-    def self.log(message)
-      path = Merb.root / "log" / "inspector.log"
-      message = "[Inspector] %s" % message.to_s.strip
-      File.open(path, "a+") {|f| f.puts message}
-    end
+    ######################################################################
+    ### for class
 
     def self.model(model, inspector = self)
       Merb::Inspector::Manager.register(model, inspector)
     end
 
-    ######################################################################
-    ### for class
-
     def show(object, options = {})
       @object  = object
       @options = options
@@ -41,6 +35,14 @@ module Merb
         self.class.name.sub(/^Merb::/,'').sub(/Inspector$/,'').snake_case.gsub(/::/, '/')
       end
 
+      def dom_id
+        @object.class.name.plural.snake_case.gsub(/::/,'-') + '-' + @object.object_id.to_s
+      end
+
+      def toggle
+        "$('##{dom_id} .reversible').toggle();return false;"
+      end
+
       def dir
         Merb::Inspector.root + "templates" + name
       end
@@ -66,7 +68,11 @@ module Merb
       end
 
       def basic_options
-        {:inspector=>self, :options=>@options, :dir=>dir, :id=>@object.object_id}
+        {:options=>@options, :level=>@options[:level]}
+      end
+
+      def child_options
+        {:level=>@options[:level]+1}
       end
   end
 

data/lib/merb_inspector/manager.rb

@@ -9,11 +9,30 @@ module Merb
         attr_accessor :caches
       end
 
-      self.stores = Hash.new
-      self.caches = Hash.new
-
       def self.reset
+        self.stores = Hash.new
         self.caches = Hash.new
+
+        File.unlink Merb.root / "log" / "inspector.log"
+        load_builtin_inspectors
+      end
+
+      def self.load_builtin_inspectors
+        inspector_dir = File.dirname(__FILE__) / "../../inspectors"
+        Dir["#{inspector_dir}/*.rb"].sort.each do |file|
+          begin
+            require file
+          rescue Exeption  => error
+            message = "[MerbInspector] load error: #{error} (#{error.class})"
+            Merb.logger.error message
+          end
+        end
+      end
+
+      def self.log(message)
+        path = Merb.root / "log" / "inspector.log"
+        message = "[Inspector] %s" % message.to_s.strip
+        File.open(path, "a+") {|f| f.puts message}
       end
 
       def self.register(klass, inspector)
@@ -40,12 +59,6 @@ module Merb
         return stores[klass]
       end
 
-      def self.log(message)
-        path = Merb.root / "log" / "inspector.log"
-        message = "[Inspector] %s" % message.to_s.strip
-        File.open(path, "a+") {|f| f.puts message}
-      end
-
       ######################################################################
       ### Install
 

data/lib/merb_inspector.rb

@@ -9,30 +9,18 @@ if defined?(Merb::Plugins)
   }
   
   Merb::BootLoader.before_app_loads do
-    # require code that must be loaded before the application
-  end
-  
-  Merb::BootLoader.after_app_loads do
-    inspector_dir = File.dirname(__FILE__) / "../inspectors"
-
     require "merb_inspector" / "inspector"
     require "merb_inspector" / "manager"
     require "merb_inspector" / "helper"
-
-    Dir["#{inspector_dir}/*.rb"].sort.each do |file|
-      begin
-        require file
-      rescue Exeption  => error
-        message = "[MerbInspector] load error: #{error} (#{error.class})"
-        Merb.logger.error message
-      end
-    end
-
-    class ::Application
-      include Merb::Inspector::Helper
-    end
-
+  end
+  
+  Merb::BootLoader.after_app_loads do
+    Merb::Inspector::Manager.reset
     Merb::Inspector::Manager.install
+
+#     class ::Application
+#       include Merb::Inspector::Helper
+#     end
   end
   
   Merb::Plugins.add_rakefiles "merb_inspector/merbtasks"

data/templates/array/_default.html.erb

@@ -1,3 +1,7 @@
+<div id="<%= dom_id %>">
+
+<div id="<%= dom_id %>_level1" class="reversible" style="display:<%= (level == 1) ? 'display' : 'none' %>">
+<div style="float:right;"><%= link_to "[x]", "#", :onclick=>toggle %></div>
 <table class="inspector">
 <tr>
   <th><p>index</p></th>
@@ -7,12 +11,19 @@
 <%- @object.each_with_index do |obj, i| -%>
 <%-
 tr_class = (i % 2 == 0) ? "even-record" : ""
-tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
+tr_class += " #{list_row_class(obj)}" if respond_to? :list_row_class
 -%>
 <tr class="record <%=tr_class%>">
-  <td><%=i+1%></td>
-  <td><%=h obj.inspect %></td>
+  <td align=center><%=i+1%></td>
+  <td><%= inspect obj, child_options %></td>
   <td><%=h obj.class.name %></td>
 </tr>
 <%- end -%>
 </table>
+</div>
+
+<div id="<%= dom_id %>_level2" class="reversible" style="display:<%= (level == 1) ? 'none' : 'display' %>">
+<%= link_to h(@object.inspect.truncate), "#", :onclick=>toggle %>
+</div>
+
+</div>

data/templates/data_mapper/resource/_record.html.erb

@@ -1,5 +1,5 @@
-<div id="<%=record_id%>">
-<div id="<%=record_id%>_show" class="record show" style="display:<%= (@mode == :edit) ? 'none' : 'display' %>">
+<div id="<%=dom_id%>">
+<div id="<%=dom_id%>_show" class="reversible record show" style="display:<%= (@mode == :edit) ? 'none' : 'display' %>">
 <table>
   <tbody>
 <%- columns.each do |p| -%>
@@ -17,7 +17,7 @@
 </table>
 </div>
 
-<div id="<%=record_id%>_edit" class="record edit" style="display:<%= (@mode == :edit)  ? 'display' : 'none' %>">
+<div id="<%=dom_id%>_edit" class="reversible record edit" style="display:<%= (@mode == :edit)  ? 'display' : 'none' %>">
 <%= form_for record, :action=>save_action do %>
 <table>
   <tbody>

data/templates/hash/_default.html.erb

@@ -1,3 +1,7 @@
+<div id="<%= dom_id %>">
+<div id="<%= dom_id %>_level1" class="reversible" style="display:<%= (level == 1) ? 'display' : 'none' %>">
+<div style="float:right;"><%= link_to "[x]", "#", :onclick=>toggle %></div>
+
 <table class="inspector">
 <tr>
   <th><p>key</p></th>
@@ -8,12 +12,19 @@
 <%-   obj = @object[key] -%>
 <%-
 tr_class = (i % 2 == 0) ? "even-record" : ""
-tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
+tr_class += " #{list_row_class(obj)}" if respond_to? :list_row_class
 -%>
 <tr class="record <%=tr_class%>">
-  <td><%=h key.inspect %></td>
-  <td><%=h obj.inspect %></td>
+  <td><%= inspect key, child_options %></td>
+  <td><%= inspect obj, child_options %></td>
   <td><%=h obj.class.name %></td>
 </tr>
 <%- end -%>
 </table>
+</div>
+
+<div id="<%= dom_id %>_level2" class="reversible" style="display:<%= (level == 1) ? 'none' : 'display' %>">
+<%= link_to h(@object.inspect.truncate), "#", :onclick=>toggle %>
+</div>
+
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Maiha
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -08:00
+date: 2008-12-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency