dpn_swagger_engine 2.0.3.rc → 2.0.4.rc

data/app/assets/stylesheets/dpn_swagger_engine/application.css

@@ -1,4 +1,7 @@
-/* the order matches swagger-ui dist/index.html */
+/*
+The order matches swagger-ui dist/index.html;
+Rails automatically handles .css and .css.erb files
+*/
 
 @import "typography";
 @import "reset";

data/app/assets/stylesheets/dpn_swagger_engine/{print.css → print.css.erb}

@@ -880,7 +880,7 @@
   padding: 6px 8px;
 }
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
+  background-image: url(<%= asset_data_uri 'dpn_swagger_engine/throbber.gif' %>);
   width: 128px;
   height: 16px;
   display: block;
@@ -1222,7 +1222,7 @@
   height: 18px;
   vertical-align: middle;
   display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
+  background: url(<%= asset_data_uri 'dpn_swagger_engine/explorer_icons.png' %>) no-repeat;
 }
 .swagger-section .authorize__btn_operation_login {
   background-position: 0 0;

data/app/assets/stylesheets/dpn_swagger_engine/{screen.css → screen.css.erb}

@@ -880,7 +880,7 @@
   padding: 6px 8px;
 }
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
+  background-image: url(<%= asset_data_uri 'dpn_swagger_engine/throbber.gif' %>);
   width: 128px;
   height: 16px;
   display: block;
@@ -1222,7 +1222,7 @@
   height: 18px;
   vertical-align: middle;
   display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
+  background: url(<%= asset_data_uri 'dpn_swagger_engine/explorer_icons.png' %>) no-repeat;
 }
 .swagger-section .authorize__btn_operation_login {
   background-position: 0 0;
@@ -1354,7 +1354,7 @@
   height: 18px;
   vertical-align: middle;
   display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
+  background: url(<%= asset_data_uri 'dpn_swagger_engine/explorer_icons.png' %>) no-repeat;
 }
 .swagger-section .api-ic .api_information_panel {
   position: relative;

data/app/assets/stylesheets/dpn_swagger_engine/{style.css → style.css.erb}

@@ -2,7 +2,7 @@
   font-size: 1.5em;
   font-weight: bold;
   text-decoration: none;
-  background: transparent url(../images/logo.png) no-repeat left center;
+  background: transparent url(<%= asset_data_uri 'dpn_swagger_engine/logo.png' %>) no-repeat left center;
   padding: 20px 0 20px 40px;
 }
 #text-head {
@@ -64,7 +64,7 @@ h1 {
   width: 1500px;
   margin: auto;
   margin-top: 0;
-  background-image: url('../images/shield.png');
+  background-image: url(<%= asset_data_uri 'dpn_swagger_engine/shield.png' %>);
   background-repeat: no-repeat;
   background-position: -40px -20px;
   margin-bottom: 210px;

data/app/assets/stylesheets/dpn_swagger_engine/typography.css.erb

@@ -0,0 +1,14 @@
+/* Google Font's Droid Sans */
+@font-face {
+  font-family: 'Droid Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Droid Sans'), local('DroidSans'), url(<%= asset_data_uri 'dpn_swagger_engine/DroidSans.ttf' %>), format('truetype');
+}
+/* Google Font's Droid Sans Bold */
+@font-face {
+  font-family: 'Droid Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Droid Sans Bold'), local('DroidSans-Bold'), url(<%= asset_data_uri 'dpn_swagger_engine/DroidSans-Bold.ttf' %>), format('truetype');
+}

data/app/views/dpn_swagger_engine/swaggers/show.html.erb

@@ -6,14 +6,14 @@
 
   <!-- Content in this file is derived from swagger-ui:dist/index.html -->
 
-  <%#= favicon_link_tag 'favicon-32x32.png', rel: 'icon', type: 'image/png', sizes: '32x32' %>
-  <%#= favicon_link_tag 'favicon-16x16.png', rel: 'icon', type: 'image/png', sizes: '16x16' %>
+  <%= favicon_link_tag 'dpn_swagger_engine/favicon-32x32.png', rel: 'icon', type: 'image/png', sizes: '32x32' %>
+  <%= favicon_link_tag 'dpn_swagger_engine/favicon-16x16.png', rel: 'icon', type: 'image/png', sizes: '16x16' %>
 
-  <%= stylesheet_link_tag "dpn_swagger_engine/application" %>
-  <%= stylesheet_link_tag "dpn_swagger_engine/reset", media: "print" %>
-  <%= stylesheet_link_tag "dpn_swagger_engine/print", media: "print" %>
+  <%= stylesheet_link_tag 'dpn_swagger_engine/application' %>
+  <%= stylesheet_link_tag 'dpn_swagger_engine/reset', media: 'print' %>
+  <%= stylesheet_link_tag 'dpn_swagger_engine/print', media: 'print' %>
 
-  <%= javascript_include_tag "dpn_swagger_engine/application" %>
+  <%= javascript_include_tag 'dpn_swagger_engine/application' %>
 
   <%= csrf_meta_tags %>
 
@@ -38,7 +38,7 @@
       window.swaggerUi = new SwaggerUi({
         url: url,
         dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
+        supportedSubmitMethods: ["get", "post", "put", "delete", "patch"],
         onComplete: function(swaggerApi, swaggerUi){
           if(typeof initOAuth == "function") {
             initOAuth({
@@ -61,7 +61,7 @@
           log("Unable to Load SwaggerUI");
         },
         docExpansion: "none",
-        jsonEditor: true,
+        jsonEditor: false,
         // apisSorter: "alpha",
         defaultModelRendering: 'schema',
         showRequestHeaders: false
@@ -71,10 +71,8 @@
       function headerTokenAuthorization(){
         var token = encodeURIComponent($('#input_apiKey')[0].value);
         if(token && token.trim() != "") {
-            var tokenAuth = new SwaggerClient.ApiKeyAuthorization("Authorization", "Token token=" + token, "header"));
-            window.swaggerUi.api.clientAuthorizations.add("api_key", tokenAuth);
-            // var tokenAuth = new ApiKeyAuthorization("Authorization", "Token token=" + token, "header"));
-            // window.authorizations.add("api_key", tokenAuth);
+            var tokenAuth = new SwaggerClient.ApiKeyAuthorization("Authorization", "Token token=" + token, "header");
+            window.swaggerUi.api.clientAuthorizations.add("dpn_token", tokenAuth);
             log("added token " + token);
         }
       }
@@ -100,16 +98,13 @@
 <div id='header'>
   <div class="swagger-ui-wrap">
     <a id="logo" href="http://swagger.io">
-      <img class="logo__img" alt="swagger" height="30" width="30" src="images/logo_small.png" />
+      <%= image_tag 'dpn_swagger_engine/logo_small.png', class: 'logo__img', height: '30', width: '30', alt: 'swagger' %>
       <span class="logo__title">swagger</span>
     </a>
     <form id='api_selector'>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-      <!--
-        <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-        <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
-      -->
-      <div id='auth_container'></div>
+      <div class='input'><input placeholder="https://raw.githubusercontent.com/dpn-admin/dpn-rest-spec/api-v2/dist/swagger.yaml" id="input_baseUrl" name="baseUrl" type="text"/></div>
+      <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
+      <!-- <div id='auth_container'></div> -->
       <div class='input'><a id="explore" class="header__btn" href="#" data-sw-translate>Explore</a></div>
     </form>
   </div>

data/lib/dpn_swagger_engine/engine.rb

@@ -2,20 +2,32 @@ module DpnSwaggerEngine
   class Engine < ::Rails::Engine
     isolate_namespace DpnSwaggerEngine
 
-    #https://gist.github.com/parndt/11381872
-=begin
-    initializer "dpn_swagger_engine.assets.precompile", group: :all do |app|
+    initializer :assets do |app|
+      # Rails.application.config.assets.precompile += [
       app.config.assets.precompile += [
         'dpn_swagger_engine/print.css',
-        'dpn_swagger_engine/reset.css'
-      ]
-    end
-=end
-    config.to_prepare do
-      Rails.application.config.assets.precompile += [
-        'dpn_swagger_engine/print.css',
-        'dpn_swagger_engine/reset.css'
+        'dpn_swagger_engine/reset.css',
+        # fonts
+        'dpn_swagger_engine/DroidSans.ttf',
+        'dpn_swagger_engine/DroidSans-Bold.ttf',
+        # images
+        'dpn_swagger_engine/collapse.gif',
+        'dpn_swagger_engine/expand.gif',
+        'dpn_swagger_engine/explorer_icons.png',
+        'dpn_swagger_engine/favicon-16x16.png',
+        'dpn_swagger_engine/favicon-32x32.png',
+        'dpn_swagger_engine/favicon.ico',
+        'dpn_swagger_engine/logo_small.png',
+        'dpn_swagger_engine/pet_store_api.png',
+        'dpn_swagger_engine/throbber.gif',
+        'dpn_swagger_engine/wordnik_api.png'
       ]
+      app.config.assets.paths << root.join(
+        'app', 'assets', 'images', 'dpn_swagger_engine', 'dpn_swagger_engine'
+      )
+      app.config.assets.paths << root.join(
+        'app', 'assets', 'fonts', 'dpn_swagger_engine', 'dpn_swagger_engine'
+      )
     end
   end
 

data/lib/dpn_swagger_engine/version.rb

@@ -1,4 +1,4 @@
 module DpnSwaggerEngine
   # Major version number matches DPN REST API version
-  VERSION = '2.0.3.rc'.freeze
+  VERSION = '2.0.4.rc'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpn_swagger_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.3.rc
+  version: 2.0.4.rc
 platform: ruby
 authors:
 - batdevis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,11 +185,11 @@ files:
 - app/assets/javascripts/dpn_swagger_engine/swagger-ui.min.js
 - app/assets/javascripts/dpn_swagger_engine/swagger.json
 - app/assets/stylesheets/dpn_swagger_engine/application.css
-- app/assets/stylesheets/dpn_swagger_engine/print.css
+- app/assets/stylesheets/dpn_swagger_engine/print.css.erb
 - app/assets/stylesheets/dpn_swagger_engine/reset.css
-- app/assets/stylesheets/dpn_swagger_engine/screen.css
-- app/assets/stylesheets/dpn_swagger_engine/style.css
-- app/assets/stylesheets/dpn_swagger_engine/typography.css
+- app/assets/stylesheets/dpn_swagger_engine/screen.css.erb
+- app/assets/stylesheets/dpn_swagger_engine/style.css.erb
+- app/assets/stylesheets/dpn_swagger_engine/typography.css.erb
 - app/controllers/dpn_swagger_engine/application_controller.rb
 - app/controllers/dpn_swagger_engine/swaggers_controller.rb
 - app/helpers/dpn_swagger_engine/application_helper.rb
@@ -198,7 +198,6 @@ files:
 - app/views/dpn_swagger_engine/swaggers/o2c.html
 - app/views/dpn_swagger_engine/swaggers/show.html.erb
 - app/views/layouts/dpn_swagger_engine/application.html.erb
-- app/views/swagger_engine/swaggers/show.html.erb
 - bin/rails
 - bin/setup
 - config/routes.rb

data/app/assets/stylesheets/dpn_swagger_engine/typography.css

@@ -1,14 +0,0 @@
-/* Google Font's Droid Sans */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf'), format('truetype');
-}
-/* Google Font's Droid Sans Bold */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf'), format('truetype');
-}

data/app/views/swagger_engine/swaggers/show.html.erb

@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Swagger UI</title>
-
-  <!-- Content in this file is derived from swagger-ui:dist/index.html -->
-
-  <%#= favicon_link_tag 'favicon-32x32.png', rel: 'icon', type: 'image/png', sizes: '32x32' %>
-  <%#= favicon_link_tag 'favicon-16x16.png', rel: 'icon', type: 'image/png', sizes: '16x16' %>
-
-  <%= stylesheet_link_tag "dpn_swagger_engine/application" %>
-  <%= stylesheet_link_tag "dpn_swagger_engine/reset", media: "print" %>
-  <%= stylesheet_link_tag "dpn_swagger_engine/print", media: "print" %>
-
-  <%= javascript_include_tag "dpn_swagger_engine/application" %>
-
-  <%= csrf_meta_tags %>
-
-  <script type="text/javascript">
-    $(function () {
-      var url = window.location.search.match(/url=([^&]+)/);
-      if (url && url.length > 1) {
-        url = decodeURIComponent(url[1]);
-      } else {
-        url = '<%= @swagger_json_url %>';
-      }
-
-      hljs.configure({
-        highlightSizeThreshold: 5000
-      });
-
-      // Pre load translate...
-      if(window.SwaggerTranslator) {
-        window.SwaggerTranslator.translate();
-      }
-
-      window.swaggerUi = new SwaggerUi({
-        url: url,
-        dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
-        onComplete: function(swaggerApi, swaggerUi){
-          if(typeof initOAuth == "function") {
-            initOAuth({
-              clientId: "your-client-id",
-              clientSecret: "your-client-secret-if-required",
-              realm: "your-realms",
-              appName: "your-app-name",
-              scopeSeparator: ",",
-              additionalQueryStringParams: {}
-            });
-          }
-
-          if(window.SwaggerTranslator) {
-            window.SwaggerTranslator.translate();
-          }
-
-          headerTokenAuthorization();
-        },
-        onFailure: function(data) {
-          log("Unable to Load SwaggerUI");
-        },
-        docExpansion: "none",
-        jsonEditor: true,
-        // apisSorter: "alpha",
-        defaultModelRendering: 'schema',
-        showRequestHeaders: false
-      });
-
-      // Custom code for DPN authorization token
-      function headerTokenAuthorization(){
-        var token = encodeURIComponent($('#input_apiKey')[0].value);
-        if(token && token.trim() != "") {
-            var tokenAuth = new SwaggerClient.ApiKeyAuthorization("Authorization", "Token token=" + token, "header"));
-            window.swaggerUi.api.clientAuthorizations.add("api_key", tokenAuth);
-            // var tokenAuth = new ApiKeyAuthorization("Authorization", "Token token=" + token, "header"));
-            // window.authorizations.add("api_key", tokenAuth);
-            log("added token " + token);
-        }
-      }
-
-      $('#input_apiKey').change(headerTokenAuthorization);
-
-      // A DPN authorization token that should work in development
-      var dpnToken = "hathi_token";
-      $('#input_apiKey').val(dpnToken);
-
-      window.swaggerUi.load();
-
-      function log() {
-        if ('console' in window) {
-          console.log.apply(console, arguments);
-        }
-      }
-  });
-  </script>
-</head>
-
-<body class="swagger-section">
-<div id='header'>
-  <div class="swagger-ui-wrap">
-    <a id="logo" href="http://swagger.io">
-      <img class="logo__img" alt="swagger" height="30" width="30" src="images/logo_small.png" />
-      <span class="logo__title">swagger</span>
-    </a>
-    <form id='api_selector'>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-      <!--
-        <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-        <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
-      -->
-      <div id='auth_container'></div>
-      <div class='input'><a id="explore" class="header__btn" href="#" data-sw-translate>Explore</a></div>
-    </form>
-  </div>
-</div>
-
-<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>