meta-api 0.0.2 → 0.0.4

data/lib/meta/route_dsl/route_builder.rb

@@ -7,6 +7,7 @@ require_relative 'helpers'
 require_relative 'chain_builder'
 require_relative 'action_builder'
 require_relative 'meta_builder'
+require_relative 'around_action_builder'
 
 module Meta
   module RouteDSL
@@ -24,7 +25,7 @@ module Meta
         instance_exec &block if block_given?
       end
 
-      def build(parent_path: '', meta: {}, before_callbacks: [], after_callbacks: [])
+      def build(parent_path: '', meta: {}, callbacks: {})
         # 合并 meta 时不仅仅是覆盖，比如 parameters 参数需要合并
         meta2 = (meta || {}).merge(@meta_builder.build)
         if meta[:parameters] && meta2[:parameters]
@@ -45,15 +46,17 @@ module Meta
           end
         end
 
-        # 将 before_callbacks、action、after_callbacks 合并为 actions
-        action = @action_builder&.build
-        actions = before_callbacks + (action ? [action] : []) + after_callbacks
+        # 构建洋葱圈模型的 LinkedAction
+        action = AroundActionBuilder.build(
+          action: @action_builder&.build,
+          **callbacks
+        )
 
         Route.new(
           path: @path,
           method: @method,
           meta: meta2,
-          actions: actions
+          action: action
         )
       end
 

data/lib/meta/swagger_doc.rb

@@ -4,10 +4,13 @@ module Meta
   module SwaggerDocUtil
     class << self
       def generate(application, info: {}, servers: [])
-        routes = get_paths_and_routes!(application)
+        paths_and_routes = get_paths_and_routes!(application)
+        return generate_from_paths_and_routes(paths_and_routes, info: info, servers: servers)
+      end
 
+      def generate_from_paths_and_routes(paths_and_routes, info: {}, servers: [])
         schemas = {}
-        paths = routes.group_by { |path, route| path }.map { |path, routes| [path, routes.map { |item| item[1] }]}.map do |path, routes|
+        paths = paths_and_routes.group_by { |path, route| path }.map { |path, routes| [path, routes.map { |item| item[1] }]}.map do |path, routes|
           operations = routes.map do |route|
             [route.method.downcase.to_sym, generate_operation_object(route, schemas)]
           end.to_h

data/lib/meta/utils/kwargs/builder.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+# 使用构建器构建关键字参数检查器。
+#
+# 在 Ruby 3 中，关键字参数有所变化。简单来说，关键字参数和 Hash 类型不再自动转化，并且一般情况下推荐使用关键字参数。
+# 但关键字参数还是有稍稍不足之处，比如在做一些复杂的关键字参数定义时。
+#
+# 这个文件编写了一个方法，帮助我们在运行时检查关键字参数。这样，我们就可以像下面这样笼统的方式定义参数，不必用明确的关
+# 键字参数名称。
+#
+#     def method_name(x, y, z, **kwargs); end
+#     def method_name(x, y, z, kwargs={}); end
+#
+# 构建器使用示例：
+#
+#     Meta::Utils::KeywordArgs::Builder.build do
+#       key :a, :b, :c
+#       key :d, normalizer: ->(value) { normalize_to_array(value) }
+#     end
+#
+
+module Meta
+  module Utils
+    class KeywordArgs
+      def initialize(arguments, permit_extras = false, final_consumer = nil)
+        @arguments = arguments
+        @permit_extras = permit_extras
+        @final_consumer = final_consumer
+      end
+
+      def check(args)
+        args = args.dup
+        final_args = {}
+
+        @arguments.each do |argument|
+          argument.consume(final_args, args)
+        end
+
+        # 做最终的修饰
+        @final_consumer.call(final_args, args) if @final_consumer
+
+        # 处理剩余字段
+        unless args.keys.empty?
+          if @permit_extras
+            final_args.merge!(args)
+          else
+            extras = args.keys
+            raise "不接受额外的关键字参数：#{extras.join(', ')}" unless extras.empty?
+          end
+        end
+
+        final_args
+      end
+
+      class Argument
+        DEFAULT_TRANSFORMER = ->(value) { value }
+
+        def initialize(name:, normalizer: DEFAULT_TRANSFORMER, alias_names: [])
+          @key_name = name
+          @consumer_names = [name] + alias_names
+          @normalizer = normalizer
+        end
+
+        def consume(final_args, args)
+          @consumer_names.each do |name|
+            return true if consume_name(final_args, args, name)
+          end
+          return false
+        end
+
+        def consume_name(final_args, args, consumer_name)
+          if args.key?(consumer_name)
+            value = @normalizer.call(args.delete(consumer_name))
+            final_args[@key_name] = value
+            true
+          else
+            false
+          end
+        end
+      end
+
+      class Builder
+        def initialize
+          @arguments = []
+          @permit_extras = false
+          @final_consumer = nil
+        end
+
+        def key(*names, **options)
+          names.each do |name|
+            @arguments << Argument.new(name: name, **options)
+          end
+        end
+
+        def permit_extras(value)
+          @permit_extras = value
+        end
+
+        def final_consumer(&block)
+          @final_consumer = block
+        end
+
+        def build
+          KeywordArgs.new(@arguments, @permit_extras, @final_consumer)
+        end
+
+        def self.build(&block)
+          builder = Builder.new
+          builder.instance_exec &block
+          builder.build
+        end
+      end
+    end
+  end
+end

data/lib/meta/utils/{kwargs.rb → kwargs/check.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# 运行时检查关键字参数。
+# 运行时检查关键字参数。（已过时，请使用 Builder）
 #
 # 在 Ruby 3 中，关键字参数有所变化。简单来说，关键字参数和 Hash 类型不再自动转化，并且一般情况下推荐使用关键字参数。
 # 但关键字参数还是有稍稍不足之处，比如在做一些复杂的关键字参数定义时。
@@ -58,33 +58,33 @@ module Meta
 
         private
 
-          def build_schemas(spec)
-            if spec.is_a?(Array)
-              build_schemas_from_array(spec)
-            elsif spec.is_a?(Hash)
-              build_schemas_from_hash(spec)
-            elsif spec.is_a?(Symbol)
-              build_schemas_from_symbol(spec)
-            else
-              raise "未知的参数类型：#{spec.class}"
-            end
+        def build_schemas(spec)
+          if spec.is_a?(Array)
+            build_schemas_from_array(spec)
+          elsif spec.is_a?(Hash)
+            build_schemas_from_hash(spec)
+          elsif spec.is_a?(Symbol)
+            build_schemas_from_symbol(spec)
+          else
+            raise "未知的参数类型：#{spec.class}"
           end
+        end
 
-          def build_schemas_from_array(spec_array)
-            spec_array.inject({}) do |accumulated, val|
-              accumulated.merge!(build_schemas(val))
-            end
+        def build_schemas_from_array(spec_array)
+          spec_array.inject({}) do |accumulated, val|
+            accumulated.merge!(build_schemas(val))
           end
+        end
 
-          def build_schemas_from_hash(spec_hash)
-            spec_hash.transform_values do |val|
-              { default: val }
-            end
+        def build_schemas_from_hash(spec_hash)
+          spec_hash.transform_values do |val|
+            { default: val }
           end
+        end
 
-          def build_schemas_from_symbol(spec_symbol)
-            { spec_symbol => {} }
-          end
+        def build_schemas_from_symbol(spec_symbol)
+          { spec_symbol => {} }
+        end
       end
     end
   end

data/meta-api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "meta-api"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.4"
   spec.authors       = ["yetrun"]
   spec.email         = ["yetrun@foxmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - yetrun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies: []
 description: 一个 Web API 框架，该框架采用定义元信息的方式编写 API，并同步生成 API 文档
 email:
@@ -27,7 +27,9 @@ files:
 - README.md
 - Rakefile
 - config/locales/zh-CN.yml
+- docs/Rails.md
 - docs/名称由来.md
+- docs/如何贡献.md
 - docs/教程.md
 - docs/索引.md
 - examples/lobster.rb
@@ -35,31 +37,81 @@ files:
 - examples/rack_app/config.ru
 - examples/rack_app/hello.rb
 - examples/rack_app/timing.rb
+- examples/rails_app/.gitattributes
+- examples/rails_app/.gitignore
+- examples/rails_app/.rspec
+- examples/rails_app/.ruby-version
+- examples/rails_app/Gemfile
+- examples/rails_app/Gemfile.lock
+- examples/rails_app/README.md
+- examples/rails_app/Rakefile
+- examples/rails_app/app/controllers/application_controller.rb
+- examples/rails_app/app/controllers/concerns/.keep
+- examples/rails_app/app/controllers/data_controller.rb
+- examples/rails_app/app/controllers/swagger_controller.rb
+- examples/rails_app/app/models/concerns/.keep
+- examples/rails_app/bin/rails
+- examples/rails_app/bin/rake
+- examples/rails_app/bin/setup
+- examples/rails_app/config.ru
+- examples/rails_app/config/application.rb
+- examples/rails_app/config/boot.rb
+- examples/rails_app/config/credentials.yml.enc
+- examples/rails_app/config/environment.rb
+- examples/rails_app/config/environments/development.rb
+- examples/rails_app/config/environments/production.rb
+- examples/rails_app/config/environments/test.rb
+- examples/rails_app/config/initializers/cors.rb
+- examples/rails_app/config/initializers/filter_parameter_logging.rb
+- examples/rails_app/config/initializers/inflections.rb
+- examples/rails_app/config/initializers/meta_rails_plugin.rb
+- examples/rails_app/config/locales/en.yml
+- examples/rails_app/config/puma.rb
+- examples/rails_app/config/routes.rb
+- examples/rails_app/lib/tasks/.keep
+- examples/rails_app/log/.keep
+- examples/rails_app/public/robots.txt
+- examples/rails_app/spec/data_controller_spec.rb
+- examples/rails_app/spec/rails_helper.rb
+- examples/rails_app/spec/spec_helper.rb
+- examples/rails_app/spec/swagger_controller_spec.rb
+- examples/rails_app/tmp/.keep
+- examples/rails_app/tmp/pids/.keep
 - lib/meta/api.rb
 - lib/meta/application.rb
 - lib/meta/application/application.rb
 - lib/meta/application/execution.rb
-- lib/meta/application/meta.rb
+- lib/meta/application/linked_action.rb
+- lib/meta/application/metadata.rb
+- lib/meta/application/parameters.rb
 - lib/meta/application/path_matching_mod.rb
 - lib/meta/application/route.rb
 - lib/meta/config.rb
 - lib/meta/entity.rb
 - lib/meta/errors.rb
+- lib/meta/json_schema.rb
 - lib/meta/json_schema/builders/array_schema_builder.rb
+- lib/meta/json_schema/builders/dynamic_schema_builder.rb
 - lib/meta/json_schema/builders/object_schema_builder.rb
+- lib/meta/json_schema/builders/ref_schema_builder.rb
 - lib/meta/json_schema/builders/schema_builder_tool.rb
 - lib/meta/json_schema/schemas.rb
 - lib/meta/json_schema/schemas/array_schema.rb
 - lib/meta/json_schema/schemas/base_schema.rb
+- lib/meta/json_schema/schemas/dynamic_schema.rb
 - lib/meta/json_schema/schemas/object_schema.rb
+- lib/meta/json_schema/schemas/properties.rb
+- lib/meta/json_schema/schemas/ref_schema.rb
 - lib/meta/json_schema/support/errors.rb
 - lib/meta/json_schema/support/presenters.rb
 - lib/meta/json_schema/support/schema_options.rb
 - lib/meta/json_schema/support/type_converter.rb
 - lib/meta/json_schema/support/validators.rb
 - lib/meta/load_i18n.rb
+- lib/meta/rails.rb
 - lib/meta/route_dsl/action_builder.rb
 - lib/meta/route_dsl/application_builder.rb
+- lib/meta/route_dsl/around_action_builder.rb
 - lib/meta/route_dsl/chain_builder.rb
 - lib/meta/route_dsl/helpers.rb
 - lib/meta/route_dsl/meta_builder.rb
@@ -67,7 +119,8 @@ files:
 - lib/meta/route_dsl/route_builder.rb
 - lib/meta/route_dsl/uniformed_params_builder.rb
 - lib/meta/swagger_doc.rb
-- lib/meta/utils/kwargs.rb
+- lib/meta/utils/kwargs/builder.rb
+- lib/meta/utils/kwargs/check.rb
 - lib/meta/utils/path.rb
 - meta-api.gemspec
 homepage: https://github.com/yetrun/web-frame