zero-rails_openapi 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad9300ef0863756dc8921326f0878ca8afa58e92
-  data.tar.gz: f242c0646c62e952844c8f11410654e8fcef8e2d
+SHA256:
+  metadata.gz: ce57d6f92e37008bf5d5209b19d17cb73929a29c5af1313bb3ebf0ae9c2aeaec
+  data.tar.gz: 2201ddeb5cfabc32ae033b2786b394ebbd82051235c302f092f31eb9255c6a4e
 SHA512:
-  metadata.gz: 599d4cb3b53dd2af8d913b5ae5f174961e018cf198cf1c7693da52ee879d9514c9a701bf6bebd6e9185df9c1f9a966d4fec29e8a3c732ad81e88390117e6cedb
-  data.tar.gz: 4af5ee7a39d25bff3e30e7e44687c152817de79982b698211da87eab78ec2dc2e3df315d94f8f20f2da8d2aa94fe5c48e7b2cd289a135624d9740ecbe0a02b41
+  metadata.gz: 55744b89614b4bf82013900a564d4ca698d1ee1acfb7fe4ef13349fae25c97297fb3b62b76e512da9851f45909f4c9501a99eb59711d9cf9e4e282a0bcd12279
+  data.tar.gz: 00c5ec71d60965a0a59f136d016b97f09c01cb2e2decc276acc9132f88db627a055079b4c7c9a5321739387a02b54496ed54cf7fb7277f52f5966891f4a7748c

data/.travis.yml

@@ -1,8 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.0
-before_install: gem install bundler -v 1.16.0.pre.2
+  - 2.7.1
+before_install: gem install bundler -v 2.1.4
 env:
   global:
     - CC_TEST_REPORTER_ID=fd0a238819079b92c19e99f5f4d6dcc8a5b5b2baf087fceb3723837604b5b0e9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [2.1.5] - 2020/9/20 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v2.1.4...v2.1.5)
+
+### Fixed
+
+1. Keyword arguments in Ruby 2.7 [issued by @dandunckelman](https://github.com/zhandao/zero-rails_openapi/issues/66)
+
 ## [2.1.3 - 2.1.4] - 2020/2/10 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v2.1.2...v2.1.4)
 
 ### Fixed

data/README.md

@@ -381,6 +381,7 @@
   body_ref      # 2. it links sepcified RefObjs (by component keys) to the body.
   body, body!   # 3. alias of request_body
   form, form!   # 4. to define a multipart/form-data request_body
+  json, json!   # 5. to define a application/json request_body
   data          # 5. to define [a] property in the form-data request_body
   ```
   Bang methods(!) means the specified media-type body is required.
@@ -422,6 +423,7 @@
          name!: String,
       password: { type: String, pattern: /[0-9]{6,10}/ },
   }
+  json data: { name!: String }
 
   # Part 5
   # ** Method Signature

data/README_zh.md

@@ -722,9 +722,9 @@
 
 ### Trick5 - Auto Generate index/show Actions's Response-Types Based on DB Schema
 
-  Use method `load_schema` in `api_dry`.
+  ~~Use method `load_schema` in `api_dry`.~~
 
-  See this [file](documentation/examples/auto_gen_doc.rb#L51) for uasge information.
+  ~~See this [file](documentation/examples/auto_gen_doc.rb#L51) for uasge information.~~
 
 ### Trick6 - Combined Schema (one_of / all_of / any_of / not)
 

data/lib/oas_objs/media_type_obj.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'oas_objs/schema_obj'
-require 'oas_objs/example_obj'
+require "oas_objs/schema_obj"
+require "oas_objs/example_obj"
 
 module OpenApi
   module DSL
@@ -35,30 +35,30 @@ module OpenApi
       def media_type_mapping(media_type)
         return media_type if media_type.is_a? String
         case media_type
-        when :app then   'application/*'
-        when :json then  'application/json'
-        when :xml then   'application/xml'
-        when :xwww then  'application/x-www-form-urlencoded'
-        when :pdf then   'application/pdf'
-        when :zip then   'application/zip'
-        when :gzip then  'application/gzip'
-        when :doc then   'application/msword'
-        when :docx then  'application/application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-        when :xls then   'application/vnd.ms-excel'
-        when :xlsx then  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        when :ppt then   'application/vnd.ms-powerpoint'
-        when :pptx then  'application/vnd.openxmlformats-officedocument.presentationml.presentation'
-        when :form then  'multipart/form-data'; when :form_data then 'multipart/form-data'
-        when :text then  'text/*'
-        when :plain then 'text/plain then charset=utf-8'
-        when :html then  'text/html'
-        when :csv then   'text/csv'
-        when :image then 'image/*'
-        when :png then   'image/png'
-        when :jpeg then  'image/jpeg'
-        when :gif then   'image/gif'
-        when :audio then 'audio/*'
-        when :video then 'video/*'
+        when :app then   "application/*"
+        when :json then  "application/json"
+        when :xml then   "application/xml"
+        when :xwww then  "application/x-www-form-urlencoded"
+        when :pdf then   "application/pdf"
+        when :zip then   "application/zip"
+        when :gzip then  "application/gzip"
+        when :doc then   "application/msword"
+        when :docx then  "application/application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+        when :xls then   "application/vnd.ms-excel"
+        when :xlsx then  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        when :ppt then   "application/vnd.ms-powerpoint"
+        when :pptx then  "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+        when :form then  "multipart/form-data"; when :form_data then "multipart/form-data"
+        when :text then  "text/*"
+        when :plain then "text/plain then charset=utf-8"
+        when :html then  "text/html"
+        when :csv then   "text/csv"
+        when :image then "image/*"
+        when :png then   "image/png"
+        when :jpeg then  "image/jpeg"
+        when :gif then   "image/gif"
+        when :audio then "audio/*"
+        when :video then "video/*"
         else             nil
         end
       end
@@ -95,4 +95,4 @@ Media Type Examples
       }
     }
   }
-}
+}

data/lib/oas_objs/request_body_obj.rb

@@ -14,11 +14,11 @@ module OpenApi
 
       def initialize(required, desc)
         self.media_types = [ ]
-        self.processed   = { required: required['req'].present?, description: desc }
+        self.processed   = { required: required.to_s[/req/].present?, description: desc }
       end
 
       def absorb(media_type, hash)
-        media_types << MediaTypeObj.new(media_type, hash)
+        media_types << MediaTypeObj.new(media_type, **hash)
         self
       end
 

data/lib/oas_objs/response_obj.rb

@@ -20,7 +20,7 @@ module OpenApi
       def absorb(desc, media_type, headers: { }, **media_hash)
         self.processed[:description] = desc if desc.present?
         self.headers.merge!(headers)
-        media_types << MediaTypeObj.new(media_type, media_hash)
+        media_types << MediaTypeObj.new(media_type, **media_hash)
         self
       end
 

data/lib/oas_objs/schema_obj.rb

@@ -32,21 +32,19 @@ module OpenApi
 
       def recg_schema_type(t = self.type)
         t = t.class.in?([Hash, Array, Symbol]) ? t : t.to_s.downcase
-        if t.is_a? Hash
-          hash_type(t)
-        elsif t.is_a? Array
-          array_type(t)
-        elsif t.is_a? Symbol
-          RefObj.new(:schema, t).process
-        elsif t.in? %w[ float double int32 int64 ]
+        case t
+        when Hash then hash_type(t)
+        when Array then array_type(t)
+        when Symbol then RefObj.new(:schema, t).process
+        when *%w[ float double int32 int64 ]
           { type: t['int'] ? 'integer' : 'number', format: t }
-        elsif t.in? %w[ binary base64 uri ]
+        when *%w[ date binary base64 uri ]
           { type: 'string', format: t }
-        elsif t == 'file' # TODO
-          { type: 'string', format: Config.file_format }
-        elsif t == 'datetime'
+        when 'datetime'
           { type: 'string', format: 'date-time' }
-        elsif t[/{=>.*}/]
+        when 'file' # TODO
+          { type: 'string', format: Config.file_format }
+        when /{=>.*}/
           self[:values_type] = t[3..-2]
           { type: 'object' }
         else # other string
@@ -162,4 +160,4 @@ Simple Model
       "minimum": 0
     }
   }
-}
+}

data/lib/open_api/dsl/api.rb

@@ -7,106 +7,111 @@ module OpenApi
     class Api < Hash
       include DSL::Helpers
 
+      attr_accessor :_all_params
       attr_accessor :action_path, :dry_skip, :dry_only, :dry_blocks, :dryed, :param_order
 
-      def initialize(action_path = '', summary: nil, tags: [ ], id: nil)
+      def initialize(action_path = "", summary: nil, tags: [ ], id: nil)
         self.action_path = action_path
         self.dry_blocks  = [ ]
-        self.merge!(summary: summary, operationId: id, tags: tags, description: '', parameters: [ ],
-                    requestBody: nil, responses: { }, callbacks: { }, links: { }, security: [ ], servers: [ ])
+        self._all_params = { }
+        self.merge!(
+          summary: summary, operationId: id, tags: tags, description: "", parameters: [ ],
+          requestBody: nil, responses: { }, callbacks: { }, links: { }, security: [ ], servers: [ ]
+        )
       end
 
       def this_api_is_invalid!(*)
         self[:deprecated] = true
       end
-
       alias this_api_is_expired!      this_api_is_invalid!
       alias this_api_is_unused!       this_api_is_invalid!
       alias this_api_is_under_repair! this_api_is_invalid!
 
-      def desc desc
+      def desc(desc)
         self[:description] = desc
       end
-
       alias description desc
 
-      def dry only: nil, skip: nil, none: false
+      def dry(only: nil, skip: nil, none: false)
         return if dry_blocks.blank? || dryed
-        self.dry_skip = skip && Array(skip)
-        self.dry_only = none ? [:none] : only && Array(only)
+
+        self.dry_skip = Array(skip).compact.presence
+        self.dry_only = none ? [:none] : Array(only).compact.presence
         dry_blocks.each { |blk| instance_eval(&blk) }
         self.dry_skip = self.dry_only = nil
         self.dryed = true
       end
 
-      def param param_type, name, type, required, schema = { }
+      def param(param_type, name, type, required, schema = { })
         return if dry_skip&.include?(name) || dry_only&.exclude?(name)
+        return unless (schema_obj = process_schema_input(type, schema, name))
 
-        return unless schema = process_schema_input(type, schema, name)
-        param_obj = ParamObj.new(name, param_type, type, required, schema)
-        # The definition of the same name parameter will be overwritten
-        index = self[:parameters].map(&:name).index(param_obj.name)
-        index ? self[:parameters][index] = param_obj : self[:parameters] << param_obj
+        _all_params[name] = schema.is_a?(Hash) ? schema.merge(type:) : { type: } unless param_type["header"]
+        override_or_append_to_parameters(
+          ParamObj.new(name, param_type, type, required, schema_obj)
+        )
       end
-
       alias parameter param
 
+      # @!method query(name, type = nil, **schema)
+      # @!method query!(name, type = nil, **schema)
+      # @!method in_query(**params)
+      # @!method in_query!(**params)
       %i[ header header! path path! query query! cookie cookie! ].each do |param_type|
-        define_method param_type do |name, type = nil, **schema|
-          param param_type, name, type, (param_type['!'] ? :req : :opt), schema
+        define_method(param_type) do |name, type = nil, **schema|
+          param param_type, name, type, required?(param_type), schema
         end
 
-        define_method "in_#{param_type}" do |params|
+        define_method("in_#{param_type}") do |params|
           params.each_pair do |param_name, schema|
-            param param_type, param_name, nil, (param_type['!'] || param_name['!'] ? :req : :opt), schema
+            param param_type, param_name, nil, required?(param_type, param_name), schema
           end
         end
       end
 
-      def param_ref component_key, *keys
+      def param_ref(component_key, *keys)
         self[:parameters] += [component_key, *keys].map { |key| RefObj.new(:parameter, key) }
       end
 
       # options: `exp_params` and `examples`
-      def request_body required, media_type, data: { }, desc: '', **options
-        (self[:requestBody] ||= RequestBodyObj.new(required, desc)).absorb(media_type, { data: data , **options })
+      def request_body(required, media_type, data: { }, desc: "", **options)
+        self[:requestBody] ||= RequestBodyObj.new(required, desc)
+        self[:requestBody].absorb(media_type, { data:, **options })
+        _all_params.merge!(data)
       end
 
-      def body_ref component_key
-        self[:requestBody] = RefObj.new(:requestBody, component_key)
-      end
+      def body(media_type, data: { }, **) = request_body(:optional, media_type, data:, **)
+      def body!(media_type, data: { }, **) = request_body(:required, media_type, data:, **)
 
-      %i[ body body! ].each do |method|
-        define_method method do |media_type, data: { }, **options|
-          request_body (method['!'] ? :req : :opt), media_type, data: data, **options
-        end
-      end
-
-      def form data:, **options
-        body :form, data: data, **options
-      end
+      def json(data:, **) = body(:json, data:, **)
+      def json!(data:, **) = body!(:json, data:, **)
+      def form(data:, **) = body(:form, data:, **)
+      def form!(data:, **) = body!(:form, data:, **)
 
-      def form! data:, **options
-        body! :form, data: data, **options
-      end
-
-      def data name, type = nil, schema = { }
+      def data(name, type = nil, schema = { })
         schema[:type] = type if type.present?
         form data: { name => schema }
       end
 
-      def response code, desc, media_type = nil, headers: { }, data: { }, **options
-        (self[:responses][code.to_s] ||= ResponseObj.new(desc)).absorb(desc, media_type, headers: headers, data: data, **options)
+      def body_ref(component_key)
+        self[:requestBody] = RefObj.new(:requestBody, component_key)
+      end
+
+      def response(code, desc, media_type = nil, headers: { }, data: { }, **)
+        self[:responses][code.to_s] ||= ResponseObj.new(desc)
+        self[:responses][code.to_s].absorb(desc, media_type, headers:, data:, **)
       end
 
       alias_method :resp,  :response
       alias_method :error, :response
 
-      def response_ref code_and_compkey # = { }
-        code_and_compkey.each { |code, component_key| self[:responses][code.to_s] = RefObj.new(:response, component_key) }
+      def response_ref(code_and_compkey) # = { }
+        code_and_compkey.each do |code, component_key|
+          self[:responses][code.to_s] = RefObj.new(:response, component_key)
+        end
       end
 
-      def security_require scheme_name, scopes: [ ]
+      def security_require(scheme_name, scopes: [ ])
         self[:security] << { scheme_name => scopes }
       end
 
@@ -114,15 +119,17 @@ module OpenApi
       alias auth      security_require
       alias auth_with security_require
 
-      def callback event_name, http_method, callback_url, &block
-        self[:callbacks].deep_merge! CallbackObj.new(event_name, http_method, callback_url, &block).process
+      def callback(event_name, http_method, callback_url, &block)
+        self[:callbacks].deep_merge!(
+          CallbackObj.new(event_name, http_method, callback_url, &block).process
+        )
       end
 
-      def server url, desc: ''
+      def server(url, desc: "")
         self[:servers] << { url: url, description: desc }
       end
 
-      def param_examples exp_params = :all, examples_hash
+      def param_examples(exp_params = :all, examples_hash)
         exp_params = self[:parameters].map(&:name) if exp_params == :all
         self[:examples] = ExampleObj.new(examples_hash, exp_params, multiple: true).process
       end
@@ -135,10 +142,31 @@ module OpenApi
 
         self[:parameters].map!(&:process)
         self[:requestBody] = self[:requestBody].try(:process)
-        self[:responses].each { |code, response| self[:responses][code] = response.process }
-        self[:responses] = self[:responses].sort.to_h
+        self[:responses] = self[:responses].transform_values(&:process).sort.to_h
         self.delete_if { |_, v| v.blank? }
       end
+
+      def all_params
+        _all_params.transform_values do |t|
+          if t.is_a?(Hash)
+            t.key?(:type) ? t.merge!(type: t[:type].to_s.underscore) : { type: t }
+          else
+            { type: t.to_s.underscore }
+          end
+        end
+      end
+
+      private
+
+        def override_or_append_to_parameters(param_obj)
+          # The definition of the same name parameter will be override.
+          index = self[:parameters].map(&:name).index(param_obj.name)
+          index ? self[:parameters][index] = param_obj : self[:parameters] << param_obj
+        end
+
+        def required?(*passed)
+          passed.join["!"] ? :required : :optional
+        end
     end
   end
 end

data/lib/open_api/dsl/components.rb

@@ -12,7 +12,7 @@ module OpenApi
       end
 
       def schema component_key, type = nil, **schema
-        return unless schema = process_schema_input(type, schema, component_key, model: component_key)
+        return unless (schema = process_schema_input(type, schema, component_key))
         self[:schemas][component_key.to_s.to_sym] = schema.process
       end
 
@@ -25,7 +25,7 @@ module OpenApi
       arrow_enable :example
 
       def param component_key, param_type, name, type, required, schema = { }
-        return unless schema = process_schema_input(type, schema, name)
+        return unless (schema = process_schema_input(type, schema, name))
         self[:parameters][component_key] = ParamObj.new(name, param_type, type, required, schema).process
       end
 

data/lib/open_api/dsl/helpers.rb

@@ -15,26 +15,20 @@ module OpenApi
     module Helpers
       extend ActiveSupport::Concern
 
-      def load_schema(model) # TODO: test
-        return unless Config.model_base && model.try(:superclass) == Config.model_base
-        model.columns.map do |column|
-            type = column.sql_type_metadata.type.to_s.camelize
-            type = 'DateTime' if type == 'Datetime'
-            [ column.name.to_sym, Object.const_get(type) ]
-          end.to_h rescue ''
-      end
-
       def _combined_schema(one_of: nil, all_of: nil, any_of: nil, not: nil, **other)
         input = (_not = binding.local_variable_get(:not)) || one_of || all_of || any_of
         CombinedSchema.new(one_of: one_of, all_of: all_of, any_of: any_of, not: _not) if input
       end
 
-      def process_schema_input(schema_type, schema, name, model: nil)
-        schema = { type: schema } unless schema.is_a?(Hash)
-        combined_schema = _combined_schema(schema)
-        type = schema[:type] ||= schema_type
-        return Tip.param_no_type(name) if type.nil? && combined_schema.nil?
-        combined_schema || SchemaObj.new(type, load_schema(model) || schema)
+      def process_schema_input(schema_type, schema, name)
+        if schema.is_a?(Hash)
+          schema[:type] ||= schema_type
+        else
+          schema = { type: schema }
+        end
+        combined_schema = _combined_schema(**schema)
+        return Tip.param_no_type(name) if schema[:type].nil? && combined_schema.nil?
+        combined_schema || SchemaObj.new(schema[:type], schema)
       end
 
       # Arrow Writing:
@@ -46,7 +40,12 @@ module OpenApi
       def arrow_writing_support
         proc do |args, executor|
           args = (args.size == 1 && args.first.is_a?(Hash)) ? args[0].to_a.flatten : args
-          send(executor, *args)
+
+          if !executor.in?(%w[ _example _security_scheme _base_auth _bearer_auth ]) && args.last.is_a?(Hash)
+            send(executor, *args[0..-2], **args[-1])
+          else
+            send(executor, *args)
+          end
         end
       end
 

data/lib/open_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenApi
-  VERSION = '2.1.4'
+  VERSION = "2.2.0"
 end

data/zero-rails_openapi.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zero-rails_openapi
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - zhandao
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ homepage: https://github.com/zhandao/zero-rails_openapi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,16 +181,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Concise DSL for generating OpenAPI3 documentation.
 test_files: []