cortex-snippets-client 0.8.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b0723a93b68708387d68b12c61bd6a9dd83317
-  data.tar.gz: 6a1bdac0593168b74292de6b7672e8968b8fc162
+  metadata.gz: 5a0a5085dbcbd4d1d792cff72f4e0b60dd38eee3
+  data.tar.gz: 550740427579f08cbc93f0e33f52c3cc44985bec
 SHA512:
-  metadata.gz: 3f66164f7e8d53e2b8b0cd492b3d9881ef62798974d22d6c16c0516d108682305f371193658b9f5bd74d43ca02adba856002ffee2c7837f34d015846f62c0667
-  data.tar.gz: 7080574753504e32b766ae1cf98a6bff1f2d111639bb254f7b09e10a97edc4b40993e459d706eeaf82e85afabc122866edbdc3d7a6717bb54fb79c55e7f71e86
+  metadata.gz: 086cb48328524926153665e802951de93679a79e798f133c62271e7576551dd72b989993e022812eb54745a0b534a9540b3d00ba251e5adb68ce7a3640c84416
+  data.tar.gz: bbd67ff27361d4157645fad1ba4e7659de1f86ec740f5a37f4a32a6e211fb93c092b2b35856f3e2c1bbb51ca6719d69e7d9095e2fb4fd3c225cbc1ce1ba526ed

data/CHANGELOG.md

@@ -3,6 +3,7 @@ Version History
     * All Version bumps are required to update this file as well!!
 ----
 
+* 1.0.0 - Multi-tenancy Rebuild, now takes in Cortex Client
 * 0.8.1 - Dependency upgrades, etc
 * 0.8.0 - Add Dynamic Yield Metadata
 * 0.7.0 - Add SEO Robot Metadata

data/cortex-snippets-client-ruby.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'cortex-client', '~> 0.10'
-  spec.add_dependency 'connection_pool', '~> 2.2'
   spec.add_dependency 'addressable', '~> 2.5'
 
   spec.add_development_dependency 'rake', '~> 12.0'

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

@@ -1,7 +1,7 @@
 module Cortex
   module Snippets
     module Client
-      VERSION = '0.8.1'
+      VERSION = '1.0.0'
     end
   end
 end

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

@@ -0,0 +1,69 @@
+module Cortex
+  module Snippets
+    module Client
+      class Webpage
+        def initialize(cortex_client, url)
+          @webpage = cortex_client.webpages.get_feed(url).contents
+        end
+
+        def seo_title
+          @webpage[:seo_title]
+        end
+
+        def seo_description
+          @webpage[:seo_description]
+        end
+
+        def seo_keywords
+          @webpage[:seo_keyword_list]
+        end
+
+        def seo_robots
+          robot_information = []
+          index_options = [:noindex, :nofollow, :noodp, :nosnippet, :noarchive, :noimageindex]
+
+          index_options.each do |index_option|
+            robot_information << index_option if @webpage[index_option]
+          end
+
+          robot_information
+        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
+
+        def dynamic_yield
+          {
+            sku: @webpage[:dynamic_yield_sku],
+            category: @webpage[:dynamic_yield_category]
+          }
+        end
+
+        def snippets
+          @webpage[:snippets]
+        end
+      end
+    end
+  end
+end

data/lib/cortex/snippets/client.rb

@@ -1,37 +1,41 @@
-require 'cortex/snippets/client/helper'
-require 'cortex/snippets/client/railtie' if defined?(Rails)
-require 'cortex-client'
-require 'connection_pool'
-require 'addressable/template'
+require 'cortex/snippets/client/webpage'
+require 'addressable/uri'
 
 module Cortex
   module Snippets
-    module Client
-      class << self
-        def cortex_client
-          if ENV['CORTEX_SNIPPET_ACCESS_TOKEN'].nil? || ENV['CORTEX_SNIPPET_ACCESS_TOKEN'].empty?
-            @cortex_client ||= ConnectionPool::Wrapper.new(size: 5, timeout: 3) { Cortex::Client.new(key: ENV['CORTEX_SNIPPET_KEY'], secret: ENV['CORTEX_SNIPPET_SECRET'], base_url: ENV['CORTEX_SNIPPET_BASE_URL'], scopes: ENV['CORTEX_SNIPPET_SCOPES']) }
-          else
-            @cortex_client ||= ConnectionPool::Wrapper.new(size: 5, timeout: 3) { Cortex::Client.new(access_token: ENV['CORTEX_SNIPPET_ACCESS_TOKEN']) }
-          end
+    class Client
+      def initialize(cortex_client)
+        @cortex_client = cortex_client
+      end
+
+      def snippet(options = {}, &block)
+        snippets = current_webpage(@cortex_client).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 current_webpage(request)
-          if defined?(Rails)
-            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'
+      def current_webpage
+        if defined?(Rails)
+          url = sanitized_webpage_url(request.original_url)
+          Rails.cache.fetch("webpages/#{@cortex_client.access_token.client.id}/#{url}", race_condition_ttl: 10) do
+            Cortex::Snippets::Client::Webpage.new(@cortex_client, url)
           end
+        else
+          raise 'Your Web framework is not supported. Supported frameworks: Rails'
         end
+      end
 
-        def sanitized_webpage_url(url)
-          uri = Addressable::URI.parse(url)
-          path = uri.path == '/' ? uri.path : uri.path.chomp('/')
-          "#{uri.scheme}://#{uri.authority}#{path}"
-        end
+      private
+
+      def sanitized_webpage_url(url)
+        uri = Addressable::URI.parse(url)
+        path = uri.path == '/' ? uri.path : uri.path.chomp('/')
+        "#{uri.scheme}://#{uri.authority}#{path}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-snippets-client
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.0
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cortex-client
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -100,9 +86,8 @@ files:
 - cortex-snippets-client-ruby.gemspec
 - lib/cortex-snippets-client.rb
 - lib/cortex/snippets/client.rb
-- lib/cortex/snippets/client/helper.rb
-- lib/cortex/snippets/client/railtie.rb
 - lib/cortex/snippets/client/version.rb
+- lib/cortex/snippets/client/webpage.rb
 homepage: https://github.com/cortex-cms/cortex-snippets-client-ruby
 licenses:
 - Apache-2.0
@@ -123,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+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/helper.rb

@@ -1,78 +0,0 @@
-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_keyword_list]
-        end
-
-        def seo_robots
-          robot_information = []
-          index_options = [:noindex, :nofollow, :noodp, :nosnippet, :noarchive, :noimageindex]
-
-          index_options.each do |index_option|
-            robot_information << index_option if webpage[index_option]
-          end
-
-          robot_information
-        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
-
-        def dynamic_yield
-          {
-              sku: webpage[:dynamic_yield_sku],
-              category: webpage[:dynamic_yield_category]
-          }
-        end
-
-        private
-
-        def webpage
-          Cortex::Snippets::Client::current_webpage(request)
-        end
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-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