wcc-contentful 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f05ea585d54f7ca83c96e018021f88776ebb148cc40b7d719d6199b3a3cd9d0c
-  data.tar.gz: 0da490d12beb9938ec51c0ac40e140420966667b72afebc5c9895cf197308ea8
+  metadata.gz: 476f7c65f705c14e012e8c2cbb36f68e29782607377b0a4aa9d0c10fb93458da
+  data.tar.gz: 01aeff71919acef51c8d498c63bc42e822ed3c598e7c636f5faf74baeb74c552
 SHA512:
-  metadata.gz: 979360a35356b041dbe0f8bbd4f0e5bfcaf91909ccc567322ceef8493de25300ea09a081e755142fe23bf9cfd5ea86ca7f919d3218d5dec44a98bcab5921af7d
-  data.tar.gz: 9e5f29e70fdcbccffd72aeb8b896e3518d2236cd699704289e8a3fdf1392201dc49671bab0eb83948e79ee079366de90b46add4ce2027e065db2da28b2be4e85
+  metadata.gz: '0383a5fe8ef8b042d0a9aca04c964051fc5201b89e702a80b616e5c3b36fd6fa7590d768d178e96f3353c998923fc87458697f5b1112bdd000e6e273fdb07f56'
+  data.tar.gz: 776a6ec463edbcd209d28dd2033d6378ac45e44dd9bca790aefe81ea529c4fa4d0cf6725bd3f67e5c4054f41bd930e9905165f8ccd42f2a9f01b3bc0ac1deaf6

data/app/controllers/wcc/contentful/webhook_controller.rb

@@ -36,6 +36,7 @@ module WCC::Contentful
     def authorize_contentful
       config = WCC::Contentful.configuration
 
+      # rubocop:disable Style/SoleNestedConditional
       if config.webhook_username.present? && config.webhook_password.present?
         unless authenticate_with_http_basic do |u, p|
                  u == config.webhook_username &&
@@ -45,6 +46,7 @@ module WCC::Contentful
           return
         end
       end
+      # rubocop:enable Style/SoleNestedConditional
 
       # 'application/vnd.contentful.management.v1+json' is an alias for the 'application/json'
       # content-type, so 'request.content_type' will give 'application/json'

data/lib/tasks/download_schema.rake

@@ -5,7 +5,7 @@ require 'wcc/contentful/downloads_schema'
 
 namespace :wcc_contentful do
   desc 'Downloads the schema from the currently configured space and stores it in ' \
-    'db/contentful-schema.json'
+       'db/contentful-schema.json'
   task download_schema: :environment do
     WCC::Contentful::DownloadsSchema.call
   end

data/lib/wcc/contentful/configuration.rb

@@ -3,22 +3,24 @@
 # This object contains all the configuration options for the `wcc-contentful` gem.
 class WCC::Contentful::Configuration
   ATTRIBUTES = %i[
-    space
     access_token
     app_url
-    management_token
-    environment
-    default_locale
-    preview_token
-    webhook_username
-    webhook_password
-    webhook_jobs
     connection
     connection_options
-    update_schema_file
+    default_locale
+    environment
+    instrumentation_adapter
+    management_token
+    preview_token
     schema_file
+    space
     store
-    instrumentation_adapter
+    sync_retry_limit
+    sync_retry_wait
+    update_schema_file
+    webhook_jobs
+    webhook_password
+    webhook_username
   ].freeze
 
   # (required) Sets the Contentful Space ID.
@@ -57,6 +59,17 @@ class WCC::Contentful::Configuration
   # to implement a webhook job.
   attr_accessor :webhook_jobs
 
+  # Sets the maximum number of times that the SyncEngine will retry synchronization
+  # when it detects that the Contentful CDN's cache has not been updated after a webhook.
+  # Default: 2
+  attr_accessor :sync_retry_limit
+
+  # Sets the base ActiveSupport::Duration that the SyncEngine will wait before retrying.
+  # Each subsequent retry uses an exponential backoff, so the second retry will be
+  # after (2 * sync_retry_wait), the third after (4 * sync_retry_wait), etc.
+  # Default: 2.seconds
+  attr_accessor :sync_retry_wait
+
   # Returns true if the currently configured environment is pointing at `master`.
   def master?
     !environment.present?
@@ -145,9 +158,7 @@ class WCC::Contentful::Configuration
   #           WCC::Contentful::InitializationError if the API cannot be reached.
   def update_schema_file=(sym)
     valid_syms = %i[never if_possible if_missing always]
-    unless valid_syms.include?(sym)
-      raise ArgumentError, "update_schema_file must be one of #{valid_syms}"
-    end
+    raise ArgumentError, "update_schema_file must be one of #{valid_syms}" unless valid_syms.include?(sym)
 
     @update_schema_file = sym
   end
@@ -172,22 +183,24 @@ class WCC::Contentful::Configuration
   attr_accessor :instrumentation_adapter
 
   def initialize
-    @access_token = ENV['CONTENTFUL_ACCESS_TOKEN']
-    @app_url = ENV['APP_URL']
+    @access_token = ENV.fetch('CONTENTFUL_ACCESS_TOKEN', nil)
+    @app_url = ENV.fetch('APP_URL', nil)
     @connection_options = {
       api_url: 'https://cdn.contentful.com/',
       preview_api_url: 'https://preview.contentful.com/',
       management_api_url: 'https://api.contentful.com'
     }
-    @management_token = ENV['CONTENTFUL_MANAGEMENT_TOKEN']
-    @preview_token = ENV['CONTENTFUL_PREVIEW_TOKEN']
-    @space = ENV['CONTENTFUL_SPACE_ID']
+    @management_token = ENV.fetch('CONTENTFUL_MANAGEMENT_TOKEN', nil)
+    @preview_token = ENV.fetch('CONTENTFUL_PREVIEW_TOKEN', nil)
+    @space = ENV.fetch('CONTENTFUL_SPACE_ID', nil)
     @default_locale = nil
     @middleware = []
     @update_schema_file = :if_possible
     @schema_file = 'db/contentful-schema.json'
     @webhook_jobs = []
     @store_factory = WCC::Contentful::Store::Factory.new(self, :direct)
+    @sync_retry_limit = 3
+    @sync_retry_wait = 1.second
   end
 
   # Validates the configuration, raising ArgumentError if anything is wrong.  This

data/lib/wcc/contentful/downloads_schema.rb

@@ -36,7 +36,7 @@ class WCC::Contentful::DownloadsSchema
       begin
         JSON.parse(File.read(@file))
       rescue JSON::ParserError
-        return true
+        return true # rubocop:disable Lint/NoReturnInBeginEndBlocks
       end
 
     existing_cts = contents['contentTypes'].sort_by { |ct| ct.dig('sys', 'id') }
@@ -83,13 +83,14 @@ class WCC::Contentful::DownloadsSchema
   end
 
   def deep_contains_all(expected, actual)
-    if expected.is_a? Array
+    case expected
+    when Array
       expected.each_with_index do |val, i|
         return false unless actual[i]
         return false unless deep_contains_all(val, actual[i])
       end
       true
-    elsif expected.is_a? Hash
+    when Hash
       expected.each do |(key, val)|
         return false unless actual.key?(key)
         return false unless deep_contains_all(val, actual[key])
@@ -107,6 +108,6 @@ class WCC::Contentful::DownloadsSchema
     # only in its treatment of empty arrays in the "validations" field.
     json_string = json_string.gsub(/\[\n\n\s+\]/, '[]')
     # contentful-shell also adds a newline at the end.
-    json_string + "\n"
+    "#{json_string}\n"
   end
 end

data/lib/wcc/contentful/engine.rb

@@ -6,9 +6,7 @@ module WCC::Contentful
       config = WCC::Contentful.configuration
 
       jobs = []
-      if WCC::Contentful::Services.instance.sync_engine&.should_sync?
-        jobs << WCC::Contentful::SyncEngine::Job
-      end
+      jobs << WCC::Contentful::SyncEngine::Job if WCC::Contentful::Services.instance.sync_engine&.should_sync?
       jobs.push(*WCC::Contentful.configuration.webhook_jobs)
 
       jobs.each do |job|
@@ -19,7 +17,7 @@ module WCC::Contentful
                 job.perform_later(event.to_h)
               else
                 Rails.logger.error "Misconfigured webhook job: #{job} does not respond to " \
-                  ':perform_later'
+                                   ':perform_later'
               end
             rescue StandardError => e
               warn "Error in job #{job}: #{e}"

data/lib/wcc/contentful/event.rb

@@ -23,9 +23,7 @@ module WCC::Contentful::Event
 
     def register(constant)
       name = constant.try(:type) || constant.name.demodulize
-      unless constant.respond_to?(:new)
-        raise ArgumentError, "Constant #{constant} does not define 'new'"
-      end
+      raise ArgumentError, "Constant #{constant} does not define 'new'" unless constant.respond_to?(:new)
 
       @event_types ||= {}
       @event_types[name] = constant
@@ -58,6 +56,7 @@ module WCC::Contentful::Event
     attr_reader :sys
     attr_reader :raw
     attr_reader :source
+
     delegate :id, to: :sys
     delegate :type, to: :sys
     delegate :created_at, to: :sys

data/lib/wcc/contentful/exceptions.rb

@@ -12,8 +12,7 @@ module WCC::Contentful
   # Raised when an entry contains a circular reference and cannot be represented
   # as a flat tree.
   class CircularReferenceError < StandardError
-    attr_reader :stack
-    attr_reader :id
+    attr_reader :stack, :id
 
     def initialize(stack, id)
       @id = id
@@ -25,7 +24,7 @@ module WCC::Contentful
       return super unless stack
 
       super + "\n  " \
-        "#{stack.last} points to #{id} which is also it's ancestor\n  " +
+              "#{stack.last} points to #{id} which is also it's ancestor\n  " +
         stack.join('->')
     end
   end

data/lib/wcc/contentful/indexed_representation.rb

@@ -109,9 +109,7 @@ module WCC::Contentful
       ].freeze
 
       def type=(raw_type)
-        unless TYPES.include?(raw_type)
-          raise ArgumentError, "Unknown type #{raw_type}, expected one of: #{TYPES}"
-        end
+        raise ArgumentError, "Unknown type #{raw_type}, expected one of: #{TYPES}" unless TYPES.include?(raw_type)
 
         @type = raw_type
       end
@@ -131,9 +129,7 @@ module WCC::Contentful
 
         if raw_type = hash_or_id.delete('type')
           raw_type = raw_type.to_sym
-          unless TYPES.include?(raw_type)
-            raise ArgumentError, "Unknown type #{raw_type}, expected one of: #{TYPES}"
-          end
+          raise ArgumentError, "Unknown type #{raw_type}, expected one of: #{TYPES}" unless TYPES.include?(raw_type)
 
           @type = raw_type
         end

data/lib/wcc/contentful/instrumentation.rb

@@ -7,11 +7,12 @@ module WCC::Contentful
     def _instrumentation_event_prefix
       @_instrumentation_event_prefix ||=
         # WCC::Contentful => contentful.wcc
-        '.' + (is_a?(Class) || is_a?(Module) ? self : self.class)
+        '.' + (is_a?(Class) || is_a?(Module) ? self : self.class) # rubocop:disable Style/StringConcatenation
           .name.parameterize.split('-').reverse.join('.')
     end
 
     attr_writer :_instrumentation
+
     def _instrumentation
       # look for per-instance instrumentation then try class level
       @_instrumentation || self.class._instrumentation

data/lib/wcc/contentful/link.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 class WCC::Contentful::Link
-  attr_reader :id
-  attr_reader :link_type
-  attr_reader :raw
+  attr_reader :id, :link_type, :raw
 
   LINK_TYPES = {
     Asset: 'Asset',

data/lib/wcc/contentful/link_visitor.rb

@@ -4,9 +4,7 @@
 # It is used internally by the Store layer to compose the resulting resolved hashes.
 # But you can use it too!
 class WCC::Contentful::LinkVisitor
-  attr_reader :entry
-  attr_reader :fields
-  attr_reader :depth
+  attr_reader :entry, :fields, :depth
 
   # @param [Hash] entry The entry hash (resolved or unresolved) to walk
   # @param [Array<Symbol>] The type of fields to select from the entry tree.
@@ -66,7 +64,7 @@ class WCC::Contentful::LinkVisitor
 
   def each_field(field)
     each_locale(field) do |val, locale|
-      if val&.is_a?(Array)
+      if val.is_a?(Array)
         val.each_with_index do |v, index|
           yield(v, field, locale, index) unless v.nil?
         end

data/lib/wcc/contentful/middleware/store/caching_middleware.rb

@@ -36,12 +36,8 @@ module WCC::Contentful::Middleware::Store
     #  figure out how to cache the results of a find_by query, ex:
     #  `find_by('slug' => '/about')`
     def find_by(content_type:, filter: nil, options: nil)
-      if filter&.keys == ['sys.id']
-        # Direct ID lookup, like what we do in `WCC::Contentful::ModelMethods.resolve`
-        # We can return just this item.  Stores are not required to implement :include option.
-        if found = @cache.read(filter['sys.id'])
-          return found
-        end
+      if filter&.keys == ['sys.id'] && found = @cache.read(filter['sys.id'])
+        return found
       end
 
       store.find_by(content_type: content_type, filter: filter, options: options)
@@ -79,8 +75,8 @@ module WCC::Contentful::Middleware::Store
       prev = @cache.read(id)
       return if prev.nil? && LAZILY_CACHEABLE_TYPES.include?(type)
 
-      if (prev_rev = prev&.dig('sys', 'revision')) && (next_rev = json.dig('sys', 'revision'))
-        return prev if next_rev < prev_rev
+      if (prev_rev = prev&.dig('sys', 'revision')) && (next_rev = json.dig('sys', 'revision')) && (next_rev < prev_rev)
+        return prev
       end
 
       # we also set DeletedEntry objects in the cache - no need to go hit the API when we know

data/lib/wcc/contentful/middleware/store.rb

@@ -96,9 +96,9 @@ module WCC::Contentful::Middleware::Store
 
     def count
       if middleware.has_select?
-        raise NameError, "Count cannot be determined because the middleware '#{middleware}'" \
-          " implements the #select? method.  Please use '.to_a.count' to count entries that" \
-          ' pass the #select? method.'
+        raise NameError, "Count cannot be determined because the middleware '#{middleware}' " \
+                         "implements the #select? method.  Please use '.to_a.count' to count entries that " \
+                         'pass the #select? method.'
       end
 
       # The wrapped query may get count from the "Total" field in the response,
@@ -112,9 +112,7 @@ module WCC::Contentful::Middleware::Store
       result = wrapped_query.to_enum
       result = result.select { |x| middleware.select?(x) } if middleware.has_select?
 
-      if options && options[:include]
-        result = result.map { |x| middleware.resolve_includes(x, options[:include]) }
-      end
+      result = result.map { |x| middleware.resolve_includes(x, options[:include]) } if options && options[:include]
 
       result.map { |x| middleware.transform(x) }
     end

data/lib/wcc/contentful/model_api.rb

@@ -51,9 +51,7 @@ module WCC::Contentful::ModelAPI
 
       file = configuration.schema_file
       schema_json = JSON.parse(File.read(file))['contentTypes']
-      unless schema_json
-        raise ArgumentError, 'Please give either a JSON array of content types or file to load from'
-      end
+      raise ArgumentError, 'Please give either a JSON array of content types or file to load from' unless schema_json
 
       @schema = WCC::Contentful::ContentTypeIndexer.from_json_schema(schema_json).types
     end

data/lib/wcc/contentful/model_builder.rb

@@ -61,7 +61,7 @@ module WCC::Contentful
             ct = content_type_from_raw(raw)
             if ct != typedef.content_type
               raise ArgumentError, 'Wrong Content Type - ' \
-                "'#{raw.dig('sys', 'id')}' is a #{ct}, expected #{typedef.content_type}"
+                                   "'#{raw.dig('sys', 'id')}' is a #{ct}, expected #{typedef.content_type}"
             end
             @raw = raw.freeze
 
@@ -107,12 +107,13 @@ module WCC::Contentful
                 # array fields need to resolve to an empty array when nothing is there
                 raw_value = []
               end
-              instance_variable_set('@' + f.name, raw_value)
+              instance_variable_set("@#{f.name}", raw_value)
             end
           end
 
           attr_reader :sys
           attr_reader :raw
+
           delegate :id, to: :sys
           delegate :created_at, to: :sys
           delegate :updated_at, to: :sys
@@ -122,11 +123,11 @@ module WCC::Contentful
           # Make a field for each column:
           typedef.fields.each_value do |f|
             name = f.name
-            var_name = '@' + name
+            var_name = "@#{name}"
             case f.type
             when :Asset, :Link
               define_method(name) do
-                val = instance_variable_get(var_name + '_resolved')
+                val = instance_variable_get("#{var_name}_resolved")
                 return val if val.present?
 
                 _resolve_field(name)

data/lib/wcc/contentful/model_methods.rb

@@ -54,17 +54,15 @@ module WCC::Contentful::ModelMethods
         _instrument 'resolve', id: id, depth: depth, backlinks: backlinked_ids do
           # use include param to do resolution
           store.find_by(content_type: self.class.content_type,
-                        filter: { 'sys.id' => id },
-                        options: context.except(*MODEL_LAYER_CONTEXT_KEYS).merge!({
-                          include: [depth, 10].min
-                        }))
+            filter: { 'sys.id' => id },
+            options: context.except(*MODEL_LAYER_CONTEXT_KEYS).merge!({
+              include: [depth, 10].min
+            }))
         end
-      unless raw
-        raise WCC::Contentful::ResolveError, "Cannot find #{self.class.content_type} with ID #{id}"
-      end
+      raise WCC::Contentful::ResolveError, "Cannot find #{self.class.content_type} with ID #{id}" unless raw
 
       @raw = raw.freeze
-      links.each { |f| instance_variable_set('@' + f, raw.dig('fields', f, sys.locale)) }
+      links.each { |f| instance_variable_set("@#{f}", raw.dig('fields', f, sys.locale)) }
     end
 
     links.each { |f| _resolve_field(f, depth, context, options) }
@@ -142,7 +140,7 @@ module WCC::Contentful::ModelMethods
   def _resolve_field(field_name, depth = 1, context = {}, options = {})
     return if depth <= 0
 
-    var_name = '@' + field_name
+    var_name = "@#{field_name}"
     return unless val = instance_variable_get(var_name)
 
     context = sys.context.to_h.merge(context)
@@ -182,17 +180,17 @@ module WCC::Contentful::ModelMethods
       val = _try_map(val) { |v| load.call(v) }
       val = val.compact if val.is_a? Array
 
-      instance_variable_set(var_name + '_resolved', val)
+      instance_variable_set("#{var_name}_resolved", val)
     rescue WCC::Contentful::CircularReferenceError
       raise unless options[:circular_reference] == :ignore
     end
   end
 
   def _resolved_field?(field_name, depth = 1)
-    var_name = '@' + field_name
+    var_name = "@#{field_name}"
     raw = instance_variable_get(var_name)
     return true if raw.nil? || (raw.is_a?(Array) && raw.all?(&:nil?))
-    return false unless val = instance_variable_get(var_name + '_resolved')
+    return false unless val = instance_variable_get("#{var_name}_resolved")
     return true if depth <= 1
 
     return val.resolved?(depth: depth - 1) unless val.is_a? Array

data/lib/wcc/contentful/model_singleton_methods.rb

@@ -66,7 +66,7 @@ module WCC::Contentful::ModelSingletonMethods
     new(result, options) if result
   end
 
-  def inherited(subclass)
+  def inherited(subclass) # rubocop:disable Lint/MissingSuper
     # If another different class is already registered for this content type,
     # don't auto-register this one.
     return if model_namespace.registered?(content_type)

data/lib/wcc/contentful/rich_text/node.rb

@@ -37,9 +37,7 @@ module WCC::Contentful::RichText
       end
 
       def tokenize(raw, context = nil)
-        unless raw['nodeType'] == node_type
-          raise ArgumentError, "Expected '#{node_type}', got '#{raw['nodeType']}'"
-        end
+        raise ArgumentError, "Expected '#{node_type}', got '#{raw['nodeType']}'" unless raw['nodeType'] == node_type
 
         values =
           members.map do |symbol|

data/lib/wcc/contentful/rich_text.rb

@@ -43,7 +43,7 @@ module WCC::Contentful::RichText
         EmbeddedEntryBlock
       when 'embedded-asset-block'
         EmbeddedAssetBlock
-      when /heading\-(\d+)/
+      when /heading-(\d+)/
         size = Regexp.last_match(1)
         const_get("Heading#{size}")
       else

data/lib/wcc/contentful/rspec.rb

@@ -13,9 +13,7 @@ module WCC::Contentful::RSpec
   # stubs the Model API to return that content type for `.find` and `.find_by`
   # query methods.
   def contentful_stub(const, **attrs)
-    unless const.respond_to?(:content_type_definition)
-      const = WCC::Contentful::Model.resolve_constant(const.to_s)
-    end
+    const = WCC::Contentful::Model.resolve_constant(const.to_s) unless const.respond_to?(:content_type_definition)
     instance = contentful_create(const, **attrs)
 
     # mimic what's going on inside model_singleton_methods.rb

data/lib/wcc/contentful/simple_client/response.rb

@@ -6,9 +6,7 @@ class WCC::Contentful::SimpleClient
   class Response
     include ::WCC::Contentful::Instrumentation
 
-    attr_reader :raw_response
-    attr_reader :client
-    attr_reader :request
+    attr_reader :raw_response, :client, :request
 
     delegate :status, to: :raw_response
     alias_method :code, :status
@@ -26,7 +24,7 @@ class WCC::Contentful::SimpleClient
     def error_message
       parsed_message =
         begin
-          raw.dig('message')
+          raw['message']
         rescue JSON::ParserError
           nil
         end
@@ -105,7 +103,7 @@ class WCC::Contentful::SimpleClient
 
     def includes
       @includes ||=
-        raw.dig('includes')&.each_with_object({}) do |(_t, entries), h|
+        raw['includes']&.each_with_object({}) do |(_t, entries), h|
           entries.each { |e| h[e.dig('sys', 'id')] = e }
         end || {}
     end

data/lib/wcc/contentful/simple_client.rb

@@ -24,8 +24,7 @@ module WCC::Contentful
   class SimpleClient
     include WCC::Contentful::Instrumentation
 
-    attr_reader :api_url
-    attr_reader :space
+    attr_reader :api_url, :space
 
     # Creates a new SimpleClient with the given configuration.
     #
@@ -41,7 +40,7 @@ module WCC::Contentful
     # @option options [Number] rate_limit_wait_timeout The maximum time to block the thread waiting
     #   on a rate limit response.  By default will wait for one 429 and then fail on the second 429.
     def initialize(api_url:, space:, access_token:, **options)
-      @api_url = URI.join(api_url, '/spaces/', space + '/')
+      @api_url = URI.join(api_url, '/spaces/', "#{space}/")
       @space = space
       @access_token = access_token
 
@@ -57,7 +56,7 @@ module WCC::Contentful
 
       return unless options[:environment].present?
 
-      @api_url = URI.join(@api_url, 'environments/', options[:environment] + '/')
+      @api_url = URI.join(@api_url, 'environments/', "#{options[:environment]}/")
     end
 
     # performs an HTTP GET request to the specified path within the configured
@@ -84,15 +83,13 @@ module WCC::Contentful
       case adapter
       when nil
         ADAPTERS.each do |a, spec|
-          begin
-            gem(*spec)
-            return load_adapter(a)
-          rescue Gem::LoadError
-            next
-          end
+          gem(*spec)
+          return load_adapter(a)
+        rescue Gem::LoadError
+          next
         end
-        raise ArgumentError, 'Unable to load adapter!  Please install one of '\
-          "#{ADAPTERS.values.map(&:join).join(',')}"
+        raise ArgumentError, 'Unable to load adapter!  Please install one of ' \
+                             "#{ADAPTERS.values.map(&:join).join(',')}"
       when :faraday
         require 'faraday'
         ::Faraday.new do |faraday|
@@ -104,8 +101,8 @@ module WCC::Contentful
         TyphoeusAdapter.new
       else
         unless adapter.respond_to?(:get)
-          raise ArgumentError, "Adapter #{adapter} is not invokeable!  Please "\
-            "pass use one of #{ADAPTERS.keys} or create a Faraday-compatible adapter"
+          raise ArgumentError, "Adapter #{adapter} is not invokeable!  Please " \
+                               "pass use one of #{ADAPTERS.keys} or create a Faraday-compatible adapter"
         end
         adapter
       end

data/lib/wcc/contentful/store/base.rb

@@ -61,11 +61,11 @@ module WCC::Contentful::Store
             set(json.dig('sys', 'id'), json)
           end
 
-        if (prev_rev = prev&.dig('sys', 'revision')) && (next_rev = json.dig('sys', 'revision'))
-          if next_rev < prev_rev
-            # Uh oh! we overwrote an entry with a prior revision.  Put the previous back.
-            return index(prev)
-          end
+        if (prev_rev = prev&.dig('sys', 'revision')) &&
+            (next_rev = json.dig('sys', 'revision')) &&
+            (next_rev < prev_rev)
+          # Uh oh! we overwrote an entry with a prior revision.  Put the previous back.
+          return index(prev)
         end
 
         case type

data/lib/wcc/contentful/store/cdn_adapter.rb

@@ -3,7 +3,7 @@
 module WCC::Contentful::Store
   class CDNAdapter
     include WCC::Contentful::Store::Interface
-    # Note: CDNAdapter should not instrument store events cause it's not a store.
+    # NOTE: CDNAdapter should not instrument store events cause it's not a store.
 
     attr_writer :client, :preview_client
 

data/lib/wcc/contentful/store/factory.rb

@@ -90,7 +90,7 @@ module WCC::Contentful::Store
         next if m[0].respond_to?(:call)
 
         raise ArgumentError, "The middleware '#{m[0]&.try(:name) || m[0]}' cannot be applied!  " \
-          'It must respond to :call'
+                             'It must respond to :call'
       end
 
       validate_store!(store)

data/lib/wcc/contentful/store/memory_store.rb

@@ -41,8 +41,8 @@ module WCC::Contentful::Store
     SUPPORTED_OPS = %i[eq ne in nin].freeze
 
     def execute(query)
-      (query.conditions.map(&:op) - SUPPORTED_OPS).each do |op|
-        raise ArgumentError, "Operator :#{op} not supported"
+      if bad_op = (query.conditions.map(&:op) - SUPPORTED_OPS).first
+        raise ArgumentError, "Operator :#{bad_op} not supported"
       end
 
       relation = mutex.with_read_lock { @hash.values }

data/lib/wcc/contentful/store/postgres_store.rb

@@ -45,12 +45,9 @@ module WCC::Contentful::Store
           JSON.parse(val) if val
         end
 
-      if views_need_update?(value, previous_value)
-        # mark dirty - we need to refresh the materialized view
-        unless mutex.with_read_lock { @dirty }
-          _instrument 'mark_dirty'
-          mutex.with_write_lock { @dirty = true }
-        end
+      if views_need_update?(value, previous_value) && !mutex.with_read_lock { @dirty }
+        _instrument 'mark_dirty'
+        mutex.with_write_lock { @dirty = true }
       end
 
       previous_value
@@ -105,7 +102,7 @@ module WCC::Contentful::Store
         end
       end
 
-      logger&.debug('[PostgresStore] ' + statement + "\n" + params.inspect)
+      logger&.debug("[PostgresStore] #{statement}\n#{params.inspect}")
       _instrument 'exec' do
         @connection_pool.with { |conn| conn.exec(statement, params) }
       end
@@ -231,16 +228,12 @@ module WCC::Contentful::Store
         end
 
         statement =
-          select_statement +
-          " FROM #{table} AS t \n" +
-          joins.join("\n") + "\n" +
-          statement +
-          (limit_statement || '')
+          "#{select_statement} FROM #{table} AS t \n#{joins.join("\n")}\n#{statement}#{limit_statement || ''}"
 
         [statement, params]
       end
 
-      def _eq(path, expected, params)
+      def _eq(path, expected, params) # rubocop:disable Layout/LineContinuationLeadingSpace
         return " AND t.id = $#{push_param(expected, params)}" if path == %w[sys id]
 
         if path[3] == 'sys'
@@ -248,12 +241,12 @@ module WCC::Contentful::Store
           # into it to detect whether it contains `{ "sys": { "id" => expected } }`
           expected = { 'sys' => { path[4] => expected } }.to_json
           return ' AND fn_contentful_jsonb_any_to_jsonb_array(t.data->' \
-            "#{quote_parameter_path(path.take(3))}) @> " \
-            "jsonb_build_array($#{push_param(expected, params)}::jsonb)"
+                 "#{quote_parameter_path(path.take(3))}) @> " \
+                 "jsonb_build_array($#{push_param(expected, params)}::jsonb)"
         end
 
-        " AND t.data->#{quote_parameter_path(path)}" \
-          " @> to_jsonb($#{push_param(expected, params)})"
+        " AND t.data->#{quote_parameter_path(path)} " \
+          "@> to_jsonb($#{push_param(expected, params)})"
       end
 
       PARAM_TYPES = {
@@ -292,7 +285,7 @@ module WCC::Contentful::Store
       def push_join(_path, joins)
         table_alias = "s#{joins.length}"
         joins << "JOIN contentful_raw AS #{table_alias} ON " \
-          "#{table_alias}.id=ANY(t.links)"
+                 "#{table_alias}.id=ANY(t.links)"
         table_alias
       end
     end
@@ -326,8 +319,8 @@ module WCC::Contentful::Store
       end
 
       def schema_ensured?(conn)
-        result = conn.exec('SELECT version FROM wcc_contentful_schema_version' \
-          ' ORDER BY version DESC LIMIT 1')
+        result = conn.exec('SELECT version FROM wcc_contentful_schema_version ' \
+                           'ORDER BY version DESC LIMIT 1')
         return false if result.num_tuples == 0
 
         result[0]['version'].to_i >= EXPECTED_VERSION
@@ -339,8 +332,8 @@ module WCC::Contentful::Store
       def ensure_schema(conn)
         result =
           begin
-            conn.exec('SELECT version FROM wcc_contentful_schema_version' \
-          ' ORDER BY version DESC')
+            conn.exec('SELECT version FROM wcc_contentful_schema_version ' \
+                      'ORDER BY version DESC')
           rescue PG::UndefinedTable
             []
           end

data/lib/wcc/contentful/store/query.rb

@@ -36,7 +36,7 @@ module WCC::Contentful::Store
 
     FALSE_VALUES = [
       false, 0,
-      '0', :"0",
+      '0', :'0',
       'f', :f,
       'F', :F,
       'false', :false, # rubocop:disable Lint/BooleanSymbol
@@ -237,7 +237,7 @@ module WCC::Contentful::Store
 
     Condition =
       Struct.new(:path, :op, :expected) do
-        LINK_KEYS = %w[id type linkType].freeze
+        LINK_KEYS = %w[id type linkType].freeze # rubocop:disable Lint/ConstantDefinitionInBlock
 
         def path_tuples
           @path_tuples ||=

data/lib/wcc/contentful/store/rspec_examples/include_param.rb

@@ -15,10 +15,12 @@ RSpec.shared_examples 'supports include param' do |feature_set|
         'fields' => {
           'name' => { 'en-US' => 'root' },
           'link' => { 'en-US' => make_link_to('deep1') },
-          'links' => { 'en-US' => [
-            make_link_to('shallow3'),
-            make_link_to('deep2')
-          ] }
+          'links' => {
+            'en-US' => [
+              make_link_to('shallow3'),
+              make_link_to('deep2')
+            ]
+          }
         }
       }
     end

data/lib/wcc/contentful/store/rspec_examples/operators.rb

@@ -40,7 +40,7 @@ RSpec.shared_examples 'operators' do |feature_set|
     end
   end
 
-  supported_operators.each do |op, value|
+  supported_operators.each do |op, value| # rubocop:disable Style/CombinableLoops
     next unless value
 
     it_behaves_like "supports :#{op} operator" do

data/lib/wcc/contentful/sync_engine.rb

@@ -31,15 +31,18 @@ module WCC::Contentful
       (@state&.dup || token_wrapper_factory(nil)).freeze
     end
 
-    attr_reader :store
-    attr_reader :client
+    attr_reader :store, :client, :options
 
     def should_sync?
       store&.index?
     end
 
-    def initialize(state: nil, store: nil, client: nil, key: nil)
-      @state_key = key || "sync:#{object_id}"
+    def initialize(client: nil, store: nil, state: nil, **options)
+      @options = {
+        key: "sync:#{object_id}"
+      }.merge!(options).freeze
+
+      @state_key = @options[:key] || "sync:#{object_id}"
       @client = client || WCC::Contentful::Services.instance.client
       @mutex = Mutex.new
 
@@ -53,9 +56,7 @@ module WCC::Contentful
       if state
         @state = token_wrapper_factory(state)
         raise ArgumentError, ':state param must be a String or Hash' unless @state.is_a? Hash
-        unless @state.dig('sys', 'type') == 'token'
-          raise ArgumentError, ':state param must be of sys.type = "token"'
-        end
+        raise ArgumentError, ':state param must be of sys.type = "token"' unless @state.dig('sys', 'type') == 'token'
       end
       raise ArgumentError, 'either :state or :store must be provided' unless @state || @store
     end
@@ -144,8 +145,12 @@ module WCC::Contentful
           return unless sync_engine&.should_sync?
 
           up_to_id = nil
-          up_to_id = event[:up_to_id] || event.dig('sys', 'id') if event
-          sync!(up_to_id: up_to_id)
+          retry_count = 0
+          if event
+            up_to_id = event[:up_to_id] || event.dig('sys', 'id')
+            retry_count = event[:retry_count] if event[:retry_count]
+          end
+          sync!(up_to_id: up_to_id, retry_count: retry_count)
         end
 
         # Calls the Contentful Sync API and updates the configured store with the returned
@@ -156,21 +161,32 @@ module WCC::Contentful
         #  If we don't find this ID in the sync data, then drop a job to try
         #  the sync again after a few minutes.
         #
-        def sync!(up_to_id: nil)
+        def sync!(up_to_id: nil, retry_count: 0)
           id_found, count = sync_engine.next(up_to_id: up_to_id)
 
           next_sync_token = sync_engine.state['token']
 
           logger.info "Synced #{count} entries.  Next sync token:\n  #{next_sync_token}"
-          logger.info "Should enqueue again? [#{!id_found}]"
-          # Passing nil to only enqueue the job 1 more time
-          sync_later!(up_to_id: nil) unless id_found
+          unless id_found
+            if retry_count >= configuration.sync_retry_limit
+              logger.error "Unable to find item with id '#{up_to_id}' on the Sync API.  " \
+                           "Abandoning after #{retry_count} retries."
+            else
+              wait = (2**retry_count) * configuration.sync_retry_wait.seconds
+              logger.info "Unable to find item with id '#{up_to_id}' on the Sync API.  " \
+                          "Retrying after #{wait.inspect} " \
+                          "(#{configuration.sync_retry_limit - retry_count} retries remaining)"
+
+              self.class.set(wait: wait)
+                .perform_later(up_to_id: up_to_id, retry_count: retry_count + 1)
+            end
+          end
           next_sync_token
         end
 
-        # Drops an ActiveJob job to invoke WCC::Contentful.sync! after a given amount
+        # Enqueues an ActiveJob job to invoke WCC::Contentful.sync! after a given amount
         # of time.
-        def sync_later!(up_to_id: nil, wait: 10.minutes)
+        def sync_later!(up_to_id: nil, wait: 10.seconds)
           self.class.set(wait: wait)
             .perform_later(up_to_id: up_to_id)
         end

data/lib/wcc/contentful/sys.rb

@@ -11,7 +11,7 @@ WCC::Contentful::Sys =
     :revision,
     :context
   ) do
-
+    # rubocop:disable Lint/ConstantDefinitionInBlock
     ATTRIBUTES = %i[
       id
       type
@@ -22,6 +22,7 @@ WCC::Contentful::Sys =
       revision
       context
     ].freeze
+    # rubocop:enable Lint/ConstantDefinitionInBlock
 
     undef []=
     ATTRIBUTES.each { |a| __send__(:undef_method, "#{a}=") }

data/lib/wcc/contentful/test/double.rb

@@ -8,9 +8,7 @@ module WCC::Contentful::Test::Double
   # All attributes that are known to be required fields on the content type
   # will return a default value based on the field type.
   def contentful_double(const, **attrs)
-    unless const.respond_to?(:content_type_definition)
-      const = WCC::Contentful::Model.resolve_constant(const.to_s)
-    end
+    const = WCC::Contentful::Model.resolve_constant(const.to_s) unless const.respond_to?(:content_type_definition)
     attrs.symbolize_keys!
 
     bad_attrs = attrs.reject { |a| const.instance_methods.include?(a) }
@@ -45,7 +43,7 @@ module WCC::Contentful::Test::Double
           sys: {
             type: 'Link',
             linkType: 'Space',
-            id: ENV['CONTENTFUL_SPACE_ID']
+            id: ENV.fetch('CONTENTFUL_SPACE_ID', nil)
           }
         },
         id: SecureRandom.urlsafe_base64,
@@ -62,7 +60,7 @@ module WCC::Contentful::Test::Double
         revision: rand(100),
         locale: 'en-US'
       },
-      fields: attrs.each_with_object({}) { |(k, v), h| h[k] = { 'en-US' => v } }
+      fields: attrs.transform_values { |v| { 'en-US' => v } }
     }
 
     double(attrs)

data/lib/wcc/contentful/test/factory.rb

@@ -8,9 +8,7 @@ module WCC::Contentful::Test::Factory
   # All attributes that are known to be required fields on the content type
   # will return a default value based on the field type.
   def contentful_create(const, context = nil, **attrs)
-    unless const.respond_to?(:content_type_definition)
-      const = WCC::Contentful::Model.resolve_constant(const.to_s)
-    end
+    const = WCC::Contentful::Model.resolve_constant(const.to_s) unless const.respond_to?(:content_type_definition)
     attrs = attrs.transform_keys { |a| a.to_s.camelize(:lower) }
 
     id = attrs.delete('id')
@@ -59,7 +57,7 @@ module WCC::Contentful::Test::Factory
         sys: {
           type: 'Link',
           linkType: 'Space',
-          id: ENV['CONTENTFUL_SPACE_ID']
+          id: ENV.fetch('CONTENTFUL_SPACE_ID', nil)
         }
       },
       id: id || SecureRandom.urlsafe_base64,
@@ -86,8 +84,8 @@ module WCC::Contentful::Test::Factory
   end
 
   def contentful_fields(model)
-    WCC::Contentful::Test::Attributes.defaults(model).each_with_object({}) do |(k, v), h|
-      h[k] = { 'en-US' => v }
+    WCC::Contentful::Test::Attributes.defaults(model).transform_values do |v|
+      { 'en-US' => v }
     end
   end
 

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/lib/wcc/contentful.rb

@@ -48,7 +48,7 @@ module WCC::Contentful
     def logger
       return Rails.logger if defined?(Rails)
 
-      @logger ||= Logger.new(STDERR)
+      @logger ||= Logger.new($stderr)
     end
   end
 
@@ -82,7 +82,7 @@ module WCC::Contentful
 
     if configuration.update_schema_file == :always ||
         (configuration.update_schema_file == :if_possible && Services.instance.management_client) ||
-        configuration.update_schema_file == :if_missing && !File.exist?(configuration.schema_file)
+        (configuration.update_schema_file == :if_missing && !File.exist?(configuration.schema_file))
 
       begin
         downloader = WCC::Contentful::DownloadsSchema.new
@@ -96,9 +96,7 @@ module WCC::Contentful
 
     content_types =
       begin
-        if File.exist?(configuration.schema_file)
-          JSON.parse(File.read(configuration.schema_file))['contentTypes']
-        end
+        JSON.parse(File.read(configuration.schema_file))['contentTypes'] if File.exist?(configuration.schema_file)
       rescue JSON::ParserError
         WCC::Contentful.logger.warn("Schema file invalid, ignoring it: #{configuration.schema_file}")
         nil
@@ -119,8 +117,8 @@ module WCC::Contentful
     end
 
     unless content_types
-      raise InitializationError, 'Unable to load content types from schema file or API!' \
-        ' Check your access token and space ID.'
+      raise InitializationError, 'Unable to load content types from schema file or API! ' \
+                                 'Check your access token and space ID.'
     end
 
     # Set the schema on the default WCC::Contentful::Model

data/wcc-contentful.gemspec

@@ -6,7 +6,7 @@ require 'wcc/contentful/version'
 
 doc_version = Gem::Version.new(WCC::Contentful::VERSION).release.to_s.sub(/\.\d+$/, '')
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 Gem::Specification.new do |spec|
   spec.name          = 'wcc-contentful'
   spec.version       = WCC::Contentful::VERSION
@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.metadata = {
-    'documentation_uri' => "https://watermarkchurch.github.io/wcc-contentful/#{doc_version}/wcc-contentful"
+    'documentation_uri' => "https://watermarkchurch.github.io/wcc-contentful/#{doc_version}/wcc-contentful",
+    'rubygems_mfa_required' => 'true'
   }
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files = Dir['app/**/*', 'config/**/*', 'lib/**/*'] +
     %w[Rakefile README.md wcc-contentful.gemspec]
@@ -38,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-instrumentation-matcher'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
-  spec.add_development_dependency 'rubocop', '0.68'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'vcr', '~> 5.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
@@ -68,4 +68,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'wcc-base', '~> 0.3.1'
   spec.add_dependency 'wisper', '~> 2.0.0'
 end
-# rubocop:enable Metrics/LineLength
+# rubocop:enable Layout/LineLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Watermark Dev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.68'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.68'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -504,7 +490,8 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.2/wcc-contentful
-post_install_message:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -512,15 +499,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://rubygems.org/gems/wcc-contentful)
   [![Build Status](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)