From 5b1f59243c38bb7fa8caaa273e7caa411872c4b0 Mon Sep 17 00:00:00 2001
From: Michael Haddad <michael@ludditetechnology.com>
Date: Sat, 17 Aug 2019 10:01:23 -0400
Subject: [PATCH 01/10] Add support for Rails 6

---
 swagger_ui_engine.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swagger_ui_engine.gemspec b/swagger_ui_engine.gemspec
index a75e97e..58f831d 100644
--- a/swagger_ui_engine.gemspec
+++ b/swagger_ui_engine.gemspec
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
     'CHANGELOG.md'
   ]
 
-  s.add_runtime_dependency 'rails', '>= 4.2', '< 6'
+  s.add_runtime_dependency 'rails', '>= 4.2', '< 6.1'
   s.add_runtime_dependency 'sassc-rails'
 end

From 155276ad7b61e862d6fda22176054963513dfca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zuzanna=20Stoli=C5=84ska?= <zuzanna.stolinska@netguru.pl>
Date: Tue, 21 May 2019 17:20:38 +0200
Subject: [PATCH 02/10] Bump version to 1.1.3

---
 lib/swagger_ui_engine/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/swagger_ui_engine/version.rb b/lib/swagger_ui_engine/version.rb
index adb642a..34f83df 100644
--- a/lib/swagger_ui_engine/version.rb
+++ b/lib/swagger_ui_engine/version.rb
@@ -1,4 +1,4 @@
 module SwaggerUiEngine
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
   SWAGGER_UI_VERSION = '2.2.10'.freeze
 end

From bf625336c383ed404286c6418732cdee76c6944c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zuzanna=20Stoli=C5=84ska?= <zuzanna.stolinska@netguru.pl>
Date: Tue, 21 May 2019 17:26:32 +0200
Subject: [PATCH 03/10] Add 1.1.3 to Changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18e854a..e7f78cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## master
 
+## 1.1.3
+* Turns compatible with sprockets 4
+* Application Controller inheritance
+* Switch to sassc-rails gem
+
 ## 1.1.2
 
 * Fix incorrect Rails lock version

From a621309aef5118d767aa773bb454828baa553371 Mon Sep 17 00:00:00 2001
From: Ozmar Ugarte <ozmar_11@hotmail.com>
Date: Thu, 8 Aug 2019 09:21:33 -0500
Subject: [PATCH 04/10] Make the oauth2 action oneline

- As this action is empty we put it in one line
---
 app/controllers/swagger_ui_engine/swagger_docs_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
index 1109c4a..8d5e058 100644
--- a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
+++ b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
@@ -8,8 +8,7 @@ class SwaggerDocsController < SwaggerUiEngine::ApplicationController
 
     before_action :set_configs, :set_oauth_configs
 
-    def oauth2
-    end
+    def oauth2; end
 
     def index
       # backward compatibility for defining single doc url in strings

From e7a39c07b5e92c36ef02768c9effb93fc17752a6 Mon Sep 17 00:00:00 2001
From: Ozmar Ugarte <ozmar_11@hotmail.com>
Date: Thu, 8 Aug 2019 09:19:21 -0500
Subject: [PATCH 05/10] Add the validationUrl function into the show.html.erb

- In order to pass a real null and not an string 'null' we add the
validationUrl function to check the value of the url and return the
url string or JS null value
---
 app/views/swagger_ui_engine/swagger_docs/show.html.erb      | 6 +++++-
 .../swagger_ui_engine/swagger_docs_controller_test.rb       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/swagger_ui_engine/swagger_docs/show.html.erb b/app/views/swagger_ui_engine/swagger_docs/show.html.erb
index b6a6a4f..358d208 100644
--- a/app/views/swagger_ui_engine/swagger_docs/show.html.erb
+++ b/app/views/swagger_ui_engine/swagger_docs/show.html.erb
@@ -1,5 +1,9 @@
 <% content_for(:head) do %>
     <script type="text/javascript">
+      function validationUrl(url) {
+        return url === 'null' ? null : url;
+      }
+
       $(function () {
         var url = window.location.search.match(/url=([^&]+)/);
         if (url && url.length > 1) {
@@ -18,7 +22,7 @@
         }
         window.swaggerUi = new SwaggerUi({
           url: url,
-          validatorUrl: "<%= @validator_url %>",
+          validatorUrl: validationUrl("<%= @validator_url %>"),
           oauth2RedirectUrl: "<%= oauth2_swagger_docs_url %>",
           dom_id: "swagger-ui-container",
           supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
diff --git a/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb b/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb
index 1be3dae..690c6eb 100644
--- a/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb
+++ b/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb
@@ -39,11 +39,15 @@ class SwaggerDocsControllerTest < ActionDispatch::IntegrationTest
       assert_response :success
       assert_match('showRequestHeaders: "false"', @response.body)
       assert_match('jsonEditor: "false"', @response.body)
-      assert_match('validatorUrl: "null"', @response.body)
       assert_match('clientId: "your-client-id"', @response.body)
       assert_match('clientSecret: "your-client-secret-if-required"', @response.body)
       assert_match('scopeSeparator: " "', @response.body)
       assert_match('additionalQueryStringParams: "{}"', @response.body)
     end
+
+    test 'validatorUrl should should check the url to validate the given url or return real null' do
+      get '/swagger/swagger_docs/v1'
+      assert_match('validatorUrl: validationUrl("null")', @response.body)
+    end
   end
 end

From cf7d93710093e198ec16efd1c81c1e7284187cc2 Mon Sep 17 00:00:00 2001
From: CJ Howard <charlesjhoward@pm.me>
Date: Thu, 20 May 2021 21:34:03 -0500
Subject: [PATCH 06/10] Add boilerplate to test dummy app

* asset manifest
* database configuration
* sqlite3 development dependency
---
 swagger_ui_engine.gemspec                |  2 ++
 test/dummy/app/assets/config/manifest.js |  0
 test/dummy/config/database.yml           | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 test/dummy/app/assets/config/manifest.js
 create mode 100644 test/dummy/config/database.yml

diff --git a/swagger_ui_engine.gemspec b/swagger_ui_engine.gemspec
index 58f831d..9e77ef7 100644
--- a/swagger_ui_engine.gemspec
+++ b/swagger_ui_engine.gemspec
@@ -24,4 +24,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'rails', '>= 4.2', '< 6.1'
   s.add_runtime_dependency 'sassc-rails'
+
+  s.add_development_dependency 'sqlite3'
 end
diff --git a/test/dummy/app/assets/config/manifest.js b/test/dummy/app/assets/config/manifest.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
new file mode 100644
index 0000000..90d87cc
--- /dev/null
+++ b/test/dummy/config/database.yml
@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

From d3f6c58ac7166bcbf4753f43cb996d38fd251a7c Mon Sep 17 00:00:00 2001
From: CJ Howard <charlesjhoward@pm.me>
Date: Thu, 20 May 2021 21:45:34 -0500
Subject: [PATCH 07/10] Add application CSS/JS to engine assets

---
 lib/swagger_ui_engine/engine.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/swagger_ui_engine/engine.rb b/lib/swagger_ui_engine/engine.rb
index 1430422..3de95c2 100644
--- a/lib/swagger_ui_engine/engine.rb
+++ b/lib/swagger_ui_engine/engine.rb
@@ -18,6 +18,8 @@ class Engine < ::Rails::Engine
         swagger_ui_engine/lang/*.js
         swagger_ui_engine/DroidSans-Bold.ttf
         swagger_ui_engine/DroidSans.ttf
+        swagger_ui_engine/application.js
+        swagger_ui_engine/application.css
       ]
 
       Rails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')

From 55c78de521c742190934cae0717e1e894a579bc2 Mon Sep 17 00:00:00 2001
From: CJ Howard <charlesjhoward@pm.me>
Date: Thu, 20 May 2021 21:45:48 -0500
Subject: [PATCH 08/10] Replace deprecated #add_template_helper with #helper

---
 app/controllers/swagger_ui_engine/swagger_docs_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
index 8d5e058..20c69ba 100644
--- a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
+++ b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
@@ -3,7 +3,7 @@ class SwaggerDocsController < SwaggerUiEngine::ApplicationController
     include SwaggerUiEngine::ConfigParser
     include SwaggerUiEngine::OauthConfigParser
 
-    add_template_helper SwaggerUiEngine::TranslationHelper
+    helper SwaggerUiEngine::TranslationHelper
     layout 'swagger_ui_engine/layouts/swagger', except: %w(oauth2)
 
     before_action :set_configs, :set_oauth_configs

From cf852be68dc19daf8b210276c4f236b1d3fb590a Mon Sep 17 00:00:00 2001
From: CJ Howard <charlesjhoward@pm.me>
Date: Thu, 20 May 2021 23:58:27 -0500
Subject: [PATCH 09/10] Change Rails dependency to < 6.2

---
 README.md                 | 2 +-
 swagger_ui_engine.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a3ea5b8..f8db045 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Include [swagger-ui](https://github.com/swagger-api/swagger-ui) as Rails engine
 
 Swagger UI version | Rails version
 ------------------ | ----------------
-2.2.10             | >= 4.2, <6
+2.2.10             | >= 4.2, <= 6.1.x
 
 ## Features
 * Supports API documentation versioning / multiple APIs documentation
diff --git a/swagger_ui_engine.gemspec b/swagger_ui_engine.gemspec
index 9e77ef7..7200c38 100644
--- a/swagger_ui_engine.gemspec
+++ b/swagger_ui_engine.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     'CHANGELOG.md'
   ]
 
-  s.add_runtime_dependency 'rails', '>= 4.2', '< 6.1'
+  s.add_runtime_dependency 'rails', '>= 4.2', '< 6.2'
   s.add_runtime_dependency 'sassc-rails'
 
   s.add_development_dependency 'sqlite3'

From f21bbeddec4bb7a1a35437b2c6acace2fccfde91 Mon Sep 17 00:00:00 2001
From: CJ Howard <charlesjhoward@pm.me>
Date: Fri, 21 May 2021 00:29:14 -0500
Subject: [PATCH 10/10] Bump VERSION, update CHANGELOG

---
 CHANGELOG.md                     | 3 +++
 lib/swagger_ui_engine/version.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7f78cd..20664a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## master
 
+## 1.1.4
+* Support to Rails 6.1
+
 ## 1.1.3
 * Turns compatible with sprockets 4
 * Application Controller inheritance
diff --git a/lib/swagger_ui_engine/version.rb b/lib/swagger_ui_engine/version.rb
index 34f83df..314637c 100644
--- a/lib/swagger_ui_engine/version.rb
+++ b/lib/swagger_ui_engine/version.rb
@@ -1,4 +1,4 @@
 module SwaggerUiEngine
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
   SWAGGER_UI_VERSION = '2.2.10'.freeze
 end