wcc-contentful 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964aa9bb9b781c8ca90803f8117130daf1aac1ea88324ab64237b0e2a6a6c328
-  data.tar.gz: 834dd56d5e39fdad058efa794f1e5022b92d9122463c827d91d85ffcd9dbe291
+  metadata.gz: 476f7c65f705c14e012e8c2cbb36f68e29782607377b0a4aa9d0c10fb93458da
+  data.tar.gz: 01aeff71919acef51c8d498c63bc42e822ed3c598e7c636f5faf74baeb74c552
 SHA512:
-  metadata.gz: ff532ebd5b3750554a63786877d846c724e5edb28796f964977b7bc03064eada4ea3c608d0b0809a4306306c5bb75dfedc0ed5fa670ef7fb2b224b39ebcaafcc
-  data.tar.gz: '0886f5a8caad820a963af4d37a07fb319ae5cfc8735f400f41eb22131df9f90477b966d91f3e2f26e40bffc1579bcbc9bba2dd351cb677a28df90dea87368eef'
+  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/app/jobs/wcc/contentful/webhook_enable_job.rb

@@ -11,7 +11,7 @@ module WCC::Contentful
       args = default_configuration.merge!(args)
 
       client = WCC::Contentful::SimpleClient::Management.new(
-        args
+        **args
       )
       enable_webhook(client, args.slice(:receive_url, :webhook_username, :webhook_password))
     end

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/active_record_shim.rb

@@ -64,13 +64,13 @@ module WCC::Contentful::ActiveRecordShim
         }
       }
 
-      find_all(filter).each_slice(batch_size, &block)
+      find_all(**filter).each_slice(batch_size, &block)
     end
 
     def where(**conditions)
       # TODO: return a Query object that implements more of the ActiveRecord query interface
       # https://guides.rubyonrails.org/active_record_querying.html#conditions
-      find_all(conditions)
+      find_all(**conditions)
     end
   end
 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/content_type_indexer.rb

@@ -137,6 +137,8 @@ module WCC::Contentful
         :Json
       when 'Location'
         :Coordinates
+      when 'RichText'
+        :RichText
       when 'Array'
         find_field_type(field.try(:items) || field['items'])
       when 'Link'

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

@@ -7,10 +7,10 @@ module WCC::Contentful::Event
 
   # Creates an Event out of a raw value received by a webhook or given from
   # the Contentful Sync API.
-  def self.from_raw(raw, context = nil)
+  def self.from_raw(raw, context = nil, source: nil)
     const = Registry.instance.get(raw.dig('sys', 'type'))
 
-    const.new(raw, context)
+    const.new(raw, context, source: source)
   end
 
   class Registry
@@ -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
@@ -134,12 +133,6 @@ class WCC::Contentful::Event::SyncComplete
   include WCC::Contentful::Event
 
   def initialize(items, context = nil, source: nil)
-    items =
-      items.map do |item|
-        next item if item.is_a? WCC::Contentful::Event
-
-        WCC::Contentful::Event.from_raw(item, context, source: source)
-      end
     @items = items.freeze
     @source = source
     @sys = WCC::Contentful::Sys.new(

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

@@ -103,14 +103,13 @@ module WCC::Contentful
         Boolean
         Json
         Coordinates
+        RichText
         Link
         Asset
       ].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
@@ -130,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

@@ -20,7 +20,7 @@ module WCC::Contentful::Middleware::Store
           event = 'miss'
           # if it's not a contentful ID don't hit the API.
           # Store a nil object if we can't find the object on the CDN.
-          (store.find(key, options) || nil_obj(key)) if key =~ /^\w+$/
+          (store.find(key, **options) || nil_obj(key)) if key =~ /^\w+$/
         end
       _instrument(event, key: key, options: options)
 
@@ -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.rb

@@ -41,10 +41,6 @@ require_relative './model_api'
 class WCC::Contentful::Model
   include WCC::Contentful::ModelAPI
 
-  # The Model base class maintains a registry which is best expressed as a
-  # class var.
-  # rubocop:disable Style/ClassVars
-
   class << self
     def const_missing(name)
       type = WCC::Contentful::Helpers.content_type_from_constant(name)
@@ -53,5 +49,3 @@ class WCC::Contentful::Model
     end
   end
 end
-
-# rubocop:enable Style/ClassVars

data/lib/wcc/contentful/model_api.rb

@@ -13,9 +13,8 @@ module WCC::Contentful::ModelAPI
       services.instrumentation
     end
 
-    # We use a class var here because this is a global registry for all subclasses
-    # of this namespace
-    @@registry = {} # rubocop:disable Style/ClassVars
+    # Set the registry at the top of the namespace
+    @registry = {}
   end
 
   class_methods do
@@ -52,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
@@ -69,7 +66,7 @@ module WCC::Contentful::ModelAPI
       store = options[:preview] ? services.preview_store : services.store
       raw =
         _instrumentation.instrument 'find.model.contentful.wcc', id: id, options: options do
-          store.find(id, options.except(*WCC::Contentful::ModelMethods::MODEL_LAYER_CONTEXT_KEYS))
+          store.find(id, **options.except(*WCC::Contentful::ModelMethods::MODEL_LAYER_CONTEXT_KEYS))
         end
 
       new_from_raw(raw, options) if raw.present?
@@ -89,7 +86,7 @@ module WCC::Contentful::ModelAPI
     def resolve_constant(content_type)
       raise ArgumentError, 'content_type cannot be nil' unless content_type
 
-      const = @@registry[content_type]
+      const = _registry[content_type]
       return const if const
 
       const_name = WCC::Contentful::Helpers.constant_from_content_type(content_type).to_s
@@ -143,14 +140,14 @@ module WCC::Contentful::ModelAPI
 
       content_type ||= WCC::Contentful::Helpers.content_type_from_constant(klass)
 
-      @@registry[content_type] = klass
+      _registry[content_type] = klass
     end
 
     # Returns the current registry of content type names to constants.
     def registry
-      return {} unless @@registry
+      return {} unless _registry
 
-      @@registry.dup.freeze
+      _registry.dup.freeze
     end
 
     def reload!
@@ -176,7 +173,15 @@ module WCC::Contentful::ModelAPI
     # that class.  If nil, the generated WCC::Contentful::Model::{content_type} class
     # will be resolved for this content type.
     def registered?(content_type)
-      @@registry[content_type]
+      _registry[content_type]
+    end
+
+    protected
+
+    def _registry
+      # If calling register_for_content_type in a subclass, look up the superclass
+      # chain until we get to the model namespace which defines the registry
+      @registry || superclass._registry
     end
   end
 end

data/lib/wcc/contentful/model_builder.rb

@@ -2,6 +2,7 @@
 
 require_relative './link'
 require_relative './sys'
+require_relative './rich_text'
 
 module WCC::Contentful
   class ModelBuilder
@@ -60,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
 
@@ -95,6 +96,8 @@ module WCC::Contentful
                 #
                 # when :DateTime
                 #   raw_value = Time.parse(raw_value).localtime
+                when :RichText
+                  raw_value = WCC::Contentful::RichText.tokenize(raw_value)
                 when :Int
                   raw_value = Integer(raw_value)
                 when :Float
@@ -104,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
@@ -119,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

@@ -16,7 +16,7 @@ module WCC::Contentful::ModelSingletonMethods
     raw =
       _instrumentation.instrument 'find.model.contentful.wcc',
         content_type: content_type, id: id, options: options do
-        store.find(id, { hint: type }.merge!(options.except(:preview)))
+        store.find(id, **{ hint: type }.merge!(options.except(:preview)))
       end
     new(raw, options) if raw.present?
   end
@@ -66,12 +66,12 @@ 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 WCC::Contentful::Model.registered?(content_type)
+    return if model_namespace.registered?(content_type)
 
-    WCC::Contentful::Model.register_for_content_type(content_type, klass: subclass)
+    model_namespace.register_for_content_type(content_type, klass: subclass)
   end
 
   class ModelQuery