diff --git a/app/assets/javascripts/swagger_rails/application.js b/app/assets/javascripts/swagger_rails/application.js
index ef74ee6..91af122 100644
--- a/app/assets/javascripts/swagger_rails/application.js
+++ b/app/assets/javascripts/swagger_rails/application.js
@@ -11,15 +11,14 @@
// about supported directives.
//
//= require_tree .
-//= require swagger-ui/lib/shred.bundle.js
//= require swagger-ui/lib/jquery-1.8.0.min.js
//= require swagger-ui/lib/jquery.slideto.min.js
//= require swagger-ui/lib/jquery.wiggle.min.js
//= require swagger-ui/lib/jquery.ba-bbq.min.js
-//= require swagger-ui/lib/handlebars-1.0.0.js
+//= require swagger-ui/lib/handlebars-2.0.0.js
//= require swagger-ui/lib/underscore-min.js
//= require swagger-ui/lib/backbone-min.js
-//= require swagger-ui/lib/swagger.js
-//= require swagger-ui/lib/swagger-client.js
//= require swagger-ui/swagger-ui.min.js
//= require swagger-ui/lib/highlight.7.3.pack.js
+//= require swagger-ui/lib/marked.js
+//= require swagger-ui/lib/swagger-oauth.js
diff --git a/app/controllers/swagger_rails/swagger_docs_controller.rb b/app/controllers/swagger_rails/swagger_docs_controller.rb
index 6d5e169..919814c 100644
--- a/app/controllers/swagger_rails/swagger_docs_controller.rb
+++ b/app/controllers/swagger_rails/swagger_docs_controller.rb
@@ -8,7 +8,7 @@ module SwaggerRails
private
def swagger_file_path_for(api_version)
- File.join(Rails.root, 'config', 'swagger', "#{api_version}.json")
+ File.join(Rails.root, 'config', 'swagger', api_version, 'swagger.json')
end
end
end
diff --git a/app/controllers/swagger_rails/swagger_ui_controller.rb b/app/controllers/swagger_rails/swagger_ui_controller.rb
index 3d48c49..60b5d30 100644
--- a/app/controllers/swagger_rails/swagger_ui_controller.rb
+++ b/app/controllers/swagger_rails/swagger_ui_controller.rb
@@ -2,7 +2,8 @@ module SwaggerRails
class SwaggerUiController < ApplicationController
def show
- @discovery_url = request.path.gsub('/ui', '/docs/v1')
+ @discovery_path = swagger_path('v1')
+ render :index
end
end
end
diff --git a/app/views/swagger_rails/swagger_ui/index.html.erb b/app/views/swagger_rails/swagger_ui/index.html.erb
new file mode 100644
index 0000000..521d62c
--- /dev/null
+++ b/app/views/swagger_rails/swagger_ui/index.html.erb
@@ -0,0 +1,119 @@
+
+
+
+
+ Swagger UI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/swagger_rails/swagger_ui/show.html.haml b/app/views/swagger_rails/swagger_ui/show.html.haml
deleted file mode 100644
index 4a24a83..0000000
--- a/app/views/swagger_rails/swagger_ui/show.html.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-#header
- .swagger-ui-wrap
- %a#logo{ href: 'http://swagger.io'} swagger
- %form#api_selector
- .input
- %input#input_baseUrl{ name: 'baseUrl' }
- .input
- %input#input_apiKey{ name: 'apiKey' }
- .input
- %a#input_apiKey{ name: 'apiKey' }
-
-#message-bar.swagger-ui-wrap
-
-#swagger-ui-container.swagger-ui-wrap{ data: { discovery_url: @discovery_url } }
-
-:coffeescript
- window.swaggerUi = new SwaggerUi(
- url: $('#swagger-ui-container').data('discoveryUrl')
- dom_id: 'swagger-ui-container'
- onComplete: (swaggerApi, swaggerUi) ->
- log('Loaded SwaggerUi')
- $('pre code').each (i, e) ->
- hljs.highlighBlock(e)
- onFailure: (data) ->
- log('Unable to load Swagger UI')
- docExpansion: 'none'
- sorter: 'alpha'
- )
-
- window.swaggerUi.load()
diff --git a/config/routes.rb b/config/routes.rb
index 2afe579..de6a68f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
SwaggerRails::Engine.routes.draw do
get '/ui', to: 'swagger_ui#show'
- get '/docs/:api_version', to: 'swagger_docs#show'
+ get '/:api_version/swagger.json', to: 'swagger_docs#show', as: :swagger
end
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
index 714e52e..4bd609e 100644
--- a/spec/dummy/config/routes.rb
+++ b/spec/dummy/config/routes.rb
@@ -1,4 +1,4 @@
Rails.application.routes.draw do
- mount SwaggerRails::Engine => "/swagger_rails"
+ mount SwaggerRails::Engine => '/swagger'
end
diff --git a/spec/dummy/config/swagger/v1.json b/spec/dummy/config/swagger/v1/swagger.json
similarity index 100%
rename from spec/dummy/config/swagger/v1.json
rename to spec/dummy/config/swagger/v1/swagger.json
diff --git a/swagger-ui b/swagger-ui
index b3dc9c0..8e72906 160000
--- a/swagger-ui
+++ b/swagger-ui
@@ -1 +1 @@
-Subproject commit b3dc9c004702a1f81921a9b75f86bf0a31996928
+Subproject commit 8e72906c911a02853b87f5241d157e83e2bf7377