zero-rails_openapi 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3b19a052b847ba122b75b0b0fb1ecfa401c087a111fa18a7129b0553496298eb
-  data.tar.gz: 9baa8e072b95a4da0dae09c6538e6172d509231361806ee1613a066ec4d0fd81
+SHA1:
+  metadata.gz: 376358650e9b3247057041cb7dbc985e167201fa
+  data.tar.gz: 5882dd98faaf60b78625367d88f8986db34d7080
 SHA512:
-  metadata.gz: 4166f08378b66d7a80d7c26d2b893688e5c19f74cc8352eaf6e2a8f1217bbd2f9910285dc2d941193e0ea4fc10d8cf3270012c0491fb1583ae1282e28058e955
-  data.tar.gz: 315db1cf5d4cb569071f01fab825076157eb42d8b7261a6d131ddf22aae75c63fa7f5b6cc5b4d9309332a0bf57ab92c4d3e364749522be082b8e45902a9fbf73
+  metadata.gz: fd6cb340ea211eab201d345af76c24ba78ce50163cbb3fbf931b5346715fa1e91a456012012bb9a5e8371d9ebfd02c22869d9f55a1489e2ed94b2b794073592a
+  data.tar.gz: 07e35bb9ef18e94e5b1a21e71cc32db95671ef862ca865be797f6ed3ff29842a3a836f91be268d57618a73edcc53c0c11390f756031474f059c78cd24fe9ce1f

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased]
 
+## [2.1.1 - 2.1.2] - 2019/2/12 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v2.1.0...v2.1.2)
+
+### Fixed
+
+1. Fix response header schema output [PR #49 by @drjonnicholson](https://github.com/zhandao/zero-rails_openapi/pull/49)
+2. Fix router formatter in Rails 6 [PR #53 by @rjayroach](https://github.com/zhandao/zero-rails_openapi/pull/53)
+3. Support for generating `additional_properties: true` [issued by @bopm](https://github.com/zhandao/zero-rails_openapi/issues/55)
+
 ## [2.1.0] - 2019/2/16 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v2.0.3...v2.1.0)
 
 See: [PR #43](https://github.com/zhandao/zero-rails_openapi/pull/43)

data/README.md

@@ -121,6 +121,20 @@
 
 ### Part 2: config (DSL) for generating OpenApi info
 
+  ```ruby
+  # 1. open_api
+  #   base_doc_classes should be an array of base classes of the classes you write the OpenApi spec in, 
+  #   like [ActionController::Base] (if you write spec in controllers).
+  open_api doc_name, base_doc_classes: []
+  
+  # 2. info
+  info version:, title:, desc: '', **addition
+  
+  # 3. server
+  # 4. security_scheme / base_auth / bearer_auth / api_key
+  # 5. global_security_require
+  ```
+
   See all the DSLs: [config_dsl.rb](lib/open_api/config_dsl.rb)
 
 ## DSL Usage
@@ -238,7 +252,7 @@
   end
   ```
   
-  And then you should call `dry` method ([detailed info]()) for executing the declared dry blocks:
+  And then you should call `dry` method ([detailed info](#9-dry)) for executing the declared dry blocks:
   ```ruby
   api :index do
     dry

data/lib/oas_objs/header_obj.rb

@@ -16,8 +16,7 @@ module OpenApi
       end
 
       def process
-        schema.process
-        processed.merge!(schema: schema)
+        processed.merge!(schema: schema.process)
       end
     end
   end

data/lib/oas_objs/schema_obj.rb

@@ -46,7 +46,7 @@ module OpenApi
           { type: 'string', format: Config.file_format }
         elsif t == 'datetime'
           { type: 'string', format: 'date-time' }
-        elsif t[/\{=>.*\}/]
+        elsif t[/{=>.*}/]
           self[:values_type] = t[3..-2]
           { type: 'object' }
         else # other string
@@ -56,9 +56,8 @@ module OpenApi
 
       def additional_properties
         return if processed[:type] != 'object' || _addProp.nil?
-        {
-            additionalProperties: SchemaObj.new(_addProp, { }).process
-        }
+        value = _addProp.in?([true, false]) ? _addProp : SchemaObj.new(_addProp, { }).process
+        { additionalProperties: value }
       end
 
       def enum

data/lib/open_api/router.rb

@@ -15,7 +15,11 @@ module OpenApi
             all_routes = Rails.application.routes.routes
             require 'action_dispatch/routing/inspector'
             inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
-            inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, nil)
+            if Rails::VERSION::MAJOR < 6
+              inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, nil)
+            else
+              inspector.format(ActionDispatch::Routing::ConsoleFormatter::Sheet.new)
+            end
             # :nocov:
           end
     end

data/lib/open_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zero-rails_openapi
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Concise DSL for generating OpenAPI3 documentation.