wcc-blogs-client 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 31db17ab6f4a265987b00b832872f9012ab6eb28c4fbbbb64796b0095e3662a3
-  data.tar.gz: c6722de62467c9c08fc0eca404a17e2bb269203ed49ac7cfd27ad0b2749d9d0f
+SHA1:
+  metadata.gz: 877882f8f0a84886bda0d722f5c2193c4590556c
+  data.tar.gz: eaeb84c5dee20a2cc375a020d3d664141e433d19
 SHA512:
-  metadata.gz: fa5fc97d7196188bb4a31f74c822aa79c1c5f161e4f97bb0a7be36461640d9260746609b55b044a06a14f5a561dc2f7a83370305178fa278cc7a3f4ef4b00a66
-  data.tar.gz: 59b189fa06be52a11a85d2d4f9a3d0f1d5b2747e396dc19848d88b24fc59ddf5091f643b6157d67f0b55537774899dd69360c716722ae3ac763a3475ae99839e
+  metadata.gz: 1cc0ed72da511f3726da0b564f32d9e613c38a9196aeae1d9bce18bd8684de44b58d89d85ac8d908cb0a4ed709e81aa4723914aa6a9ff8847377257fa918d8bc
+  data.tar.gz: b4a19b7f2b0b0fafd90a80d0b822041c2ed0083d104899bcd99e1934eeff04c851512a98616aeb93dda7250ec5b4977e13b8c65acd71be781b39ff5f09d13b4e

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
@@ -45,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/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

@@ -12,11 +12,12 @@ 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(
       'title',
+      'subtitle',
       'slug'
     ) do |camelcase|
       raw[camelcase]

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
@@ -57,11 +56,14 @@ module WCC::Blogs
       'path',
       'digest',
       'fragment_path',
-      'read_time'
+      'read_time',
+      'word_count'
     ) do |camelcase|
       raw[camelcase]
     end
 
+    alias time_to_read read_time
+
     define_camelcase_alias(
       'date',
       'updated_at'
@@ -103,6 +105,10 @@ module WCC::Blogs
       related.map { |val| WCC::Blogs::LinkedBlogPostSummary.new(val, client: @client) }
     end
 
-    alias cache_key digest
+    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(
@@ -27,7 +30,8 @@ module WCC::Blogs
       'subtitle',
       'slug',
       'digest',
-      'read_time'
+      'read_time',
+      'word_count'
     ) do |camelcase|
       raw[camelcase]
     end
@@ -64,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
@@ -41,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.7.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.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -197,6 +197,7 @@ 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
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key:
 specification_version: 4
 summary: ''