maiha-merb_inspector 0.2.8 → 0.2.9

data/Rakefile

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

data/inspectors/data_mapper.rb

@@ -20,13 +20,7 @@ class DataMapper::ResourceInspector < Merb::Inspector
     end
 
     def columns
-      if @options[:only]
-        klass.properties.select{|p| @options[:only].map(&:to_s).include?(p.name.to_s)}
-      elsif @options[:except]
-        klass.properties.reject{|p| @options[:except].map(&:to_s).include?(p.name.to_s)}
-      else
-        klass.properties
-      end
+      @columns ||= build_columns
     end
 
     def dom_id
@@ -66,59 +60,82 @@ class DataMapper::ResourceInspector < Merb::Inspector
     rescue Merb::Router::GenerationError
     end
 
-    def link_to_show(record = @object, label = 'Show', opts = {})
-      link_to label, resource(record), opts
+    def show_link_value(record, p, opts = {})
+      opts[:label] ||= "Show"
+      link_to opts[:label], resource(record), opts
     rescue Merb::Router::GenerationError
     end
 
-    def link_to_edit(record = @object, label = 'Edit', opts = {})
-      link_to label, resource(record, :edit), opts
+    def edit_link_value(record, p, opts = {})
+      opts[:label] ||= "Edit"
+      link_to opts[:label], resource(record, :edit), opts
+    rescue Merb::Router::GenerationError
+    end
+
+    def delete_link_value(record, p, opts = {})
+      opts[:label] ||= "Delete"
+      link_to opts[:label], resource(record, :delete), 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;"
+    def default_columns
+      [LinkColumn.new(self, :show), LinkColumn.new(self, :edit)]
     end
 
-    def column_value(record, p)
-      # 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>")
+    def build_columns
+      if @options[:only]
+        cols = @options[:only].map{|name|
+          name = name.to_s.intern
+          klass.properties.find{|p| p.name == name} || name
+        }
+      elsif @options[:except]
+        cols = klass.properties.reject{|p| @options[:except].map(&:to_s).include?(p.name.to_s)} + default_columns
       else
-        h(value.to_s)
+        cols = klass.properties + default_columns
+      end
+
+      cols.map do |col|
+        case col
+        when ::DataMapper::Property
+          DMColumn.new(self, col)
+        when Column
+          col
+        else
+          VirtualColumn.new(self, col)
+        end
       end
     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)
+    def column_label(column)
+      column.label
+    end
+
+    def column_value(record, column)
+      column.value(record)
+    rescue Column::MethodFound => e
+      __send__ *e.args
+    rescue Column::NotDefined => e
+      call_user_method(e.message, record, column)
+    end
 
-      # second, search method that user override
-      method = "#{p.name}_form"
-      return send(method, record, p) if respond_to?(method, true)
+    def column_form(record, column)
+      column.form(record)
+    rescue Column::MethodFound => e
+      __send__ *e.args
+    rescue Column::NotDefined => e
+      call_user_method(e.message, record, column)
+    end
 
-      # finally, 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
+    def call_user_method(method, record, column)
+      method = method.to_sym
+      block  = @options[:columns][method] rescue nil
+      if block
+        block.call(record, column)
       else
-        text_field p.name
+        "[VirtualColumn] '#{method}' is not defined yet"
       end
     end
 end

data/lib/merb_inspector/data.rb

@@ -0,0 +1,133 @@
+module Merb
+  class Inspector
+    class Column                # Abstract
+      class Delegate < StandardError; end
+      class NotDefined < Delegate; end
+      class MethodFound < Delegate
+        attr_reader :args
+        def initialize(*args)
+          @args = args
+          super("method delegation")
+        end
+      end
+
+      attr_accessor :context, :name
+
+      def initialize(context, name)
+        @context = context
+        @name    = name.to_s.intern
+      end
+
+      def name
+        @name.to_s
+      end
+
+      def label(*)
+        name
+      end
+
+      def value(record)
+        # first, search class prefixed method that user override
+        evaluate(record, "#{Extlib::Inflection.demodulize(record.class.name)}_#{name}_value")
+
+        # second, search method that user override
+        evaluate(record, "#{name}_value")
+
+        # finally, guess form from property type
+        default_value(record)
+      end
+
+      def form(record)
+        # first, search class prefixed method that user override
+        evaluate(record, "#{Extlib::Inflection.demodulize(record.class.name)}_#{name}_form")
+
+        # second, search method that user override
+        evaluate(record, "#{name}_form")
+
+        # finally, guess form from property type
+        default_form(record)
+      end
+
+      private
+        def h(str)
+          context.h(str)
+        end
+
+        def evaluate(record, method)
+          raise MethodFound.new(method, record, self) if context.respond_to?(method, true)
+        end
+
+        def default_value(record)
+          raise NotImplementedError
+        end
+
+        def default_form(record)
+          raise NotImplementedError
+        end
+
+        def not_defined(method)
+          raise NotDefined, method
+        end
+    end
+
+    class DMColumn < Column
+      def initialize(context, property)
+        @context  = context
+        @property = property
+      end
+
+      def name
+        @property.name.to_s
+      end
+
+      def type
+        @property.type
+      end
+
+      def default_value(record)
+        value = record.send(name)
+        if 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 default_form(record)
+        if type == ::DataMapper::Types::Serial
+          record.send name
+        elsif type == ::DataMapper::Types::Text
+          raise MethodFound.new(:text_area, name.to_sym)
+        else
+          raise MethodFound.new(:text_field, name.to_sym)
+        end
+      end
+    end
+
+    class VirtualColumn < Column
+      def default_value(record)
+        not_defined("#{name}_value")
+      end
+
+      def default_form(record)
+        not_defined("#{name}_form")
+      end
+    end
+
+    class LinkColumn < Column
+      def default_value(record)
+        evaluate(record, "#{name}_link_value")
+        not_defined("#{name}_link_value")
+      end
+
+      def default_form(record)
+        evaluate(record, "#{name}_link_form")
+        not_defined("#{name}_link_form")
+      end
+
+      def label
+        nil
+      end
+    end
+  end
+end

data/lib/merb_inspector/helper.rb

@@ -16,7 +16,7 @@ module Merb
         options[:max_level] ||= 3
 
         # validate keys
-        valid_keys   = [:action, :level, :max_level, :only, :except]
+        valid_keys   = [:action, :level, :max_level, :only, :except, :columns]
         unknown_keys = options.keys - valid_keys
         if !unknown_keys.blank?
           return h("[INSPECTOR ERROR] Unknown key(s): %s" % unknown_keys.inspect)

data/lib/merb_inspector.rb

@@ -10,6 +10,7 @@ if defined?(Merb::Plugins)
   
   Merb::BootLoader.before_app_loads do
     require "merb_inspector" / "inspector"
+    require "merb_inspector" / "data"
     require "merb_inspector" / "builtin"
     require "merb_inspector" / "manager"
     require "merb_inspector" / "helper"

data/templates/data_mapper/collection/_records.html.erb

@@ -3,7 +3,7 @@
   <thead>
     <tr>
 <%- columns.each do |p| -%>
-      <th><p><%= column_header(p) %></p></th>
+      <th><p><%= column_label(p) %></p></th>
 <%- end -%>
       <th></th>
     </tr>
@@ -16,17 +16,8 @@ tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
 -%>
     <tr class="record <%=tr_class%>">
 <%- columns.each do |p| -%>
-      <td><%=h column_value(record, p) %></td>
+      <td><%= column_value(record, p) %></td>
 <%- end -%>
-      <td>
-        <table class="logical">
-          <tr>
-            <td><%= link_to_show(record) %></td>
-            <td><%= link_to_edit(record) %></td>
-            <td><%# delete_button(article, "Delete #{article.title}") %></td>
-          </tr>
-        </table>
-      </td>
     </tr>
 <%- end -%>
   </tbody>

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

@@ -4,7 +4,7 @@
   <tbody>
 <%- columns.each do |p| -%>
     <tr>
-      <th><%= column_header(p) %></th>
+      <th><%= column_label(p) %></th>
       <td><%= column_value(record, p) %></td>
     </tr>
 <%- end -%>
@@ -23,7 +23,7 @@
   <tbody>
 <%- columns.each do |p| -%>
     <tr>
-      <th><%= column_header(p) %></th>
+      <th><%= column_label(p) %></th>
       <td><%= column_form(record, p) %></td>
     </tr>
 <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Maiha
@@ -40,6 +40,7 @@ files:
 - lib/merb_inspector
 - lib/merb_inspector/helper.rb
 - lib/merb_inspector/builtin.rb
+- lib/merb_inspector/data.rb
 - lib/merb_inspector/merbtasks.rb
 - lib/merb_inspector/manager.rb
 - lib/merb_inspector/inspector.rb