Merge pull request #17 from cortex-cms/restructuring

Restructuring

Author: Alex Tharp

CHANGELOG.md

@@ -0,0 +1,6 @@
+Version History
+====
+    * All Version bumps are required to update this file as well!!
+----
+
+* 0.5.0 - Auto-inject Client Helper into Views/Controllers. Pass through to Snippet tag entire set of HTML attributes. Implement new namespacing and support Bundler.require.

cortex-snippets-client-ruby.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'cortex/snippets/version'
+require 'cortex/snippets/client/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cortex-snippets-client-ruby'
-  spec.version       = Cortex::Snippets::VERSION
+  spec.version       = Cortex::Snippets::Client::VERSION
   spec.authors       = ['CB Content Enablement']
   spec.email         = ['[email protected]']
   spec.license       = 'Apache-2.0'

lib/cortex-snippets-client-ruby.rb

@@ -0,0 +1,2 @@
+require 'cortex/snippets/client'
+require 'cortex/snippets/client/version'

lib/cortex/snippets-client.rb

@@ -1,3 +1,5 @@
+require 'cortex/snippets/client/helper'
+require 'cortex/snippets/client/railtie' if defined?(Rails)
 require 'cortex-client'
 require 'connection_pool'
 require 'addressable/template'
@@ -16,16 +18,14 @@ def cortex_client
 
         def current_webpage(request)
           if defined?(Rails)
-            Rails.cache.fetch("webpages/#{request_url(request)}", expires_in: 30.minutes) do
+            Rails.cache.fetch("webpages/#{request_url(request)}", expires_in: 30.minutes, race_condition_ttl: 10) do
               cortex_client.webpages.get_feed(request_url(request)).contents
             end
           else
             raise 'Your Web framework is not supported. Supported frameworks: Rails'
           end
         end
 
-        private
-
         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)

lib/cortex/snippets/client.rb

@@ -0,0 +1,60 @@
+module Cortex
+  module Snippets
+    module Client
+      module Helper
+        def snippet(options = {}, &block)
+          snippets = webpage[:snippets] || []
+          snippet = snippets.find { |snippet| snippet[:document][:name] == options[:id] }
+
+          if snippet.nil? || snippet[:document][:body].nil? || snippet[:document][:body].empty?
+            content_tag(:snippet, capture(&block), options)
+          else
+            content_tag(:snippet, snippet[:document][:body].html_safe, options)
+          end
+        end
+
+        def seo_title
+          webpage[:seo_title]
+        end
+
+        def seo_description
+          webpage[:seo_description]
+        end
+
+        def seo_keywords
+          webpage[:seo_keywords]
+        end
+
+        def noindex
+          webpage[:noindex]
+        end
+
+        def nofollow
+          webpage[:nofollow]
+        end
+
+        def noodp
+          webpage[:noodp]
+        end
+
+        def nosnippet
+          webpage[:nosnippet]
+        end
+
+        def noarchive
+          webpage[:noarchive]
+        end
+
+        def noimageindex
+          webpage[:noimageindex]
+        end
+
+        private
+
+        def webpage
+          Cortex::Snippets::Client::current_webpage(request)
+        end
+      end
+    end
+  end
+end

lib/cortex/snippets/client/helper.rb

@@ -0,0 +1,17 @@
+module Cortex
+  module Snippets
+    module Client
+      class Railtie < Rails::Railtie
+        initializer 'cortex-snippets-client.view_controller_helpers' do |app|
+          ActiveSupport.on_load :action_view do
+            include Helper
+          end
+
+          ActiveSupport.on_load :action_controller do
+            include Helper
+          end
+        end
+      end
+    end
+  end
+end

lib/cortex/snippets/client/railtie.rb

@@ -0,0 +1,7 @@
+module Cortex
+  module Snippets
+    module Client
+      VERSION = '0.5.0'
+    end
+  end
+end

lib/cortex/snippets/client/version.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Cortex::Snippets do
+describe Cortex::Snippets::Client do
   it 'has a version number' do
-    expect(Cortex::Snippets::VERSION).not_to be nil
+    expect(Cortex::Snippets::Client::VERSION).not_to be nil
   end
 end

lib/cortex/snippets/railtie.rb

@@ -1,2 +1,2 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'cortex/snippets-client'
+require 'cortex-snippets-client-ruby'