maiha-merb_inspector 0.2.6 → 0.2.7

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME    = "merb_inspector"
-GEM_VERSION = "0.2.6"
+GEM_VERSION = "0.2.7"
 AUTHOR      = "Maiha"
 EMAIL       = "maiha@wota.jp"
 HOMEPAGE    = "http://github.com/maiha/merb_inspector"
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 1.0.7')
+  s.add_dependency('merb', '>= 1.0.8')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,inspectors,templates,mirror}/**/*")
   

data/inspectors/data_mapper.rb

@@ -76,7 +76,21 @@ class DataMapper::ResourceInspector < Merb::Inspector
     end
 
     def column_value(record, p)
-      h(record.send p.name.to_s)
+      # first, search class prefixed method that user override
+      method = "#{Extlib::Inflection.demodulize(record.class.name)}_#{p.name}_column"
+      return send(method, record, p) if respond_to?(method, true)
+
+      # second, search method that user override
+      method = "#{p.name}_column"
+      return send(method, record, p) if respond_to?(method, true)
+
+      # finally, guess form from property type
+      value = record.send(p.name)
+      if p.type == ::DataMapper::Types::Text
+        value.to_s.split(/\r?\n/).map{|i| h(i.to_s)}.join("<BR>")
+      else
+        h(value.to_s)
+      end
     end
 
     def column_form(record, p)
@@ -88,7 +102,7 @@ class DataMapper::ResourceInspector < Merb::Inspector
       method = "#{p.name}_form"
       return send(method, record, p) if respond_to?(method, true)
 
-      # second, guess form from property type
+      # finally, guess form from property type
       if p.type == ::DataMapper::Types::Serial
         record.send p.name
       elsif p.type == ::DataMapper::Types::Text

data/lib/merb_inspector/helper.rb

@@ -1,8 +1,10 @@
 module Merb
   class Inspector
     module Helper
-      def inspect(object = nil, options = {})
-        return h(super()) unless object
+      def inspect(*args)
+        return h(super()) if args.blank?
+        object  = args.shift
+        options = args.shift || {}
 
         options = options.is_a?(Hash) ? options : {:action=>options}
         options[:action]    ||= :show

data/lib/merb_inspector/manager.rb

@@ -43,10 +43,19 @@ module Merb
       end
 
       def self.lookup(object)
+        # first, search object itself for mainly class stuff
+        if stores.has_key?(object)
+          log "lookup: %s => %s" % [object, stores[object]]
+          return stores[object]
+        end
+
+        # second, search its class
         if caches.has_key?(object.class)
           log "lookup: %s => %s (cached)" % [object.class, caches[object.class] || 'nil']
           return caches[object.class]
         end
+
+        # finally, search ancestors of the class
         klass = object.class.ancestors.find{|klass|
           log "lookup:   %s = %s ... %s" % [object.class, klass, stores[klass]]
           stores.has_key?(klass)

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

@@ -5,7 +5,7 @@
 <%- columns.each do |p| -%>
     <tr>
       <th><%= column_header(p) %></th>
-      <td><%=h column_value(record, p) %></td>
+      <td><%= column_value(record, p) %></td>
     </tr>
 <%- end -%>
     <tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Maiha
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -08:00
+date: 2009-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.7
+        version: 1.0.8
     version: 
 description: Merb plugin that provides powerful 'inspect' helper method
 email: maiha@wota.jp