handle mount points other then '/'

Signed-off-by: Peter Berkenbosch <peter@pero-ict.nl>

app/controllers/spree/static_content_controller.rb

@@ -11,8 +11,9 @@ def show
     when nil
       request.path
     end
-
-    unless @page = Spree::Page.visible.find_by_slug(path.gsub('//','/'))
+    path = StaticPage::remove_spree_mount_point(path) unless Rails.application.routes.named_routes[:spree].path.spec.to_s == "/"
+    path = path.gsub('//','/')
+    unless @page = Spree::Page.visible.find_by_slug(path)
       render_404
     end
   end

app/views/spree/static_content/_static_content_list.html.erb

@@ -1 +1,2 @@
-<li class=<%=(request.fullpath[1..-1] == page.slug) ? 'current' : 'not'%>><%= link_to page.title, page.slug %></li>
+<% page_uri = Rails.application.routes.named_routes[:spree].path.spec.to_s == '/' ? page.slug : Rails.application.routes.named_routes[:spree].path.spec.to_s + page.slug %>
+<li class=<%=(request.fullpath == page_uri) ? 'current' : 'not'%>><%= link_to page.title, page_uri  %></li>

config/routes.rb

@@ -1,14 +1,21 @@
+module StaticPage
+  def self.remove_spree_mount_point(path)
+    regex = Regexp.new Rails.application.routes.named_routes[:spree].path.spec.to_s
+    path.sub( regex, '')
+  end
+end
+
 class Spree::StaticPage
   def self.matches?(request)
-    path = request.fullpath
-    count = Spree::Page.visible.where(:slug => path.gsub("//","/")).count
+    path = StaticPage::remove_spree_mount_point(request.fullpath)
+    count = Spree::Page.visible.where(:slug => path).count
     0 < count
   end
 end
 
 class Spree::StaticRoot
   def self.matches?(request)
-    path = request.fullpath.gsub("//","/")
+    path = StaticPage::remove_spree_mount_point(request.fullpath)
     (path == '/') && Spree::Page.visible.find_by_slug(path)
   end
 end