wcc-blogs-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cc54b2ea711debb4b4cd66ff1741ad5c159316d
-  data.tar.gz: e1c666d7b2f98185a8e8b7bd668f2ec95d6d3769
+  metadata.gz: 91c71241330bf18f4d6561c4b34a44ef9a4d9a36
+  data.tar.gz: b822af919ef3a0521440c9f82050ca94e1b59e1a
 SHA512:
-  metadata.gz: 4f09bf8377c4c0e7ab5e5842ea587f4138bec8278acd4ff8cb1ad04eafe0761f2f88f700bfb674f4b20ae2f19d850cf99c8b2cc6ea0d071a5ef974c1db66b61e
-  data.tar.gz: eefc6154686859afbd7b1db05726ca756820dbd25f2009359112f5b353fcc6b66dec552f3bb5f777c35da4c49bbc75acd079407660a272a2fddc06f6f42f4796
+  metadata.gz: e2f0fec0ce8116c8fa79af618abe0b4a580796b1368b0b1ad963b24b3e7648f31c4dda3ab569a5dfa45fe440750cb959721e1cc29f7f1e99ab8d51ff589eb8ea
+  data.tar.gz: 5403a6f4122e7a23002afb7c2dfdfe07840e008316adcc7f1bf3812d92f303a115dec900a1a62fc4c2860c07b26f763121842370651ea47f91cafa6001714538

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+Lint/AssignmentInCondition:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - 'wcc-blogs-client.gemspec'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-05-10 13:54:26 -0500 using RuboCop version 0.60.0.
+# on 2019-05-13 14:26:19 -0500 using RuboCop version 0.60.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,12 +13,6 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'wcc-blogs-client.gemspec'
 
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'lib/wcc/blogs/client.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -43,7 +37,7 @@ Style/TrailingCommaInHashLiteral:
   Exclude:
     - 'lib/wcc/blogs/client.rb'
 
-# Offense count: 6
+# Offense count: 8
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

data/lib/wcc/blogs/metadata.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module WCC::Blogs
+  class Metadata
+    extend WCC::Blogs::Utils
+
+    attr_reader :raw
+
+    def initialize(raw)
+      @raw = raw
+    end
+
+    define_camelcase_alias(
+      'id',
+      'canonical_link',
+      'meta_description',
+      'meta_flag'
+    ) do |camelcase|
+      raw[camelcase]
+    end
+
+    define_camelcase_alias('meta_keywords') do |camelcase|
+      return [] unless keywords = raw[camelcase]
+
+      # Currently the json looks like this:
+      # "metaKeywords": {
+      #   "metaKeywords": "regeneration, recovery"
+      # },
+      # TODO: make it like this - "metaKeywords": "regeneration, recovery"
+      keywords = keywords[camelcase] if keywords.is_a?(Hash) && keywords[camelcase]
+
+      keywords
+    end
+  end
+end

data/lib/wcc/blogs/post.rb

@@ -2,6 +2,7 @@
 
 module WCC::Blogs
   class Post
+    extend WCC::Blogs::Utils
     require 'time'
 
     def self.find(slug)
@@ -23,10 +24,6 @@ module WCC::Blogs
       [author.firstName, author.lastName].compact.join(' ')
     end
 
-    def date
-      publish_at || created_at
-    end
-
     def html
       @html ||=
         WCC::Blogs.config.cache.fetch(['BlogPost', fragment_path]) do
@@ -34,11 +31,14 @@ module WCC::Blogs
         end
     end
 
+    def metadata
+      WCC::Blogs::Metadata.new(raw['metadata']) if raw['metadata']
+    end
+
     def published?
       return false if publishing_targets.empty?
 
-      publishing_targets.any? { |t| t['key'] == WCC::Blogs.config.publishing_target } &&
-        (!publish_at || (publish_at <= Time.now))
+      publishing_targets.any? { |t| t['key'] == WCC::Blogs.config.publishing_target }
     end
 
     def time_to_read
@@ -50,72 +50,41 @@ module WCC::Blogs
       slug.sub(%r{^/}, '')
     end
 
-    def self.camelcase(str)
-      str.gsub(/_(\w)/) { Regexp.last_match(1).upcase }
-    end
-
-    %w[
-      id
-      title
-      subtitle
-      slug
-      host
-      path
-      digest
-      fragment_path
-    ].each do |method|
-      attribute = camelcase(method)
-
-      define_method method do
-        raw[attribute]
-      end
-
-      alias_method attribute, method if attribute != method
+    define_camelcase_alias(
+      'id',
+      'title',
+      'subtitle',
+      'slug',
+      'host',
+      'path',
+      'digest',
+      'fragment_path'
+    ) do |camelcase|
+      raw[camelcase]
     end
 
-    %w[
-      created_at
-      publish_at
-      updated_at
-    ].each do |method|
-      attribute = camelcase(method)
+    define_camelcase_alias(
+      'date'
+    ) do |camelcase|
+      value = raw[camelcase]
 
-      define_method method do
-        value = raw[attribute]
-        return unless value && value.length
+      return unless value && value.length
 
-        Time.parse(value)
-      end
-
-      alias_method attribute, method if attribute != method
+      Time.parse(value)
     end
 
-    %w[
-      author
-      hero_image
-      thumbnail_image
-    ].each do |method|
-      attribute = camelcase(method)
-
-      define_method method do
-        OpenStruct.new(raw[attribute]) if raw[attribute]
-      end
-
-      alias_method attribute, method if attribute != method
+    define_camelcase_alias(
+      'author',
+      'hero_image',
+      'thumbnail_image'
+    ) do |camelcase|
+      OpenStruct.new(raw[camelcase]) if raw[camelcase]
     end
 
-    %w[
-      publishing_targets
-    ].each do |method|
-      attribute = camelcase(method)
-
-      define_method method do
-        return [] unless raw[attribute]
-
-        raw[attribute].map { |val| OpenStruct.new(val) if val }
-      end
+    define_camelcase_alias('publishing_targets') do |camelcase|
+      return [] unless raw[camelcase]
 
-      alias_method attribute, method if attribute != method
+      raw[camelcase].map { |val| OpenStruct.new(val) if val }
     end
 
     alias cache_key digest

data/lib/wcc/blogs/utils.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module WCC::Blogs
+  module Utils
+    def camelcase(term)
+      term
+        .to_s
+        .gsub(%r{(?:_|(/))([a-z\d]*)}) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }
+        .gsub(%r{/}, '::')
+    end
+
+    def define_camelcase_alias(*underscore_method_names, &block)
+      underscore_method_names.each do |method|
+        attribute = camelcase(method)
+
+        define_method(method) { instance_exec(attribute, &block) }
+        alias_method attribute, method if attribute != method
+      end
+    end
+  end
+end

data/lib/wcc/blogs/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Blogs
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/wcc/blogs.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
 require 'wcc'
+
+require 'wcc/blogs/utils'
+
 require 'wcc/blogs/client'
 require 'wcc/blogs/errors'
+
+require 'wcc/blogs/metadata'
 require 'wcc/blogs/post'
 
 module WCC::Blogs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-blogs-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Watermark Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -124,7 +124,9 @@ files:
 - lib/wcc/blogs.rb
 - lib/wcc/blogs/client.rb
 - lib/wcc/blogs/errors.rb
+- lib/wcc/blogs/metadata.rb
 - lib/wcc/blogs/post.rb
+- lib/wcc/blogs/utils.rb
 - lib/wcc/blogs/version.rb
 - wcc-blogs-client.gemspec
 homepage: https://github.com/watermarkchurch/papyrus/wcc-blogs-client