cortex-snippets-client-ruby 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df338b4f0e6a4346e27396bb9c6001ee5196fdc9
-  data.tar.gz: f6946895f9c94d5befdb34e5f914bcf4ef748cb6
+  metadata.gz: 658d9c6e13da576bf96579154111e317484235b8
+  data.tar.gz: 9dd435e240feff3a30f943fd907a28baffda1af2
 SHA512:
-  metadata.gz: 64b1f827bc5acca985818a4f091dbd35f5d129de68d24ac774c84f0b73e5417c02942021edc1eb8fb887a7b96116dc575ca8c80eee5ee5031c58438086750293
-  data.tar.gz: 50f61236247d27e085d13ba24621e343ab99dc5db4d60e144f8601d03c4ae0c8629c7ced01026d77e283c0b54dcc33e7f993a2c899a1624c22247a2341aa104b
+  metadata.gz: 6804bad23b04cf563059415db5bb70fba149391d4eaedfe04946244befb9db8ab456e3cc5402d77df3bb47a70ef7bf9245ab1ded84625119ffcae7e1b96da701
+  data.tar.gz: a824953d79ef9714539883851e48c8f1e4622f52c68631340a7f86ec24ea3cf3fcbca546f7cd22b168f51389ebedc1190953f71f2f473804f6264a04e49d6048

data/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.

data/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         = ['ContentEnablementProductTeam@careerbuilder.com']
   spec.license       = 'Apache-2.0'

data/lib/cortex-snippets-client-ruby.rb

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

data/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,7 +18,7 @@ module Cortex
 
         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
@@ -24,8 +26,6 @@ module Cortex
           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)

data/lib/cortex/snippets/client/helper.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

data/lib/cortex/snippets/client/railtie.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

data/lib/cortex/snippets/client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-snippets-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - CB Content Enablement
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cortex-client
@@ -104,6 +104,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -111,11 +112,11 @@ files:
 - bin/console
 - bin/setup
 - cortex-snippets-client-ruby.gemspec
-- lib/cortex/snippets-client.rb
+- lib/cortex-snippets-client-ruby.rb
 - lib/cortex/snippets/client.rb
-- lib/cortex/snippets/railtie.rb
-- lib/cortex/snippets/version.rb
-- lib/cortex/snippets/view_helpers.rb
+- lib/cortex/snippets/client/helper.rb
+- lib/cortex/snippets/client/railtie.rb
+- lib/cortex/snippets/client/version.rb
 homepage: https://github.com/cortex-cms/cortex-snippets-client-ruby
 licenses:
 - Apache-2.0
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides loading of Cortex snippets for Ruby applications, with some Rails

data/lib/cortex/snippets-client.rb

@@ -1,4 +0,0 @@
-require 'cortex/snippets/version'
-require 'cortex/snippets/client'
-require 'cortex/snippets/view_helpers'
-require 'cortex/snippets/railtie' if defined?(Rails)

data/lib/cortex/snippets/railtie.rb

@@ -1,9 +0,0 @@
-module Cortex
-  module Snippets
-    class Railtie < Rails::Railtie
-      initializer 'cortex.snippets.view_helpers' do
-        ActiveSupport.on_load( :action_view ){ include ViewHelpers }
-      end
-    end
-  end
-end

data/lib/cortex/snippets/version.rb

@@ -1,5 +0,0 @@
-module Cortex
-  module Snippets
-    VERSION = '0.4.4'
-  end
-end

data/lib/cortex/snippets/view_helpers.rb

@@ -1,53 +0,0 @@
-module Cortex
-  module Snippets
-    module ViewHelpers
-      def snippet(options = {}, &block)
-        snippet = webpage[:snippets].find { |snippet| snippet.name == options[:id] }
-
-        if snippet.nil? || snippet.empty?
-          content_tag(:snippet, capture(&block), id: options[:id])
-        else
-          content_tag(:snippet, snippet, id: options[:id])
-        end
-      end
-
-      def seo_title
-        webpage[:seo_title]
-      end
-
-      def seo_description
-        webpage[:seo_description]
-      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
-        Client::current_webpage(request)
-      end
-    end
-  end
-end