Merge pull request #31 from zuzannast/1.1.3-version

1.1.3 version
EnziinSystem · May 21, 2019 · acaba51 · acaba51
2 parents b39ee0d + 85cf8e8
commit acaba51
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 58 deletions.
diff --git 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
+2.2.10             | >= 4.2, <6
 
 ## Features
 * Supports API documentation versioning / multiple APIs documentation
@@ -133,7 +133,7 @@ Here's an example use of [SwaggerUiEngine in Rails application](https://github.c
 
 ## Contributing
 
-You're very much welcome to contribute to this repository. Start by creating a Github issue and describing your change thoroughly. If you decide to publish a pull request, please make sure it points to the latest versioned branch instead of master. 
+You're very much welcome to contribute to this repository. Start by creating a Github issue and describing your change thoroughly. If you decide to publish a pull request, please make sure it points to the latest versioned branch instead of master.
 
 ## License
 

diff --git a/_config.yml b/_config.yml
diff --git a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
@@ -1,5 +1,5 @@
 module SwaggerUiEngine
-  class SwaggerDocsController < ApplicationController
+  class SwaggerDocsController < SwaggerUiEngine::ApplicationController
     include SwaggerUiEngine::ConfigParser
     include SwaggerUiEngine::OauthConfigParser
 

diff --git a/lib/swagger_ui_engine.rb b/lib/swagger_ui_engine.rb
@@ -1,3 +1,5 @@
+require 'rails/engine'
+require 'action_controller/railtie'
 require 'swagger_ui_engine/engine'
 require 'swagger_ui_engine/version'
 require 'swagger_ui_engine/configuration'

diff --git a/lib/swagger_ui_engine/engine.rb b/lib/swagger_ui_engine/engine.rb
@@ -1,11 +1,11 @@
-require 'sass/rails'
+require 'sassc/rails'
 
 module SwaggerUiEngine
   class Engine < ::Rails::Engine
     isolate_namespace SwaggerUiEngine
 
     config.to_prepare do
-      Rails.application.config.assets.precompile += %w(
+      Rails.application.config.assets.precompile += %w[
         swagger_ui_engine/lib/typography.css
         swagger_ui_engine/lib/reset.css
         swagger_ui_engine/lib/screen.css
@@ -16,10 +16,11 @@ class Engine < ::Rails::Engine
         swagger_ui_engine/favicon-32x32.png
         swagger_ui_engine/favicon-16x16.png
         swagger_ui_engine/lang/*.js
-      )
+        swagger_ui_engine/DroidSans-Bold.ttf
+        swagger_ui_engine/DroidSans.ttf
+      ]
 
       Rails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
-      Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
     end
   end
 end
diff --git 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'
-  s.add_runtime_dependency 'sass-rails'
+  s.add_runtime_dependency 'rails', '>= 4.2', '< 6'
+  s.add_runtime_dependency 'sassc-rails'
 end
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -1,5 +1,6 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
+  config.active_support.test_order = :random
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that