maiha-merb_inspector 0.3.0 → 0.3.1

data/Rakefile

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

data/inspectors/data_mapper.rb

@@ -85,16 +85,24 @@ class DataMapper::ResourceInspector < Merb::Inspector
       [LinkColumn.new(self, :show), LinkColumn.new(self, :edit)]
     end
 
+    def find_column_by_name(name)
+      name = name.to_s.intern
+      (klass.properties.to_a + default_columns).each do |col|
+        return col if col.name == name
+      end
+      return nil
+    end
+
     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
+        valids = Array(@options[:only]).flatten.compact.map(&:to_sym)
+        cols = valids.map{|name| find_column_by_name(name) || name}
       else
         cols = klass.properties.to_a + default_columns
+        if @options[:except]
+          invalids = Array(@options[:except]).flatten.compact.map(&:to_sym)
+          cols = cols.reject{|col| invalids.include?(col.name)}
+        end
       end
 
       cols.map do |col|

data/lib/merb_inspector/data.rb

@@ -18,10 +18,6 @@ module Merb
         @name    = name.to_s.intern
       end
 
-      def name
-        @name.to_s
-      end
-
       def label(*)
         name
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Maiha
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -07:00
+date: 2009-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,9 @@ files:
 - mirror/public
 - mirror/public/stylesheets
 - mirror/public/stylesheets/merb_inspector.css
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/maiha/merb_inspector
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides powerful 'inspect' helper method