zero-rails_openapi 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 406f69d0bc9ba791d43c9989267f43d1b8d49f50
-  data.tar.gz: 81938569b866c04e5c9e61f5dc3feb6b6d523108
+SHA256:
+  metadata.gz: 99c7a0aeaedb2ff14dc929912f7aa734122c7ab76bea448c68186ab512ef79e1
+  data.tar.gz: a2c95b2bf0856dee961183bb10f8f76f7a9031902199fc5874ac195b04eb4691
 SHA512:
-  metadata.gz: f78ea71f4788e0f89745fd36c265a61a1a6e6bbf6d969e604b6b043b82937253a75fba6f37b8bc33ae616d757c26cecbbd952be48c7778c7cc6d9e407cdd3f60
-  data.tar.gz: c3ff2a18f99422385a340068ef38a6e86a6b89979e2bf986a84a88536adc82750b9112a461e56bcb71a075ae59be83d60b64e1c080e7efdc202cf8fff01b6f46
+  metadata.gz: 7f868f8ccc21c52f10391dd9153814fa0cad1378fb1044455d07754639ad9e2951b331013d38accc28006e3ddf20944fa3179c1f34f5b460c3dff0072758de3b
+  data.tar.gz: 18b5a70b962887ba16a79e58cd11ae3e16cd8460f4c9e3d2f96812e9effdf482203a7f8bb92697ddd6046b1e7e9f9e9d184eed2624cf601eb905aa909aab4145

data/lib/open_api.rb

@@ -10,8 +10,8 @@ require 'open_api/dsl'
 
 module OpenApi
   module_function
-  cattr_accessor :routes_index, default: { }
-  cattr_accessor :docs, default: { }
+  cattr_accessor(:routes_index) { { } }
+  cattr_accessor(:docs) { { } }
 
   def write_docs(if: true, read_on_controller: true)
     (docs = generate_docs(read_on_controller)) and Tip.loaded

data/lib/open_api/config_dsl.rb

@@ -1,52 +1,50 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module OpenApi
   module ConfigDSL
-    def self.included(base)
-      base.class_eval do
-        module_function
-
-        def open_api name, base_doc_classes:
-          @api = name
-          open_api_docs[name] = { base_doc_classes: base_doc_classes }
-        end
-
-        def info version:, title:, desc: '', **addition
-          open_api_docs[@api][:info] = { version: version, title: title, description: desc, **addition }
-        end
-
-        def server url, desc: ''
-          (open_api_docs[@api][:servers] ||= [ ]) << { url: url, description: desc }
-        end
-
-        def security_scheme scheme_name, other_info# = { }
-          other_info[:description] = other_info.delete(:desc) if other_info.key?(:desc)
-          (open_api_docs[@api][:securitySchemes] ||= { })[scheme_name] = other_info
-        end
-
-        def base_auth scheme_name, other_info = { }
-          security_scheme scheme_name, { type: 'http', scheme: 'basic', **other_info }
-        end
-
-        def bearer_auth scheme_name, format = 'JWT', other_info = { }
-          security_scheme scheme_name, { type: 'http', scheme: 'bearer', bearerFormat: format, **other_info }
-        end
-
-        def api_key scheme_name, field:, in: 'header', **other_info
-          _in = binding.local_variable_get(:in)
-          security_scheme scheme_name, { type: 'apiKey', name: field, in: _in, **other_info }
-        end
-
-        def global_security_require scheme_name, scopes: [ ]
-          (open_api_docs[@api][:global_security] ||= [ ]) << { scheme_name => scopes }
-        end
-
-        class << self
-          alias global_security global_security_require
-          alias global_auth     global_security_require
-          alias auth_scheme     security_scheme
-        end
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def open_api name, base_doc_classes:
+        @api = name
+        open_api_docs[name] = { base_doc_classes: base_doc_classes }
       end
+
+      def info version:, title:, desc: '', **addition
+        open_api_docs[@api][:info] = { version: version, title: title, description: desc, **addition }
+      end
+
+      def server url, desc: ''
+        (open_api_docs[@api][:servers] ||= [ ]) << { url: url, description: desc }
+      end
+
+      def security_scheme scheme_name, other_info# = { }
+        other_info[:description] = other_info.delete(:desc) if other_info.key?(:desc)
+        (open_api_docs[@api][:securitySchemes] ||= { })[scheme_name] = other_info
+      end
+
+      def base_auth scheme_name, other_info = { }
+        security_scheme scheme_name, { type: 'http', scheme: 'basic', **other_info }
+      end
+
+      def bearer_auth scheme_name, format = 'JWT', other_info = { }
+        security_scheme scheme_name, { type: 'http', scheme: 'bearer', bearerFormat: format, **other_info }
+      end
+
+      def api_key scheme_name, field:, in: 'header', **other_info
+        _in = binding.local_variable_get(:in)
+        security_scheme scheme_name, { type: 'apiKey', name: field, in: _in, **other_info }
+      end
+
+      def global_security_require scheme_name, scopes: [ ]
+        (open_api_docs[@api][:global_security] ||= [ ]) << { scheme_name => scopes }
+      end
+
+      alias global_security global_security_require
+      alias global_auth     global_security_require
+      alias auth_scheme     security_scheme
     end
   end
 end

data/lib/open_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenApi
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zero-rails_openapi
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - zhandao
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Concise DSL for generating OpenAPI3 documentation.