1.3.2 release!

1. Fix some bugs.
2. Sort the output.

Author: hikari-desu

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at zhandao. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Gemfile

@@ -5,6 +5,4 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in zero-rails_openapi.gemspec
 gemspec
 
-ruby '>= 2.3.0'
-
 gem 'activesupport'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zero-rails_openapi (1.3.1)
+    zero-rails_openapi (1.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -44,8 +44,5 @@ DEPENDENCIES
   rspec (~> 3.0)
   zero-rails_openapi!
 
-RUBY VERSION
-   ruby 2.4.1p111
-
 BUNDLED WITH
-   1.16.0.pre.2
+   1.16.0

documentation/examples/goods_doc.rb

@@ -34,7 +34,8 @@ class V2::GoodsDoc < BaseDoc
            :is_online => { type: Boolean, desc: 'it\'s online?' },
              :remarks => { type: String,  desc: 'remarks' },
             :pic_path => { type: String,  desc: 'picture url', is: :url },
-    }, exp_by: %i[ name category_id price ],
+    },
+          exp_by:    %i[ name category_id price ],
           examples: {
               :right_input => [ 'good1', 6, 5.7 ],
               :wrong_input => [ 'good2', 0, -1  ]

lib/oas_objs/helpers.rb

@@ -17,7 +17,7 @@ def assign(value)
     end
 
     # reduceee.then_merge! => for Hash
-    def reduceee(*values)
+    def reducx(*values)
       @assign = values.compact.reduce({ }, :merge).keep_if &value_present
       self
     end

lib/oas_objs/schema_obj.rb

@@ -28,20 +28,19 @@ def process_for(param_name = nil, options = { desc_inside: false })
         return processed if @preprocessed
 
         processed.merge! processed_type
-        reduceee processed_enum_and_length,
-                 processed_range,
-                 processed_is_and_format(param_name),
-                 {
-                     pattern:    _pattern&.inspect&.delete('/'),
-                     default:    _default,
-                     as:         _as,
-                     permit:     _permit,
-                     not_permit: _npermit,
-                     examples:   self[:examples].present? ? ExampleObj.new(self[:examples]).process : nil
-                 }
+        reducx processed_enum_and_length,
+               processed_range,
+               processed_is_and_format(param_name),
+               {
+                   pattern:    _pattern&.inspect&.delete('/'),
+                   default:    '_default',
+                   examples:   self[:examples].present? ? ExampleObj.new(self[:examples], self[:exp_by]).process : nil,
+               },
+               { as: _as, permit: _permit, not_permit: _npermit, req_if: _req_if, opt_if: _opt_if }
         then_merge!
+        processed[:default] = _default unless _default.nil?
 
-        reduceee(processed_desc options).then_merge!
+        reducx(processed_desc options).then_merge!
       end
 
       alias process process_for
@@ -154,16 +153,12 @@ def processed_enum_and_length
 
         # generate length range fields by _lth array
         lth = _length || [ ]
-        if self[:type] == 'array'
-          {
-              minItems: lth.is_a?(Array) ? lth.first : nil,
-              maxItems: lth.is_a?(Array) ? lth.last : nil
-          }
+        max = lth.is_a?(Array) ? lth.first : ("#{lth}".match?('ge') ? "#{lth}".split('_').last.to_i : nil)
+        min = lth.is_a?(Array) ? lth.last : ("#{lth}".match?('le') ? "#{lth}".split('_').last.to_i : nil)
+        if processed[:type] == 'array'
+          { minItems: max, maxItems: min }
         else
-          {
-              minLength: lth.is_a?(Array) ? lth.first : ("#{lth}".match?('ge') ? "#{lth}".split('_').last.to_i : nil),
-              maxLength: lth.is_a?(Array) ? lth.last : ("#{lth}".match?('le') ? "#{lth}".split('_').last.to_i : nil)
-          }
+          { minLength: max, maxLength: min }
         end.merge!(enum: _enum).keep_if &value_present
       end
 
@@ -209,6 +204,8 @@ def recognize_is_options_in(name)
           _as:      %i[ as   to  for     map  mapping     ], # NOT OAS Spec, it's for zero-params_processor
           _permit:  %i[ permit   pmt                      ], # NOT OAS Spec, it's for zero-params_processor
           _npermit: %i[ npmt     not_permit   unpermit    ], # NOT OAS Spec, it's for zero-params_processor
+          _req_if:  %i[ req_if   req_when                 ], # NOT OAS Spec, it's for zero-params_processor
+          _opt_if:  %i[ opt_if   opt_when                 ], # NOT OAS Spec, it's for zero-params_processor
       }.each do |key, aliases|
         define_method key do
           aliases.each do |alias_name|

lib/open_api/dsl.rb

@@ -36,22 +36,22 @@ def open_api method, summary = '', builder: nil, skip: [ ], use: [ ], &block
         # select the routing info (corresponding to the current method) from the routing list.
         action_path = "#{@_ctrl_path ||= controller_path}##{method}"
         routes_info = ctrl_routes_list&.select { |api| api[:action_path].match? /^#{action_path}$/ }&.first
-        pp "[ZRO Warnning] Routing mapping failed: #{@_ctrl_path}##{method}" and return if routes_info.nil?
+        pp "[ZRO Warning] Routing mapping failed: #{@_ctrl_path}##{method}" and return if routes_info.nil?
         Generator.generate_builder_file(action_path, builder) if builder.present?
 
         # structural { #path: { #http_method:{ } } }, for pushing into Paths Object.
         path = (@_api_infos ||= { })[routes_info[:path]] ||= { }
         current_api = path[routes_info[:http_verb]] =
-            ApiInfoObj.new(action_path, skip: skip, use: use)
+            ApiInfoObj.new(action_path, skip: Array(skip), use: Array(use))
                 .merge! description: '', summary: summary, operationId: method, tags: [@_apis_tag],
                         parameters: [ ], requestBody: '',  responses: { },      security: [ ], servers: [ ]
 
         current_api.tap do |api|
           [method, :all].each do |key| # blocks_store_key
-            @_apis_blocks&.[](key)&.each { |blk| api.instance_eval &blk }
+            @_apis_blocks&.[](key)&.each { |blk| api.instance_eval(&blk) }
           end
           api.param_use = [ ] # skip 和 use 是对 dry 块而言的
-          api.instance_eval &block if block_given?
+          api.instance_eval(&block) if block_given?
           api._process_objs
           api.delete_if { |_, v| v.blank? }
         end

lib/open_api/generator.rb

@@ -36,6 +36,9 @@ def generate_doc(api_name)
           doc[:components].merge! ctrl_infos[:components] || { }
         end
         doc[:components].delete_if { |_, v| v.blank? }
+        doc[:tags]  = doc[:tags].sort { |a, b| a[:name] <=> b[:name] }
+        doc[:paths] = doc[:paths].sort.to_h
+
         ($open_apis ||= { })[api_name] ||=
             ActiveSupport::HashWithIndifferentAccess.new(doc.delete_if { |_, v| v.blank? })
       end

lib/open_api/version.rb

@@ -1,3 +1,3 @@
 module OpenApi
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end