zero-rails_openapi 1.5.2 → 1.5.3

data/lib/open_api/dsl.rb

@@ -25,7 +25,8 @@ module OpenApi
 
       def components &block
         doc_tag if @doc_info.nil?
-        current_doc = @doc_info[:components] = Components.new
+        structure = %i[ schemas responses	parameters examples requestBodies securitySchemes ].map { |k| [k, { }] }.to_h
+        current_doc = @doc_info[:components] = Components.new.merge!(structure)
         current_doc.instance_exec(&block)
         current_doc.process_objs
       end
@@ -35,7 +36,7 @@ module OpenApi
         # select the routing info (corresponding to the current method) from routing list.
         action_path = "#{@route_base ||= controller_path}##{action}"
         routes = ctrl_routes_list&.select { |api| api[:action_path].match?(/^#{action_path}$/) }
-        pp "[ZRO Warning] Routing mapping failed: #{@route_base}##{action}" and return if routes.blank?
+        return puts '    ZRO'.red + " Route mapping failed: #{@route_base}##{action}" if routes.blank?
 
         api = ApiInfo.new(action_path, skip: Array(skip), use: Array(use))
                      .merge! description: '', summary: summary, operationId: action, tags: [@doc_tag],

data/lib/open_api/generator.rb

@@ -11,15 +11,13 @@ module OpenApi
 
     module ClassMethods
       def generate_docs(doc_name = nil)
-        pp '[ZRO] No documents have been configured!' and return if Config.docs.keys.blank?
+        return puts '    ZRO'.red + ' No documents have been configured!' if Config.docs.keys.blank?
 
+        # :nocov:
         Dir['./app/controllers/**/*_controller.rb'].each do |file|
-          # Do Not `require`!
-          #   It causes problems, such as making `skip_before_action` not working.
-          # :nocov:
           file.sub('./app/controllers/', '').sub('.rb', '').camelize.constantize
-          # :nocov:
         end
+        # :nocov:
         Dir[*Array(Config.doc_location)].each { |file| require file }
         (doc_name || Config.docs.keys).map { |name| { name => generate_doc(name) } }.reduce({ }, :merge!)
       end
@@ -52,18 +50,20 @@ module OpenApi
 
       def write_docs(generate_files: true)
         docs = generate_docs
+        puts '    ZRO loaded.'.green if ENV['RAILS_ENV']
         return unless generate_files
         # :nocov:
         output_path = Config.file_output_path
         FileUtils.mkdir_p output_path
         max_length = docs.keys.map(&:size).sort.last
         docs.each do |doc_name, doc|
-          puts "[ZRO] `#{doc_name.to_s.rjust(max_length)}.json` has been generated."
+          puts '    ZRO'.green + " `#{doc_name.to_s.rjust(max_length)}.json` has been generated."
           File.open("#{output_path}/#{doc_name}.json", 'w') { |file| file.write JSON.pretty_generate doc }
         end
         # :nocov:
       end
-    end # end of module
+    end
+    # end of module
 
     def routes
       @routes ||=

data/lib/open_api/version.rb

@@ -1,3 +1,3 @@
 module OpenApi
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/zero-rails_openapi.gemspec

@@ -21,10 +21,13 @@ 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.2.2"
+
   spec.add_development_dependency 'bundler', '~> 1.16.a'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'colorize'
 
   spec.add_runtime_dependency 'rails', '>= 3'
   spec.add_runtime_dependency 'activesupport', '>= 3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zero-rails_openapi
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement