[release] version 1.5.7

zhandao · Apr 6, 2018 · f5a83ab · f5a83ab
1 parent 0ae6baf
commit f5a83ab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [1.5.7] - 2018/4/6 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v1.5.6...v1.5.7)
+
+## Changed
+
+1. issue [#16](#https://github.com/zhandao/zero-rails_openapi/issues/16) DSL in `base_doc_class` can not be generated.
+
+## Fixed
+
+1. issue [#15](#https://github.com/zhandao/zero-rails_openapi/issues/15) colorize was not required.
+2. securitySchemes defined by config DSL was not be generated.
+
 ## [1.5.6] - 2018/3/23 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v1.5.5...v1.5.6)
 
 ## Changed

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zero-rails_openapi (1.5.6)
+    zero-rails_openapi (1.5.7)
       activesupport (>= 3)
       colorize
       rails (>= 3)

diff --git a/lib/open_api/generator.rb b/lib/open_api/generator.rb
@@ -28,8 +28,9 @@ def generate_doc(doc_name)
         doc = { openapi: '3.0.0', **settings.slice(:info, :servers) }.merge!(
                 security: settings[:global_security], tags: [ ], paths: { },
                 components: {
-                    securitySchemes: { }, schemas: { }, parameters: { }, requestBodies: { }
-                }.merge!(settings[:components] || { })
+                    securitySchemes: settings[:securitySchemes] || { },
+                    schemas: { }, parameters: { }, requestBodies: { }
+                }
               )
 
         [(bdc = settings[:base_doc_class]), *bdc.descendants].each do |ctrl|

diff --git a/lib/open_api/version.rb b/lib/open_api/version.rb
@@ -1,3 +1,3 @@
 module OpenApi
-  VERSION = '1.5.6'
+  VERSION = '1.5.7'
 end