fix path handling for subdir mounting (fixes phusion#13)

stbuehler · Aug 17, 2013 · a4cbb29 · FooBarWidget · Aug 21, 2013 · stbuehler
1 parent 4c0641f
commit a4cbb29
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -10,7 +10,7 @@ reinstallBehavior = (context)->
         textarea.delayedObserver ->
             callback = (html)->
                 $('.preview .content', form).html(html)
-            $.get('/admin/comments/preview', content: textarea.val(), callback) 
+            $.get('./admin/comments/preview', content: textarea.val(), callback) 
 
 $(document).ready ->
     reinstallBehavior()

diff --git a/app/views/admin/help/_code.txt.erb b/app/views/admin/help/_code.txt.erb
@@ -30,7 +30,7 @@
         }
 
         var result =
-            '<%= request.protocol %><%= request.host_with_port %>/api/show_topic.js' +
+            '//<%= request.host_with_port %><%= root_path %>api/show_topic.js' +
             '?_c=' + window._juviaRequestCounter +
             '&' + makeQueryString(options);
         window._juviaRequestCounter++;

diff --git a/app/views/api/base.js.erb b/app/views/api/base.js.erb
@@ -228,7 +228,7 @@ if (!Juvia) {
 		var $container = $(form).closest('.juvia-container');
 		this.setSubmitting($container, true);
 		this.saveCommentBox($container);
-		this.loadScript('/api/add_comment', {
+		this.loadScript('<%= root_path %>api/add_comment', {
 			site_key    : $container.data('site-key'),
 			topic_key   : $container.data('topic-key'),
 			topic_title : $container.data('topic-title'),
@@ -242,7 +242,7 @@ if (!Juvia) {
 	Juvia.previewComment = function(formElement) {
 		var $container = $(formElement).closest('.juvia-container');
 		this.saveCommentBox($container);
-		this.loadScript('/api/preview_comment', {
+		this.loadScript('<%= root_path %>api/preview_comment', {
 			site_key : $container.data('site-key'),
 			topic_key: $container.data('topic-key'),
 			content  : this.compress($('textarea[name="content"]', $container).val())

diff --git a/app/views/layouts/_custom.html.erb b/app/views/layouts/_custom.html.erb
@@ -6,13 +6,14 @@
 <!--[if (gt IE 9)|!(IE)]><!--> <html lang="en-us" class="no-js"> <!--<![endif]-->
 
 <head>
+  <base href="<%= root_path %>">
   <meta http-equiv="X-UA-Compatible" content="IE=Edge;chrome=1" />
   <meta charset="utf-8" />
 
   <title><% if @title %><%= @title %> - <% end %>Juvia</title>
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link rel="shortcut icon" href="/favicon.ico" />
+  <link rel="shortcut icon" href="<%= root_path %>favicon.ico" />
 
   <!-- The Columnal Grid (1140px wide base, load first), Type and image presets, and mobile stylesheet -->
   <%= stylesheet_link_tag 'columnal' %>
@@ -50,9 +51,9 @@
   <div class="row">
     <div id="site_logo" class="col_5 clearleft">
       <a href="http://www.phusion.nl/" class="product_creator">Phusion</a>
-      <a href="/" class="product_logo"><%= image_tag 'logo-96.png', :width => 96, :height => 61, :alt => "Logo" %></a>
-      <a href="/" class="product_name">Juvia</a>
-      <a href="/" class="product_desc">commenting system</a>
+      <a href="<%= root_path %>" class="product_logo"><%= image_tag 'logo-96.png', :width => 96, :height => 61, :alt => "Logo" %></a>
+      <a href="<%= root_path %>" class="product_name">Juvia</a>
+      <a href="<%= root_path %>" class="product_desc">commenting system</a>
     </div>
     <nav class="col_7 omega">
       <% if user_signed_in? %>
@@ -61,7 +62,7 @@
       <% else %>
         <div><%= link_to 'Login', new_user_session_path %></div>
       <% end %>
-      <div><a href="/admin/help" class="<%= maybe_active(:help) %>">Help</a></div>
+      <div><a href="<%= admin_help_path %>" class="<%= maybe_active(:help) %>">Help</a></div>
       <% if user_signed_in? %>
         <div><%= link_to 'Logout', destroy_user_session_path, :method => :delete %></div>
       <% end %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -30,7 +30,7 @@
   put 'admin/dashboard/create_admin', :to => 'admin/dashboard#create_admin'
   get 'admin/dashboard/new_site', :to => 'admin/dashboard#new_site'
   put 'admin/dashboard/create_site', :to => 'admin/dashboard#create_site'
-  get 'admin/help(/:action)', :to => 'admin/help'
+  get 'admin/help(/:action)', :to => 'admin/help', :as => :admin_help
 
   match 'test/:action', :to => 'test' if Rails.env.test?
 

diff --git a/lib/app_config.rb b/lib/app_config.rb
@@ -158,3 +158,18 @@ module RailsExtensions
     attr_accessor :config
   end
 end
+
+# Fix asset paths to work in subdir mounted apps
+module ActionView
+  class AssetPaths
+    # setup url helper usage
+    include ActionController::UrlFor
+    include Rails.application.routes.url_helpers
+    delegate :env, :request, :to => :controller
+
+    # fix relative url root
+    def relative_url_root
+      root_path.chomp('/')
+    end
+  end
+end