From 5cce1b3f1d6d9af9c5c8853e32d4091ad7b14326 Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Thu, 4 Sep 2014 17:24:17 -0400
Subject: [PATCH 01/10] bumping ruby version for my local

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 7c32728..8f9174b 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.1
\ No newline at end of file
+2.1.2
\ No newline at end of file

From ca7b51c22dede2fd360b58c33f5ca99c85cec81d Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 07:22:19 -0400
Subject: [PATCH 02/10] enable rails to find SwaggerYard::SwaggerController.
 fixes #5

---
 config/routes.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 8359b77..cbaa634 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,8 @@
 SwaggerYard::Engine.routes.draw do
-   get '/doc', to: 'swagger#doc'
+  scope module: 'swagger_yard' do 
+    get '/doc', to: 'swagger#doc'
 
-   get '/api', to: 'swagger#index'
-   get '/api/*resource', to: 'swagger#show'
+    get '/api', to: 'swagger#index'
+    get '/api/*resource', to: 'swagger#show'
+  end
 end
\ No newline at end of file

From 28a70ddca31512e8cf73818f086d61399ae4a1b5 Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 07:24:07 -0400
Subject: [PATCH 03/10] enable webrick usage

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

diff --git a/lib/swagger_yard/local_dispatcher.rb b/lib/swagger_yard/local_dispatcher.rb
index 9b29cf0..e378f20 100644
--- a/lib/swagger_yard/local_dispatcher.rb
+++ b/lib/swagger_yard/local_dispatcher.rb
@@ -10,7 +10,7 @@ def discovered_dispatcher
     end
 
     def server?
-      [:thin, :unicorn].include?(discovered_dispatcher)
+      [:webrick, :thin, :unicorn].include?(discovered_dispatcher)
     end
 
   private

From 1396972f858bdb3d1fda0fde3edafa45516808a5 Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 07:58:34 -0400
Subject: [PATCH 04/10] fix swagger mounted on a relative route problem

---
 app/views/swagger_yard/swagger/doc.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/swagger_yard/swagger/doc.html.erb b/app/views/swagger_yard/swagger/doc.html.erb
index 4845cad..0ac31a0 100644
--- a/app/views/swagger_yard/swagger/doc.html.erb
+++ b/app/views/swagger_yard/swagger/doc.html.erb
@@ -20,7 +20,7 @@
     <script type="text/javascript">
 	$(function () {
 	    window.swaggerUi = new SwaggerUi({
-                discoveryUrl: location.protocol + "//" + location.host + "/swagger/api",
+                discoveryUrl: location.protocol + "//" + location.host + "<%= Rails.configuration.relative_url_root %>" + "/swagger/api",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: true,
                 supportedSubmitMethods: ['get', 'post', 'put'],

From 89923908463ccfaf3be491281111cf052fd73853 Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 08:40:02 -0400
Subject: [PATCH 05/10] didn't need this after all, turned out to be a problem
 in rails engine init

---
 config/routes.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index cbaa634..d5c3c7d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,8 +1,6 @@
 SwaggerYard::Engine.routes.draw do
-  scope module: 'swagger_yard' do 
-    get '/doc', to: 'swagger#doc'
+  get '/doc', to: 'swagger#doc'
 
-    get '/api', to: 'swagger#index'
-    get '/api/*resource', to: 'swagger#show'
-  end
+  get '/api', to: 'swagger#index'
+  get '/api/*resource', to: 'swagger#show'
 end
\ No newline at end of file

From 48da6c74ba771a414c08e5bc25b105aedfd9848c Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 08:41:59 -0400
Subject: [PATCH 06/10] fixing relative path issue with script load

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

diff --git a/app/controllers/swagger_yard/swagger_controller.rb b/app/controllers/swagger_yard/swagger_controller.rb
index fdec9cc..35c5671 100644
--- a/app/controllers/swagger_yard/swagger_controller.rb
+++ b/app/controllers/swagger_yard/swagger_controller.rb
@@ -10,7 +10,7 @@ def index
 
     def show
       swagger_api = SwaggerYard.get_api("/#{params[:resource]}")
-      swagger_api.merge!("basePath" => request.base_url + SwaggerYard.api_path) if swagger_api["basePath"].blank? 
+      swagger_api.merge!("basePath" => request.base_url + env["SCRIPT_NAME"] + "/api") if swagger_api["basePath"].blank? 
       render :json => swagger_api
     end
 

From 3ac7d754bf157df33592d839de725393d7f9c7a2 Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 08:42:59 -0400
Subject: [PATCH 07/10] completed a valid check for webrick

---
 lib/swagger_yard/local_dispatcher.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/swagger_yard/local_dispatcher.rb b/lib/swagger_yard/local_dispatcher.rb
index e378f20..e3f123f 100644
--- a/lib/swagger_yard/local_dispatcher.rb
+++ b/lib/swagger_yard/local_dispatcher.rb
@@ -16,7 +16,7 @@ def server?
   private
 
     def discover_dispatcher
-      dispatchers = %w[sidekiq thin unicorn]
+      dispatchers = %w[sidekiq thin unicorn webrick]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_' + (dispatchers.shift)
       end
@@ -47,5 +47,11 @@ def check_for_thin
         @discovered_dispatcher = :thin
       end
     end
+
+    def check_for_webrick
+      if !defined?(::WEBrick).nil? 
+        @discovered_dispatcher = :webrick
+      end
+    end
   end
 end
\ No newline at end of file

From ff911db0fc76aea949c44bddaf50a74b92a7708f Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 08:43:38 -0400
Subject: [PATCH 08/10] LocalDispatcher couldn't detect webrick because it
 hadn't loaded by the time this Engine runs, so I moved it into an :after
 block.

This allows webrick to be detected.

Also, the base_urls are being cached on SwaggerYard init, so they were ignoring
SwaggerYard.config block in the Rails app initializer.  Setting config.reload is
one way to solve this, but another way is to simply clear the cache after engine
initialization.

since engine is marked :after, config has already occured in the Rails.app, so
clearing the cache forces a reload of the correct baseurl.
---
 lib/swagger_yard.rb        |  4 ++++
 lib/swagger_yard/engine.rb | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/swagger_yard.rb b/lib/swagger_yard.rb
index 0db3ada..7b8c2ff 100644
--- a/lib/swagger_yard.rb
+++ b/lib/swagger_yard.rb
@@ -79,6 +79,10 @@ def get_listing
       end
     end
 
+    def clear_cache
+      cache["listing_index"] = nil
+    end
+
   private
     ##
     # Register some custom yard tags used by swagger-ui
diff --git a/lib/swagger_yard/engine.rb b/lib/swagger_yard/engine.rb
index ca052ba..59ea1e0 100644
--- a/lib/swagger_yard/engine.rb
+++ b/lib/swagger_yard/engine.rb
@@ -2,17 +2,21 @@
 
 module SwaggerYard
   class Engine < ::Rails::Engine
-    if SwaggerYard::LocalDispatcher.new.server?
-      isolate_namespace SwaggerYard
+    isolate_namespace SwaggerYard
 
-      # NOTE: We should opt for asset pipeline instead of this.
-      initializer 'swagger_yard.load_static_assets' do |app|
-        app.middleware.use(::ActionDispatch::Static, "#{root}/public")
-      end
+    initializer :after do |app|     
+      if SwaggerYard::LocalDispatcher.new.server?
+        # NOTE: We should opt for asset pipeline instead of this.
+        #initializer 'swagger_yard.load_static_assets' do |app|
+          app.middleware.use(::ActionDispatch::Static, "#{root}/public")
+        #end
 
-      initializer "swagger_yard.finisher_hook" do |app|
-        SwaggerYard.generate!("#{app.root}/app/controllers/**/*.rb")
+        #initializer "swagger_yard.finisher_hook" do |app|
+          SwaggerYard.generate!("#{app.root}/app/controllers/**/*.rb")
+        #end
+          SwaggerYard.clear_cache
       end
     end
+
   end
 end

From 6884081fd95828ca9ff67130c95c0ced1cae7110 Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 09:14:53 -0400
Subject: [PATCH 09/10] cleaning up the spaces so irrelevant changes are not in
 the pull request

---
 config/routes.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index d5c3c7d..8359b77 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 SwaggerYard::Engine.routes.draw do
-  get '/doc', to: 'swagger#doc'
+   get '/doc', to: 'swagger#doc'
 
-  get '/api', to: 'swagger#index'
-  get '/api/*resource', to: 'swagger#show'
+   get '/api', to: 'swagger#index'
+   get '/api/*resource', to: 'swagger#show'
 end
\ No newline at end of file

From 71b08f9b41462d94b0a484c87bc860490024b1ea Mon Sep 17 00:00:00 2001
From: coldnebo <larry.kyrala@gmail.com>
Date: Fri, 5 Sep 2014 14:03:41 -0400
Subject: [PATCH 10/10] cleaner implementations for relative url roots

---
 app/controllers/swagger_yard/swagger_controller.rb | 2 +-
 app/views/swagger_yard/swagger/doc.html.erb        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/swagger_yard/swagger_controller.rb b/app/controllers/swagger_yard/swagger_controller.rb
index 35c5671..d2ff04e 100644
--- a/app/controllers/swagger_yard/swagger_controller.rb
+++ b/app/controllers/swagger_yard/swagger_controller.rb
@@ -10,7 +10,7 @@ def index
 
     def show
       swagger_api = SwaggerYard.get_api("/#{params[:resource]}")
-      swagger_api.merge!("basePath" => request.base_url + env["SCRIPT_NAME"] + "/api") if swagger_api["basePath"].blank? 
+      swagger_api.merge!("basePath" => request.base_url + request.script_name + "/api") if swagger_api["basePath"].blank? 
       render :json => swagger_api
     end
 
diff --git a/app/views/swagger_yard/swagger/doc.html.erb b/app/views/swagger_yard/swagger/doc.html.erb
index 0ac31a0..86808c8 100644
--- a/app/views/swagger_yard/swagger/doc.html.erb
+++ b/app/views/swagger_yard/swagger/doc.html.erb
@@ -20,7 +20,7 @@
     <script type="text/javascript">
 	$(function () {
 	    window.swaggerUi = new SwaggerUi({
-                discoveryUrl: location.protocol + "//" + location.host + "<%= Rails.configuration.relative_url_root %>" + "/swagger/api",
+                discoveryUrl: "<%= request.base_url + request.script_name + '/api' %>",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: true,
                 supportedSubmitMethods: ['get', 'post', 'put'],