Use Utils::Class loading mechanism

hanami · Aug 8, 2013 · ee8108b · ee8108b
1 parent 4c2e3f9
commit ee8108b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/lotus/routing/endpoint.rb b/lib/lotus/routing/endpoint.rb
@@ -1,3 +1,5 @@
+require 'lotus/utils/class'
+
 module Lotus
   module Routing
     class Endpoint < SimpleDelegator
@@ -20,7 +22,7 @@ def call(env)
 
       private
       def obj
-        @namespace.const_get(@name).new
+        Utils::Class.load!(@name, @namespace).new
       end
     end
   end

diff --git a/lib/lotus/routing/endpoint_resolver.rb b/lib/lotus/routing/endpoint_resolver.rb
@@ -1,10 +1,11 @@
 require 'lotus/utils/string'
+require 'lotus/utils/class'
 require 'lotus/routing/endpoint'
 
 module Lotus
   module Routing
     class EndpointResolver
-      SUFFIX = 'Controller::'.freeze
+      SUFFIX = '(::Controller::|Controller::)'.freeze
 
       def initialize(options = {})
         @namespace = options[:namespace] || Object
@@ -46,7 +47,7 @@ def default
 
       def constantize(string)
         begin
-          ClassEndpoint.new(@namespace.const_get(string))
+          ClassEndpoint.new(Utils::Class.load!(string, @namespace))
         rescue NameError
           LazyEndpoint.new(string, @namespace)
         end

diff --git a/lib/lotus/routing/resource/action.rb b/lib/lotus/routing/resource/action.rb
@@ -29,7 +29,7 @@ def prefix
 
         private
         def self.class_for(action)
-          Resource.const_get Utils::String.new(action).classify
+          Utils::Class.load!(Utils::String.new(action).classify, Resource)
         end
 
         def path

diff --git a/lib/lotus/routing/resources/action.rb b/lib/lotus/routing/resources/action.rb
@@ -30,7 +30,7 @@ def prefix
 
         private
         def self.class_for(action)
-          Resources.const_get Utils::String.new(action).classify
+          Utils::Class.load!(Utils::String.new(action).classify, Resources)
         end
 
         def path