lib/meta/route_dsl/meta_builder.rb in meta-api-0.0.6 vs lib/meta/route_dsl/meta_builder.rb in meta-api-0.0.7

@@ -4,36 +4,43 @@
 require_relative 'uniformed_params_builder'
 
 module Meta
   module RouteDSL
     class MetaBuilder
-      def initialize(&block)
+      def initialize(route_full_path:, route_method: :all, &block)
+        @route_full_path = route_full_path
+        @method = route_method
         @meta = {}
+        @parameters_builder = ParametersBuilder.new(route_full_path: route_full_path, route_method: route_method) # 默认给一个空的参数构建器，它只会处理 path 参数
 
         instance_exec &block if block_given?
       end
 
       def build
-        @meta
+        meta = @meta
+        if @meta[:parameters].nil? && @route_full_path =~ /[:*].+/
+          meta[:parameters] = ParametersBuilder.new(route_full_path: @route_full_path, route_method: @method).build
+        end
+        meta
       end
 
       def parameters(&block)
-        @meta[:parameters] = ParametersBuilder.new(&block).build
+        @meta[:parameters] = ParametersBuilder.new(route_full_path: @route_full_path, route_method: @method, &block).build
       end
 
       def request_body(options = {}, &block)
-        @meta[:request_body] = JsonSchema::SchemaBuilderTool.build(options, &block)
+        @meta[:request_body] = JsonSchema::SchemaBuilderTool.build(options, &block).to_schema
       end
 
       # params 宏是一个遗留的宏，它在一个宏定义块内同时定义 parameters 和 request_body
       def params(&block)
-        @meta[:parameters], @meta[:request_body] = UniformedParamsBuilder.new(&block).build
+        @meta[:parameters], @meta[:request_body] = UniformedParamsBuilder.new(route_full_path: @route_full_path, route_method: @method, &block).build
       end
 
-      def status(code, *other_codes, &block)
+      def status(code, *other_codes, **options, &block)
         codes = [code, *other_codes]
-        entity_schema = JsonSchema::SchemaBuilderTool.build(&block)
+        entity_schema = JsonSchema::SchemaBuilderTool.build(options, &block)
         @meta[:responses] = @meta[:responses] || {}
         codes.each { |code| @meta[:responses][code] = entity_schema }
       end
 
       [:tags, :title, :description].each do |method_name|
@@ -45,11 +52,11 @@
       # 别的模块引入该模块时可直接调用 MetaBuilder 的方法。
       # 由于该模块是动态实现的，其务必要在 MetaBuilder 类构建完毕后再声明，故而放在文件的最后声明。
       module Delegator
         method_names = MetaBuilder.public_instance_methods(false) - ['build']
         method_names.each do |method_name|
-          define_method(method_name) do |*args, &block|
-            @meta_builder.send(method_name, *args, &block) and self
+          define_method(method_name) do |*args, **kwargs, &block|
+            @meta_builder.send(method_name, *args, **kwargs, &block) and self
           end
         end
       end
     end
   end