maiha-merb_inspector 0.2.7 → 0.2.8

data/Rakefile

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

data/inspectors/data_mapper.rb

@@ -15,8 +15,18 @@ class DataMapper::ResourceInspector < Merb::Inspector
       @object.class
     end
 
+    def klass
+      @object.class
+    end
+
     def columns
-      model.properties
+      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
     end
 
     def dom_id
@@ -116,15 +126,15 @@ end
 
 class DataMapper::CollectionInspector < DataMapper::ResourceInspector
   builtin
-  model ::DataMapper::Collection
+  model ::DataMapper::Collection, ::DataMapper::Associations::OneToMany::Proxy 
 
   private
     def model
       @object.query.model
     end
 
-    def columns
-      @object.properties
+    def klass
+      @object
     end
 
     def options

data/lib/merb_inspector/helper.rb

@@ -6,11 +6,22 @@ module Merb
         object  = args.shift
         options = args.shift || {}
 
-        options = options.is_a?(Hash) ? options : {:action=>options}
+        unless options.is_a?(Hash)
+          action = options.to_s
+          options = args.shift || {}
+          options[:action] = action
+        end
         options[:action]    ||= :show
         options[:level]     ||= 1
         options[:max_level] ||= 3
 
+        # validate keys
+        valid_keys   = [:action, :level, :max_level, :only, :except]
+        unknown_keys = options.keys - valid_keys
+        if !unknown_keys.blank?
+          return h("[INSPECTOR ERROR] Unknown key(s): %s" % unknown_keys.inspect)
+        end
+
         inspector_class = BasicInspector if options[:level] >= options[:max_level]
         inspector_class ||= Manager.lookup(object) || Merb::Inspector.default
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Maiha
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -07:00
+date: 2009-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ requirements: []
 rubyforge_project: merb
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb plugin that provides powerful 'inspect' helper method
 test_files: []