route.rb in ezframe-0.2.0

- old
+ new

@@ -4,10 +4,11 @@
       def choose(request, route_h = nil)
         path_parts = request.path_info.split("/").drop(1)
         route_h ||= Config[:route].deep_dup
         # puts  "config=#{Config[:route]}, route_h=#{route_h}"
         args = {}
+        opts = {}
         class_a = []
         # p path_parts
         if path_parts.empty?
           root_conf = route_h[:/]
           # p root_conf
@@ -19,32 +20,38 @@
         end
         # URLを解析して、クラスの決定とIDの取得を行う
         while path_parts.length > 0
           part = path_parts.shift
           # break if part.empty?
-          # mylog "part=#{part}, route_h=#{route_h.inspect}"
+          # Logger.info "part=#{part}, route_h=#{route_h.inspect}"
           if route_h.has_key?(part.to_sym)
-            # mylog "has_route: #{part}"
+            # Logger.info "has_route: #{part}"
             class_a.push(part)
             if path_parts[0].to_i > 0
               args[part.to_sym] = val = path_parts.shift
-              # mylog "value: part=#{part}, val=#{val}"
+              # Logger.info "value: part=#{part}, val=#{val}"
             end
             route_h = route_h[part.to_sym]
             break if route_h.nil?
-            # mylog "route_h changed: #{route_h}"
+            opts = {}
+            route_h.keys.compact.each do |rkey|
+              if rkey =~ /option_(\w+)/
+                opt_key = $1
+                opts[opt_key.to_sym] = route_h[rkey]
+              end
+            end
           else
             # routeに無ければ、メソッドを探す
-            # mylog "no_route: #{part}"
+            # Logger.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]
+              return [instance, method_name, args, opts]
             else
-              mylog "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
+              Logger.info "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
             end
           end
         end
         # 最後にメソッド名が無い場合はpublic_default_#{method}を実行。
         #puts "class_a=#{class_a}"
@@ -54,36 +61,38 @@
           part = path_parts.shift
         else
           part = "default"
         end
         method_name = make_method_name(part, request.request_method)
-        #mylog "method_name=#{method_name}"
+        #Logger.info "method_name=#{method_name}"
         instance = klass.new
         if instance.respond_to?(method_name)
-          return [instance, method_name, args]
+          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}"
         @get_path_found_it = nil
-        return scan_route(class_snake, route_h.deep_dup).reverse
+        route =_scan_route(class_snake, route_h.deep_dup) 
+        return route.reverse if route
+        return nil
       end
 
       # targetに対応する名称のクラスまでの経路を返す
-      def scan_route(target, route_h)
-        # puts "scan_route: target=#{target}, route_h=#{route_h}"
+      def _scan_route(target, route_h)
         if route_h.keys.include?(target.to_sym)
           @get_path_found_it = true
           return [ target ]
         else
           route_h.each do |k, v|
-            next if k == :class
+            next if k.to_s =~ /^option_/
             if v.is_a?(Hash)
-              a = scan_route(target, v)
+              a = _scan_route(target, v)
               if @get_path_found_it
                 a.push(k)
                 return a
               end
             end
@@ -95,31 +104,20 @@
       def make_method_name(base_name, method = "get")
         return ["public", base_name, method.downcase].join("_")
       end
 
       def get_class(keys)
-        mylog "get_class: #{keys.inspect}"
+        # Logger.info "get_class: #{keys.inspect}"
         return nil unless keys
         keys = [ keys ] if keys.is_a?(String)
-        klass = (%w[Ezframe] + keys.map { |k| k.to_camel }).join("::")
-        # mylog "get_class: #{klass}"
+        klass = (%w[Ezframe] + keys.map { |k| k.to_s.to_camel }).join("::")
+        # Logger.info "get_class: #{klass}"
         if Object.const_defined?(klass)
           return Object.const_get(klass)
         else
           raise "get_class: undefined class: #{klass}"
         end
         return nil
-      end
-
-      def find_file(target)
-        Find.find("./asset").each do |file|
-          path_a = file.split("/")
-          if path_a[-1] == target
-            suffix = "." + target.split(".")[-1]
-            return [200, { "Content-Type" => Rack::Mime.mime_type(suffix) }, [File.open(file, &:read)]]
-          end
-        end
-        return [ 404 ]
       end
     end
   end
 end