lib/ezframe/route.rb in ezframe-0.2.0 vs lib/ezframe/route.rb in ezframe-0.3.0

@@ -2,10 +2,13 @@
   class Route
     class << self
       def choose(request, route_h = nil)
         path_parts = request.path_info.split("/").drop(1)
         route_h ||= Config[:route].deep_dup
+        unless route_h
+          raise "Config[:route] is not defined. It should be defined in config/route.yml"
+        end
         # puts  "config=#{Config[:route]}, route_h=#{route_h}"
         args = {}
         opts = {}
         class_a = []
         # p path_parts
@@ -20,17 +23,17 @@
         end
         # URLを解析して、クラスの決定とIDの取得を行う
         while path_parts.length > 0
           part = path_parts.shift
           # break if part.empty?
-          # Logger.info "part=#{part}, route_h=#{route_h.inspect}"
+          # EzLog.info "part=#{part}, route_h=#{route_h.inspect}"
           if route_h.has_key?(part.to_sym)
-            # Logger.info "has_route: #{part}"
+            # EzLog.info "has_route: #{part}"
             class_a.push(part)
             if path_parts[0].to_i > 0
               args[part.to_sym] = val = path_parts.shift
-              # Logger.info "value: part=#{part}, val=#{val}"
+              # EzLog.info "value: part=#{part}, val=#{val}"
             end
             route_h = route_h[part.to_sym]
             break if route_h.nil?
             opts = {}
             route_h.keys.compact.each do |rkey|
@@ -39,19 +42,19 @@
                 opts[opt_key.to_sym] = route_h[rkey]
               end
             end
           else
             # routeに無ければ、メソッドを探す
-            # Logger.info "no_route: #{part}"
+            # EzLog.info "no_route: #{part}"
             klass = get_class(class_a[-1])
             return [ 404 ] unless klass
             instance = klass.new
             method_name = make_method_name(part, request.request_method)
             if instance.respond_to?(method_name)
               return [instance, method_name, args, opts]
             else
-              Logger.info "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
+              EzLog.info "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
             end
           end
         end
         # 最後にメソッド名が無い場合はpublic_default_#{method}を実行。
         #puts "class_a=#{class_a}"
@@ -61,22 +64,22 @@
           part = path_parts.shift
         else
           part = "default"
         end
         method_name = make_method_name(part, request.request_method)
-        #Logger.info "method_name=#{method_name}"
+        #EzLog.info "method_name=#{method_name}"
         instance = klass.new
         if instance.respond_to?(method_name)
           return [instance, method_name, args, opts]
         end
         return [ 404 ]
       end
 
       # ページクラスの階層を辿る
       def get_path(class_snake, route_h = nil)
         route_h = Config[:route] unless route_h
-        # Logger.info "get_path: route_h=#{route_h}"
+        # EzLog.info "get_path: route_h=#{route_h}"
         @get_path_found_it = nil
         route =_scan_route(class_snake, route_h.deep_dup) 
         return route.reverse if route
         return nil
       end
@@ -104,14 +107,14 @@
       def make_method_name(base_name, method = "get")
         return ["public", base_name, method.downcase].join("_")
       end
 
       def get_class(keys)
-        # Logger.info "get_class: #{keys.inspect}"
+        # EzLog.info "get_class: #{keys.inspect}"
         return nil unless keys
         keys = [ keys ] if keys.is_a?(String)
         klass = (%w[Ezframe] + keys.map { |k| k.to_s.to_camel }).join("::")
-        # Logger.info "get_class: #{klass}"
+        # EzLog.info "get_class: #{klass}"
         if Object.const_defined?(klass)
           return Object.const_get(klass)
         else
           raise "get_class: undefined class: #{klass}"
         end