wcc-blogs-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ee40f5dbfa5ed338bfcfc4ef0a28cf1fac1554
-  data.tar.gz: cd4b83add94f175077a9a31062caf2a7a9a0dd64
+  metadata.gz: 6ea9c98dc8b5e8886d97ab7adf328cf694485a77
+  data.tar.gz: 0d5fbf107cf251a77b4040985911343a6d438d03
 SHA512:
-  metadata.gz: 1b3cb2d385fe25b0c312e2e742d2245f7f4e6eb1a58bc7a4b140b210bb612cab8fcb396c16afbbedfb36555f9c6ed5e73387854b5c477b8b7af3c28f99d2b9b1
-  data.tar.gz: 2efbf1c351083e6460b1e09db3a383f8e6c6c48ac9ad25720e6a3982823545e11d5080ab77d3772da86e2150e91b29ef3ba91e7dcb2ec302d0d1339b0edcd3d7
+  metadata.gz: 7fe9014018bde8b41d86788370ffce146293d3c1957f801bef609873829179f9e8f06e73362b230c48f4df4218a453eb1889f1d4ddbdec558b57e9c311569b1f
+  data.tar.gz: 5835d4e614e6cd2b7bd76cba97d252c70d7b4c4b37722fcda0b46260e155fe1e01e8cb8c9eba7aae0e46c29b8e7935efe1a04ae373aea87e29f9d97391fe6f2b

data/lib/wcc/blogs/client.rb

@@ -6,11 +6,13 @@ require_relative 'client/response'
 
 module WCC::Blogs
   class Client
-    attr_reader :base_url, :publishing_target
+    attr_reader :base_url, :publishing_target, :base_path
 
     def initialize(publishing_target:, **options)
       @publishing_target = publishing_target
-      @base_url = options[:base_url] || 'https://di0v2frwtdqnv.cloudfront.net'
+      base_url = URI.parse(options[:base_url] || 'https://di0v2frwtdqnv.cloudfront.net')
+      @base_path = base_url.path == '' ? '/api/v1' : base_url.path
+      @base_url = base_url.to_s
       @connection = options[:connection] || default_connection
       @query_defaults = options[:query_defaults] || {}
     end
@@ -26,14 +28,26 @@ module WCC::Blogs
                    get_http(url, query))
     end
 
-    def blog_post(slug, digest: nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      path = '/blog/' + slug.sub(%r{^/}, '')
-      path += '/' + digest if digest
-      path += '.json'
+    def property_show(property = nil)
+      property ||= publishing_target
+      path = base_path + '/property/' + property
+      get(path).assert_ok!
+    end
+
+    def blog_list(property: nil, year: nil)
+      property ||= publishing_target
+      path = base_path + '/property/' + property + '/blog'
+      path += '/' + year if year
+      get(path).assert_ok!
+    end
+
+    def blog_show(slug, digest: nil) # rubocop:disable Metrics/AbcSize
+      path = base_path + '/blog/' + slug.sub(%r{^/}, '')
+      path += '/' + digest + '.json' if digest
 
       get(path).tap do |resp|
         resp.assert_ok!
-        next if resp.raw['publishingTargets'].any? { |t| t['key'] == publishing_target }
+        next if resp.raw['publishedProperties'].any? { |t| t['key'] == publishing_target }
 
         raise WCC::Blogs::NotFoundException,
               "Blog post '#{slug}' is not published to #{publishing_target}"
@@ -42,11 +56,6 @@ module WCC::Blogs
       raise WCC::Blogs::NotFoundException, e.message
     end
 
-    def list
-      path = '/targets/' + publishing_target + '.json'
-      get(path).assert_ok!
-    end
-
     private
 
     def get_http(url, query, headers = {})

data/lib/wcc/blogs/metadata.rb

@@ -12,13 +12,15 @@ module WCC::Blogs
 
     define_camelcase_alias(
       'id',
-      'canonical_link',
+      'canonical_url',
       'meta_description',
       'meta_flag'
     ) do |camelcase|
       raw[camelcase]
     end
 
+    alias canonical_link canonical_url
+
     define_camelcase_alias('meta_keywords') do |camelcase|
       next unless keywords = raw[camelcase]
 

data/lib/wcc/blogs/post.rb

@@ -6,7 +6,7 @@ module WCC::Blogs
     require 'time'
 
     def self.find(slug)
-      new(WCC::Blogs.client.blog_post(slug).raw, client: WCC::Blogs.client)
+      new(WCC::Blogs.client.blog_show(slug).raw, client: WCC::Blogs.client)
     end
 
     def self.find_all
@@ -27,7 +27,7 @@ module WCC::Blogs
     end
 
     def html
-      @html ||= @client.get(URI.join(host, fragment_path).to_s)
+      @html ||= @client.get(_links.fragment)
                        .body
                        .force_encoding('UTF-8')
     end
@@ -53,6 +53,7 @@ module WCC::Blogs
       'id',
       'title',
       'subtitle',
+      'summary',
       'slug',
       'host',
       'path',
@@ -79,7 +80,15 @@ module WCC::Blogs
       OpenStruct.new(raw[camelcase]) if raw[camelcase]
     end
 
-    define_camelcase_alias('publishing_targets') do |camelcase|
+    def _links
+      OpenStruct.new(raw['_links'] || {})
+    end
+
+    define_camelcase_alias(
+      'published_properties',
+      'categories',
+      'tags'
+    ) do |camelcase|
       targets = raw[camelcase] || []
 
       targets.map { |val| OpenStruct.new(val) if val }

data/lib/wcc/blogs/post_summary.rb

@@ -3,7 +3,7 @@ module WCC::Blogs
     extend WCC::Blogs::Utils
 
     def self.find_all
-      WCC::Blogs.client.list.items.map do |summary|
+      WCC::Blogs.client.blog_list.items.map do |summary|
         new(summary, client: WCC::Blogs.client)
       end
     end
@@ -16,7 +16,7 @@ module WCC::Blogs
     end
 
     def full_post
-      Post.new(@client.blog_post(slug, digest: digest).raw)
+      Post.new(@client.get(_links.self).raw)
     end
 
     define_camelcase_alias(
@@ -24,9 +24,8 @@ module WCC::Blogs
       'title',
       'subtitle',
       'slug',
-      'path',
-      'digest',
-      'fragment_path'
+      'author',
+      'digest'
     ) do |camelcase|
       raw[camelcase]
     end
@@ -46,10 +45,18 @@ module WCC::Blogs
       OpenStruct.new(raw[camelcase]) if raw[camelcase]
     end
 
-    define_camelcase_alias('publishing_targets') do |camelcase|
-      targets = raw[camelcase] || []
+    def _links
+      OpenStruct.new(raw['_links'] || {})
+    end
+
+    define_camelcase_alias(
+      'published_properties',
+      'categories',
+      'tags'
+    ) do |camelcase|
+      values = raw[camelcase] || []
 
-      targets.map { |val| OpenStruct.new(val) if val }
+      values.map { |val| OpenStruct.new(val) if val }
     end
 
     alias cache_key digest

data/lib/wcc/blogs/property.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module WCC::Blogs
+  class Property
+    extend WCC::Blogs::Utils
+    require 'time'
+
+    def self.find(property = nil)
+      new(WCC::Blogs.client.property_show(property).raw, client: WCC::Blogs.client)
+    end
+
+    attr_reader :raw
+
+    def initialize(raw, client: WCC::Blogs.client)
+      @raw = raw
+      @client = client
+    end
+
+    def to_param
+      key
+    end
+
+    define_camelcase_alias(
+      'key',
+      'digest'
+    ) do |camelcase|
+      raw[camelcase]
+    end
+
+    def _links
+      OpenStruct.new(raw['_links'] || {})
+    end
+
+    define_camelcase_alias(
+      'accepted_tags',
+      'categories'
+    ) do |camelcase|
+      targets = raw[camelcase] || []
+
+      targets.map { |val| OpenStruct.new(val) if val }
+    end
+
+    alias cache_key digest
+  end
+end

data/lib/wcc/blogs/utils.rb

@@ -2,6 +2,8 @@
 
 module WCC::Blogs
   module Utils
+    module_function
+
     def camelcase(term)
       term
         .to_s

data/lib/wcc/blogs/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Blogs
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.4.1'.freeze
   end
 end

data/lib/wcc/blogs.rb

@@ -10,6 +10,7 @@ require 'wcc/blogs/errors'
 require 'wcc/blogs/metadata'
 require 'wcc/blogs/post'
 require 'wcc/blogs/post_summary'
+require 'wcc/blogs/property'
 
 module WCC::Blogs
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-blogs-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Watermark Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -199,6 +199,7 @@ files:
 - lib/wcc/blogs/metadata.rb
 - lib/wcc/blogs/post.rb
 - lib/wcc/blogs/post_summary.rb
+- lib/wcc/blogs/property.rb
 - lib/wcc/blogs/utils.rb
 - lib/wcc/blogs/version.rb
 - wcc-blogs-client.gemspec
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ''