Merge pull request #19 from cortex-cms/refactor-webpage-url-generation

Refactor Webpage URL Generation

Author: Alex Tharp

CHANGELOG.md

@@ -3,6 +3,7 @@ Version History
     * All Version bumps are required to update this file as well!!
 ----
 
+* 0.5.3 - Extract a framework-agnostic sanitized_webpage_url method
 * 0.5.2 - Addendum to previous version: fix expiry issues
 * 0.5.1 - Set Webpage feed cache to never expire
 * 0.5.0 - Auto-inject Client Helper into Views/Controllers. Add 10s race condition resolution to Rails cache fetch. Pass through to Snippet tag entire set of HTML attributes. Implement new namespacing and support Bundler.require.

lib/cortex/snippets/client.rb

@@ -18,17 +18,17 @@ def cortex_client
 
         def current_webpage(request)
           if defined?(Rails)
-            Rails.cache.fetch("webpages/#{request_url(request)}", race_condition_ttl: 10) do
-              cortex_client.webpages.get_feed(request_url(request)).contents
+            sanitized_url = sanitized_webpage_url(request.original_url)
+            Rails.cache.fetch("webpages/#{sanitized_url}", race_condition_ttl: 10) do
+              cortex_client.webpages.get_feed(sanitized_url).contents
             end
           else
             raise 'Your Web framework is not supported. Supported frameworks: Rails'
           end
         end
 
-        def request_url(request)
-          # TODO: Should be grabbing request URL in a framework-agnostic manner, but this is fine for now
-          uri = Addressable::URI.parse(request.original_url)
+        def sanitized_webpage_url(url)
+          uri = Addressable::URI.parse(url)
           path = uri.path == '/' ? uri.path : uri.path.chomp('/')
           "#{uri.scheme}://#{uri.authority}#{path}"
         end

lib/cortex/snippets/client/version.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Snippets
     module Client
-      VERSION = '0.5.2'
+      VERSION = '0.5.3'
     end
   end
 end