maiha-merb_inspector 0.2.5.1 → 0.2.6

data/Rakefile

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

data/inspectors/array.rb

@@ -1,4 +1,5 @@
 class ArrayInspector < Merb::Inspector
+  builtin
   model Array
   lead  :size=>[40,20,15]
 end

data/inspectors/basic.rb

@@ -1,3 +1,4 @@
 class BasicInspector < Merb::Inspector
+  builtin
   model Merb::Request, StringIO, IO, String, Symbol, Numeric, Class
 end

data/inspectors/data_mapper.rb

@@ -1,4 +1,5 @@
 class DataMapper::ResourceInspector < Merb::Inspector
+  builtin
   model ::DataMapper::Resource
 
   def edit(object, options = {})
@@ -100,6 +101,7 @@ end
 
 
 class DataMapper::CollectionInspector < DataMapper::ResourceInspector
+  builtin
   model ::DataMapper::Collection
 
   private

data/inspectors/hash.rb

@@ -1,4 +1,5 @@
 class HashInspector < Merb::Inspector
+  builtin
   model Hash
   lead  :size=>[40,20,15]
 end

data/inspectors/object.rb

@@ -1,4 +1,5 @@
 class ObjectInspector < Merb::Inspector
+  builtin
   private
     def template
       if instance_variables.empty?

data/lib/merb_inspector.rb

@@ -10,13 +10,15 @@ if defined?(Merb::Plugins)
   
   Merb::BootLoader.before_app_loads do
     require "merb_inspector" / "inspector"
+    require "merb_inspector" / "builtin"
     require "merb_inspector" / "manager"
     require "merb_inspector" / "helper"
+
+    Merb::Inspector::Manager.reset
+    Merb::Inspector::Manager.install
   end
   
   Merb::BootLoader.after_app_loads do
-    Merb::Inspector::Manager.reset
-    Merb::Inspector::Manager.install
 
 #     class ::Application
 #       include Merb::Inspector::Helper

data/lib/merb_inspector/builtin.rb

@@ -0,0 +1,14 @@
+module Merb
+  class Inspector
+    module Builtin
+      private
+        def dir
+          Merb::Inspector.root + "templates" + name
+        end
+
+        def template_for(name)
+          dir + name.to_s
+        end
+    end
+  end
+end

data/lib/merb_inspector/inspector.rb

@@ -25,6 +25,10 @@ module Merb
       end
     end
 
+    def self.builtin
+      include Merb::Inspector::Builtin
+    end
+
     def self.lead(options = {})
       @lead_options = options
     end
@@ -53,12 +57,8 @@ module Merb
         "$('##{dom_id} > .reversible').toggle();return false;"
       end
 
-      def dir
-        Merb::Inspector.root + "templates" + name
-      end
-
       def template_for(name)
-        dir + name.to_s
+        name.to_s
       end
 
       def main

data/lib/merb_inspector/manager.rb

@@ -37,9 +37,9 @@ module Merb
       end
 
       def self.register(klass, inspector)
-        raise "#{klass} inspector already setup" if stores.has_key?(klass)
+        action = stores.has_key?(klass) ? "overridden" : "registered"
         stores[klass] = inspector
-        log "registered %s -> %s" % [klass, inspector]
+        log "%s %s -> %s" % [action, klass, inspector]
       end
 
       def self.lookup(object)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-merb_inspector
 version: !ruby/object:Gem::Version 
-  version: 0.2.5.1
+  version: 0.2.6
 platform: ruby
 authors: 
 - Maiha
@@ -38,6 +38,7 @@ files:
 - TODO
 - lib/merb_inspector
 - lib/merb_inspector/helper.rb
+- lib/merb_inspector/builtin.rb
 - lib/merb_inspector/merbtasks.rb
 - lib/merb_inspector/manager.rb
 - lib/merb_inspector/inspector.rb