wcc-blogs-client 0.5.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55db25dca22951c220756f7a472ab3f7d65c0da3
-  data.tar.gz: d47dc5b1f2a2092dfffdfe1ec59e64eff21667fc
+  metadata.gz: 877882f8f0a84886bda0d722f5c2193c4590556c
+  data.tar.gz: eaeb84c5dee20a2cc375a020d3d664141e433d19
 SHA512:
-  metadata.gz: 321b737f61714148d6cb645d48dacf306eddd3aac66688c88069083d9fc70c2442b95985d7f38a903a1e46a05dfe18891cb21376d4585085e467620d8e9c4a09
-  data.tar.gz: 1010a79f4de4080c609a5e49a2152a9e66f23e6a320485d481b6962cfd9c937f8f207911d9f6f517f4429713a76030519e76ecf6b2f898f5a96d26479fcb2481
+  metadata.gz: 1cc0ed72da511f3726da0b564f32d9e613c38a9196aeae1d9bce18bd8684de44b58d89d85ac8d908cb0a4ed709e81aa4723914aa6a9ff8847377257fa918d8bc
+  data.tar.gz: b4a19b7f2b0b0fafd90a80d0b822041c2ed0083d104899bcd99e1934eeff04c851512a98616aeb93dda7250ec5b4977e13b8c65acd71be781b39ff5f09d13b4e

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/linked_blog_post_summary'
 require 'wcc/blogs/property'
 require 'wcc/blogs/collection'
 require 'wcc/blogs/collection_summary'

data/lib/wcc/blogs/client/response.rb

@@ -20,7 +20,7 @@ module WCC::Blogs
       alias_method :to_json, :raw
 
       def next_page_url
-        raw.dig('_links', 'previous')
+        raw.dig('_links', 'next')
       end
 
       def next_page?

data/lib/wcc/blogs/collection.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require_relative './concerns/caching'
+
 module WCC::Blogs
   class Collection
     extend WCC::Blogs::Utils
+    include WCC::Blogs::Concerns::Caching
 
-    def self.find(key = nil)
-      new(WCC::Blogs.client.collection_show(key).raw, client: WCC::Blogs.client)
+    def self.find(key = nil, client: WCC::Blogs.client)
+      new(client.collection_show(key).raw, client: client)
     end
 
     attr_reader :raw
@@ -22,11 +25,18 @@ module WCC::Blogs
     define_camelcase_alias(
       'key',
       'title',
-      'digest'
+      'digest',
+      'updated_at'
     ) do |camelcase|
       raw[camelcase]
     end
 
+    define_camelcase_alias(
+      'hero_image'
+    ) do |camelcase|
+      OpenStruct.new(raw[camelcase]) if raw[camelcase]
+    end
+
     def posts
       @posts ||=
         (raw['posts'] || []).map do |summary|
@@ -38,6 +48,10 @@ module WCC::Blogs
       OpenStruct.new(raw['_links'] || {})
     end
 
-    alias cache_key digest
+    private
+
+    def cache_key_without_version
+      "WCC::Blogs::Collection/#{key}"
+    end
   end
 end

data/lib/wcc/blogs/collection_summary.rb

@@ -21,33 +21,8 @@ module WCC::Blogs
     def posts
       @posts ||=
         (raw['posts'] || []).map do |summary|
-          PostReference.new(summary, client: @client)
+          WCC::Blogs::LinkedBlogPostSummary.new(summary, client: @client)
         end
     end
-
-    class PostReference
-      extend WCC::Blogs::Utils
-
-      attr_reader :raw
-
-      def initialize(raw, client: WCC::Blogs.client)
-        @raw = raw
-        @client = client
-      end
-
-      def full_post
-        Post.new(@client.get(_links.self).raw)
-      end
-
-      define_camelcase_alias(
-        'slug'
-      ) do |camelcase|
-        raw[camelcase]
-      end
-
-      def _links
-        OpenStruct.new(raw['_links'] || {})
-      end
-    end
   end
 end

data/lib/wcc/blogs/concerns/caching.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module WCC::Blogs::Concerns
+  module Caching
+    def cache_key
+      unless defined?(ActiveRecord::Base) &&
+             ActiveRecord::Base.respond_to?(:cache_versioning) &&
+             ActiveRecord::Base.cache_versioning == true
+        return cache_key_with_version
+      end
+
+      cache_key_without_version
+    end
+
+    # https://guides.rubyonrails.org/caching_with_rails.html#low-level-caching
+    def cache_key_with_version
+      [cache_key_without_version, cache_version].join('/')
+    end
+
+    def cache_version
+      updated_at&.to_i
+    end
+  end
+end

data/lib/wcc/blogs/linked_blog_post_summary.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module WCC::Blogs
+  class LinkedBlogPostSummary
+    extend WCC::Blogs::Utils
+
+    attr_reader :raw
+
+    def initialize(raw, client: WCC::Blogs.client)
+      @raw = raw
+      @client = client
+    end
+
+    def full_post
+      Post.new(@client.get(_links.self).raw, client: @client)
+    end
+
+    define_camelcase_alias(
+      'title',
+      'subtitle',
+      'slug'
+    ) do |camelcase|
+      raw[camelcase]
+    end
+
+    define_camelcase_alias(
+      'date'
+    ) do |camelcase|
+      value = raw[camelcase]
+
+      Time.parse(value) if value&.length
+    end
+
+    def _links
+      OpenStruct.new(raw['_links'] || {})
+    end
+  end
+end

data/lib/wcc/blogs/post.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
+require_relative './concerns/caching'
+
 module WCC::Blogs
   class Post
     extend WCC::Blogs::Utils
+    include WCC::Blogs::Concerns::Caching
     require 'time'
 
-    def self.find(slug)
-      new(WCC::Blogs.client.blog_show(slug).raw, client: WCC::Blogs.client)
+    def self.find(slug, client: WCC::Blogs.client)
+      new(client.blog_show(slug).raw, client: client)
     end
 
-    def self.find_all
-      PostSummary.find_all.map(&:full_post)
+    def self.find_all(client: WCC::Blogs.client)
+      PostSummary.find_all(client: client).map(&:full_post)
     end
 
     attr_reader :raw
@@ -26,6 +29,7 @@ module WCC::Blogs
 
     def html
       @html ||= @client.get(_links.fragment)
+                       .assert_ok!
                        .body
                        .force_encoding('UTF-8')
     end
@@ -38,11 +42,6 @@ module WCC::Blogs
       true
     end
 
-    def time_to_read
-      # TODO
-      nil
-    end
-
     def to_param
       slug.sub(%r{^/}, '')
     end
@@ -56,11 +55,15 @@ module WCC::Blogs
       'host',
       'path',
       'digest',
-      'fragment_path'
+      'fragment_path',
+      'read_time',
+      'word_count'
     ) do |camelcase|
       raw[camelcase]
     end
 
+    alias time_to_read read_time
+
     define_camelcase_alias(
       'date',
       'updated_at'
@@ -97,6 +100,15 @@ module WCC::Blogs
       CollectionSummary.new(raw['collection'], client: @client) if raw['collection']
     end
 
-    alias cache_key digest
+    define_camelcase_alias('related_posts') do |camelcase|
+      related = raw[camelcase] || []
+      related.map { |val| WCC::Blogs::LinkedBlogPostSummary.new(val, client: @client) }
+    end
+
+    private
+
+    def cache_key_without_version
+      "WCC::Blogs::Post/#{slug}"
+    end
   end
 end

data/lib/wcc/blogs/post_summary.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require_relative './concerns/caching'
+
 module WCC::Blogs
   class PostSummary
     extend WCC::Blogs::Utils
+    include WCC::Blogs::Concerns::Caching
 
-    def self.find_all
-      WCC::Blogs.client.blog_list.items.map do |summary|
-        new(summary, client: WCC::Blogs.client)
+    def self.find_all(client: WCC::Blogs.client)
+      client.blog_list.items.map do |summary|
+        new(summary, client: client)
       end
     end
 
@@ -18,7 +21,7 @@ module WCC::Blogs
     end
 
     def full_post
-      Post.new(@client.get(_links.self).raw)
+      Post.new(@client.get(_links.self).raw, client: @client)
     end
 
     define_camelcase_alias(
@@ -26,7 +29,9 @@ module WCC::Blogs
       'title',
       'subtitle',
       'slug',
-      'digest'
+      'digest',
+      'read_time',
+      'word_count'
     ) do |camelcase|
       raw[camelcase]
     end
@@ -42,6 +47,7 @@ module WCC::Blogs
 
     define_camelcase_alias(
       'author',
+      'hero_image',
       'thumbnail_image',
       'flags'
     ) do |camelcase|
@@ -62,6 +68,10 @@ module WCC::Blogs
       values.map { |val| OpenStruct.new(val) if val }
     end
 
-    alias cache_key digest
+    private
+
+    def cache_key_without_version
+      "WCC::Blogs::PostSummary/#{slug}"
+    end
   end
 end

data/lib/wcc/blogs/property.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require_relative './concerns/caching'
+
 module WCC::Blogs
   class Property
     extend WCC::Blogs::Utils
+    include WCC::Blogs::Concerns::Caching
     require 'time'
 
-    def self.find(property = nil)
-      new(WCC::Blogs.client.property_show(property).raw, client: WCC::Blogs.client)
+    def self.find(property = nil, client: WCC::Blogs.client)
+      new(client.property_show(property).raw, client: client)
     end
 
     attr_reader :raw
@@ -22,7 +25,8 @@ module WCC::Blogs
 
     define_camelcase_alias(
       'key',
-      'digest'
+      'digest',
+      'updated_at'
     ) do |camelcase|
       raw[camelcase]
     end
@@ -40,6 +44,10 @@ module WCC::Blogs
       targets.map { |val| OpenStruct.new(val) if val }
     end
 
-    alias cache_key digest
+    private
+
+    def cache_key_without_version
+      "WCC::Blogs::Property/#{key}"
+    end
   end
 end

data/lib/wcc/blogs/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Blogs
-    VERSION = '0.5.2'
+    VERSION = '0.7.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-blogs-client
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Watermark Dev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -197,7 +197,9 @@ files:
 - lib/wcc/blogs/client/response.rb
 - lib/wcc/blogs/collection.rb
 - lib/wcc/blogs/collection_summary.rb
+- lib/wcc/blogs/concerns/caching.rb
 - lib/wcc/blogs/errors.rb
+- lib/wcc/blogs/linked_blog_post_summary.rb
 - lib/wcc/blogs/metadata.rb
 - lib/wcc/blogs/post.rb
 - lib/wcc/blogs/post_summary.rb
@@ -209,7 +211,7 @@ homepage: https://github.com/watermarkchurch/papyrus/wcc-blogs-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,9 +226,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.2.3
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []