doing site lookups with port. fixes #554

comfy · Mar 5, 2015 · ccbed33 · ccbed33
2 parents d42c16e + cdc981c
commit ccbed33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
-  - 2.2.0
+  - 2.2.1
 gemfile:
   - test/gemfiles/Gemfile.rails.4.0
   - test/gemfiles/Gemfile.rails.4.1

diff --git a/app/helpers/comfy/cms_helper.rb b/app/helpers/comfy/cms_helper.rb
@@ -19,7 +19,7 @@ def cms_hook(name, options = {})
   #   <% end %>
   def cms_snippet_content(identifier, cms_site = @cms_site, &block)
     unless cms_site
-      host, path = request.host.downcase, request.fullpath if respond_to?(:request) && request
+      host, path = request.host_with_port.downcase, request.fullpath if respond_to?(:request) && request
       cms_site = Comfy::Cms::Site.find_site(host, path)
     end
     return '' unless cms_site

diff --git a/lib/comfortable_mexican_sofa/render_methods.rb b/lib/comfortable_mexican_sofa/render_methods.rb
@@ -45,7 +45,7 @@ def render(options = {}, locals = {}, &block)
       end
 
       if (page_path = options.delete(:cms_page)) || (layout_identifier = options.delete(:cms_layout))
-        unless @cms_site ||= Comfy::Cms::Site.find_site(request.host.downcase, request.fullpath)
+        unless @cms_site ||= Comfy::Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
           raise ComfortableMexicanSofa::MissingSite.new("#{request.host.downcase}/#{request.fullpath}")
         end
       end