From f716c4f0543c9a3d8f9623fd3e45ec400e2e4f8e Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 13 Jul 2016 18:30:47 -0700 Subject: [PATCH] Serve static swagger-ui assets via vendor/assets --- .../swagger_rails/swagger_ui/index.html.erb | 42 +++---- bower.json | 25 ---- bower_components/swagger-ui/dist/index.html | 119 ------------------ lib/swagger_rails/engine.rb | 2 - lib/swagger_rails/middleware/swagger_ui.rb | 13 -- spec/dummy/config/application.rb | 2 + .../components/swagger-ui}/css/print.css | 0 .../components/swagger-ui}/css/reset.css | 0 .../components/swagger-ui}/css/screen.css | 0 .../components/swagger-ui}/css/style.css | 0 .../components/swagger-ui}/css/typography.css | 0 .../fonts/droid-sans-v6-latin-700.eot | Bin .../fonts/droid-sans-v6-latin-700.svg | 0 .../fonts/droid-sans-v6-latin-700.ttf | Bin .../fonts/droid-sans-v6-latin-700.woff | Bin .../fonts/droid-sans-v6-latin-700.woff2 | Bin .../fonts/droid-sans-v6-latin-regular.eot | Bin .../fonts/droid-sans-v6-latin-regular.svg | 0 .../fonts/droid-sans-v6-latin-regular.ttf | Bin .../fonts/droid-sans-v6-latin-regular.woff | Bin .../fonts/droid-sans-v6-latin-regular.woff2 | Bin .../swagger-ui}/images/explorer_icons.png | Bin .../swagger-ui}/images/favicon-16x16.png | Bin .../swagger-ui}/images/favicon-32x32.png | Bin .../components/swagger-ui}/images/favicon.ico | Bin .../swagger-ui}/images/logo_small.png | Bin .../swagger-ui}/images/pet_store_api.png | Bin .../swagger-ui}/images/throbber.gif | Bin .../swagger-ui}/images/wordnik_api.png | Bin .../assets/components/swagger-ui}/lang/en.js | 0 .../assets/components/swagger-ui}/lang/es.js | 0 .../assets/components/swagger-ui}/lang/pt.js | 0 .../assets/components/swagger-ui}/lang/ru.js | 0 .../components/swagger-ui}/lang/translator.js | 0 .../swagger-ui}/lib/backbone-min.js | 0 .../swagger-ui}/lib/handlebars-2.0.0.js | 0 .../swagger-ui}/lib/highlight.7.3.pack.js | 0 .../swagger-ui}/lib/jquery-1.8.0.min.js | 0 .../swagger-ui}/lib/jquery.ba-bbq.min.js | 0 .../swagger-ui}/lib/jquery.slideto.min.js | 0 .../swagger-ui}/lib/jquery.wiggle.min.js | 0 .../components/swagger-ui}/lib/marked.js | 0 .../swagger-ui}/lib/swagger-oauth.js | 0 .../swagger-ui}/lib/underscore-min.js | 0 .../swagger-ui}/lib/underscore-min.map | 0 .../assets/components/swagger-ui}/o2c.html | 0 .../components/swagger-ui}/swagger-ui.js | 0 .../components/swagger-ui}/swagger-ui.min.js | 0 48 files changed, 23 insertions(+), 180 deletions(-) delete mode 100644 bower.json delete mode 100644 bower_components/swagger-ui/dist/index.html delete mode 100644 lib/swagger_rails/middleware/swagger_ui.rb rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/css/print.css (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/css/reset.css (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/css/screen.css (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/css/style.css (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/css/typography.css (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-700.eot (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-700.svg (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-700.ttf (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-700.woff (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-700.woff2 (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-regular.eot (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-regular.svg (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-regular.ttf (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-regular.woff (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/fonts/droid-sans-v6-latin-regular.woff2 (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/explorer_icons.png (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/favicon-16x16.png (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/favicon-32x32.png (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/favicon.ico (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/logo_small.png (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/pet_store_api.png (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/throbber.gif (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/images/wordnik_api.png (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lang/en.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lang/es.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lang/pt.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lang/ru.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lang/translator.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/backbone-min.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/handlebars-2.0.0.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/highlight.7.3.pack.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/jquery-1.8.0.min.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/jquery.ba-bbq.min.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/jquery.slideto.min.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/jquery.wiggle.min.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/marked.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/swagger-oauth.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/underscore-min.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/lib/underscore-min.map (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/o2c.html (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/swagger-ui.js (100%) rename {bower_components/swagger-ui/dist => vendor/assets/components/swagger-ui}/swagger-ui.min.js (100%) diff --git a/app/views/swagger_rails/swagger_ui/index.html.erb b/app/views/swagger_rails/swagger_ui/index.html.erb index 7f5f7e8..491bffa 100644 --- a/app/views/swagger_rails/swagger_ui/index.html.erb +++ b/app/views/swagger_rails/swagger_ui/index.html.erb @@ -3,29 +3,29 @@ Swagger UI - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - -
 
-
- - diff --git a/lib/swagger_rails/engine.rb b/lib/swagger_rails/engine.rb index 43e8a99..934bd13 100644 --- a/lib/swagger_rails/engine.rb +++ b/lib/swagger_rails/engine.rb @@ -1,5 +1,4 @@ require 'swagger_rails/middleware/swagger_json' -require 'swagger_rails/middleware/swagger_ui' module SwaggerRails class Engine < ::Rails::Engine @@ -7,7 +6,6 @@ module SwaggerRails initializer 'swagger_rails.initialize' do |app| middleware.use SwaggerJson, SwaggerRails.config - middleware.use SwaggerUi end end end diff --git a/lib/swagger_rails/middleware/swagger_ui.rb b/lib/swagger_rails/middleware/swagger_ui.rb deleted file mode 100644 index 3de7939..0000000 --- a/lib/swagger_rails/middleware/swagger_ui.rb +++ /dev/null @@ -1,13 +0,0 @@ -module SwaggerRails - class SwaggerUi < Rack::Static - - def initialize(app) - options = { - root: File.expand_path('../../../../bower_components/swagger-ui/dist', __FILE__), - urls: %w(/css /fonts /images /lang /lib /oc2.html /swagger-ui.js) - } - # NOTE: /index.html is excluded as it is servered dynamically (via conrtoller) - super(app, options) - end - end -end diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 11d35dc..6ce0dc1 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -24,6 +24,8 @@ module Dummy # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + + config.assets.enabled = true end end diff --git a/bower_components/swagger-ui/dist/css/print.css b/vendor/assets/components/swagger-ui/css/print.css similarity index 100% rename from bower_components/swagger-ui/dist/css/print.css rename to vendor/assets/components/swagger-ui/css/print.css diff --git a/bower_components/swagger-ui/dist/css/reset.css b/vendor/assets/components/swagger-ui/css/reset.css similarity index 100% rename from bower_components/swagger-ui/dist/css/reset.css rename to vendor/assets/components/swagger-ui/css/reset.css diff --git a/bower_components/swagger-ui/dist/css/screen.css b/vendor/assets/components/swagger-ui/css/screen.css similarity index 100% rename from bower_components/swagger-ui/dist/css/screen.css rename to vendor/assets/components/swagger-ui/css/screen.css diff --git a/bower_components/swagger-ui/dist/css/style.css b/vendor/assets/components/swagger-ui/css/style.css similarity index 100% rename from bower_components/swagger-ui/dist/css/style.css rename to vendor/assets/components/swagger-ui/css/style.css diff --git a/bower_components/swagger-ui/dist/css/typography.css b/vendor/assets/components/swagger-ui/css/typography.css similarity index 100% rename from bower_components/swagger-ui/dist/css/typography.css rename to vendor/assets/components/swagger-ui/css/typography.css diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.eot b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.eot similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.eot rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.eot diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.svg b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.svg similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.svg rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.svg diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.ttf b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.ttf similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.ttf rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.ttf diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.woff b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.woff similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.woff rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.woff diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.woff2 b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-700.woff2 rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.eot b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.eot similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.eot rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.eot diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.svg b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.svg similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.svg rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.svg diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.ttf b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.ttf rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.woff b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.woff similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.woff rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.woff diff --git a/bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.woff2 b/vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 similarity index 100% rename from bower_components/swagger-ui/dist/fonts/droid-sans-v6-latin-regular.woff2 rename to vendor/assets/components/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 diff --git a/bower_components/swagger-ui/dist/images/explorer_icons.png b/vendor/assets/components/swagger-ui/images/explorer_icons.png similarity index 100% rename from bower_components/swagger-ui/dist/images/explorer_icons.png rename to vendor/assets/components/swagger-ui/images/explorer_icons.png diff --git a/bower_components/swagger-ui/dist/images/favicon-16x16.png b/vendor/assets/components/swagger-ui/images/favicon-16x16.png similarity index 100% rename from bower_components/swagger-ui/dist/images/favicon-16x16.png rename to vendor/assets/components/swagger-ui/images/favicon-16x16.png diff --git a/bower_components/swagger-ui/dist/images/favicon-32x32.png b/vendor/assets/components/swagger-ui/images/favicon-32x32.png similarity index 100% rename from bower_components/swagger-ui/dist/images/favicon-32x32.png rename to vendor/assets/components/swagger-ui/images/favicon-32x32.png diff --git a/bower_components/swagger-ui/dist/images/favicon.ico b/vendor/assets/components/swagger-ui/images/favicon.ico similarity index 100% rename from bower_components/swagger-ui/dist/images/favicon.ico rename to vendor/assets/components/swagger-ui/images/favicon.ico diff --git a/bower_components/swagger-ui/dist/images/logo_small.png b/vendor/assets/components/swagger-ui/images/logo_small.png similarity index 100% rename from bower_components/swagger-ui/dist/images/logo_small.png rename to vendor/assets/components/swagger-ui/images/logo_small.png diff --git a/bower_components/swagger-ui/dist/images/pet_store_api.png b/vendor/assets/components/swagger-ui/images/pet_store_api.png similarity index 100% rename from bower_components/swagger-ui/dist/images/pet_store_api.png rename to vendor/assets/components/swagger-ui/images/pet_store_api.png diff --git a/bower_components/swagger-ui/dist/images/throbber.gif b/vendor/assets/components/swagger-ui/images/throbber.gif similarity index 100% rename from bower_components/swagger-ui/dist/images/throbber.gif rename to vendor/assets/components/swagger-ui/images/throbber.gif diff --git a/bower_components/swagger-ui/dist/images/wordnik_api.png b/vendor/assets/components/swagger-ui/images/wordnik_api.png similarity index 100% rename from bower_components/swagger-ui/dist/images/wordnik_api.png rename to vendor/assets/components/swagger-ui/images/wordnik_api.png diff --git a/bower_components/swagger-ui/dist/lang/en.js b/vendor/assets/components/swagger-ui/lang/en.js similarity index 100% rename from bower_components/swagger-ui/dist/lang/en.js rename to vendor/assets/components/swagger-ui/lang/en.js diff --git a/bower_components/swagger-ui/dist/lang/es.js b/vendor/assets/components/swagger-ui/lang/es.js similarity index 100% rename from bower_components/swagger-ui/dist/lang/es.js rename to vendor/assets/components/swagger-ui/lang/es.js diff --git a/bower_components/swagger-ui/dist/lang/pt.js b/vendor/assets/components/swagger-ui/lang/pt.js similarity index 100% rename from bower_components/swagger-ui/dist/lang/pt.js rename to vendor/assets/components/swagger-ui/lang/pt.js diff --git a/bower_components/swagger-ui/dist/lang/ru.js b/vendor/assets/components/swagger-ui/lang/ru.js similarity index 100% rename from bower_components/swagger-ui/dist/lang/ru.js rename to vendor/assets/components/swagger-ui/lang/ru.js diff --git a/bower_components/swagger-ui/dist/lang/translator.js b/vendor/assets/components/swagger-ui/lang/translator.js similarity index 100% rename from bower_components/swagger-ui/dist/lang/translator.js rename to vendor/assets/components/swagger-ui/lang/translator.js diff --git a/bower_components/swagger-ui/dist/lib/backbone-min.js b/vendor/assets/components/swagger-ui/lib/backbone-min.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/backbone-min.js rename to vendor/assets/components/swagger-ui/lib/backbone-min.js diff --git a/bower_components/swagger-ui/dist/lib/handlebars-2.0.0.js b/vendor/assets/components/swagger-ui/lib/handlebars-2.0.0.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/handlebars-2.0.0.js rename to vendor/assets/components/swagger-ui/lib/handlebars-2.0.0.js diff --git a/bower_components/swagger-ui/dist/lib/highlight.7.3.pack.js b/vendor/assets/components/swagger-ui/lib/highlight.7.3.pack.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/highlight.7.3.pack.js rename to vendor/assets/components/swagger-ui/lib/highlight.7.3.pack.js diff --git a/bower_components/swagger-ui/dist/lib/jquery-1.8.0.min.js b/vendor/assets/components/swagger-ui/lib/jquery-1.8.0.min.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/jquery-1.8.0.min.js rename to vendor/assets/components/swagger-ui/lib/jquery-1.8.0.min.js diff --git a/bower_components/swagger-ui/dist/lib/jquery.ba-bbq.min.js b/vendor/assets/components/swagger-ui/lib/jquery.ba-bbq.min.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/jquery.ba-bbq.min.js rename to vendor/assets/components/swagger-ui/lib/jquery.ba-bbq.min.js diff --git a/bower_components/swagger-ui/dist/lib/jquery.slideto.min.js b/vendor/assets/components/swagger-ui/lib/jquery.slideto.min.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/jquery.slideto.min.js rename to vendor/assets/components/swagger-ui/lib/jquery.slideto.min.js diff --git a/bower_components/swagger-ui/dist/lib/jquery.wiggle.min.js b/vendor/assets/components/swagger-ui/lib/jquery.wiggle.min.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/jquery.wiggle.min.js rename to vendor/assets/components/swagger-ui/lib/jquery.wiggle.min.js diff --git a/bower_components/swagger-ui/dist/lib/marked.js b/vendor/assets/components/swagger-ui/lib/marked.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/marked.js rename to vendor/assets/components/swagger-ui/lib/marked.js diff --git a/bower_components/swagger-ui/dist/lib/swagger-oauth.js b/vendor/assets/components/swagger-ui/lib/swagger-oauth.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/swagger-oauth.js rename to vendor/assets/components/swagger-ui/lib/swagger-oauth.js diff --git a/bower_components/swagger-ui/dist/lib/underscore-min.js b/vendor/assets/components/swagger-ui/lib/underscore-min.js similarity index 100% rename from bower_components/swagger-ui/dist/lib/underscore-min.js rename to vendor/assets/components/swagger-ui/lib/underscore-min.js diff --git a/bower_components/swagger-ui/dist/lib/underscore-min.map b/vendor/assets/components/swagger-ui/lib/underscore-min.map similarity index 100% rename from bower_components/swagger-ui/dist/lib/underscore-min.map rename to vendor/assets/components/swagger-ui/lib/underscore-min.map diff --git a/bower_components/swagger-ui/dist/o2c.html b/vendor/assets/components/swagger-ui/o2c.html similarity index 100% rename from bower_components/swagger-ui/dist/o2c.html rename to vendor/assets/components/swagger-ui/o2c.html diff --git a/bower_components/swagger-ui/dist/swagger-ui.js b/vendor/assets/components/swagger-ui/swagger-ui.js similarity index 100% rename from bower_components/swagger-ui/dist/swagger-ui.js rename to vendor/assets/components/swagger-ui/swagger-ui.js diff --git a/bower_components/swagger-ui/dist/swagger-ui.min.js b/vendor/assets/components/swagger-ui/swagger-ui.min.js similarity index 100% rename from bower_components/swagger-ui/dist/swagger-ui.min.js rename to vendor/assets/components/swagger-ui/swagger-ui.min.js