wcc-contentful 1.4.0.rc1 → 1.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c4c53ea7b5054745f8cd28841d59934a2e83ea65e4658e64124533412500bb
-  data.tar.gz: 53150802f51676dafc356812578159c23670335b8066c0536ad0d0b89fb094fd
+  metadata.gz: f1c1fa12c92cfa84f2308474f177f56f015dc6c8116245b13074a64fe29eeaa5
+  data.tar.gz: 6ee074042103a824705738f6aeab222c302918ebf1f4fc53f37e63e0857328ba
 SHA512:
-  metadata.gz: cd9ad6f0e34c388c12bc55fb7a62e5a55463f83fa0b09c0964e9f990d373ef142c890d54b8d77d6cd5e4e8e53a3c199919163268b2fddba7ec79e6f39e040a18
-  data.tar.gz: 1102e99319ded82fdef9293b06f68dae7d06b978696f6c12afe094f467d8f8cfff7242ada67e2adebed4b2903e279bd637ac468569dbf79a786e3ed07244337d
+  metadata.gz: 4a63d99f50a9c89d5f708f8da774a178959ba3336ddb1e40503b05c32a071f00e1cb72667083caaa51b59f29f582cfa78233960d95cfe170b362d0a24160bbe4
+  data.tar.gz: 6e190a63485e5b22e7e772d6fee2fc545dba96daf8bdaa57ea819ae9f760cc010170ac354818f85b620167362dbfb3729d0749634e3c2217cc7f28d6160a96e1

data/README.md

@@ -374,7 +374,6 @@ WCC::Contentful::SimpleClient::Cdn.new(
   space: '1234',
   # optional
   environment: 'staging', # omit to use master
-  default_locale: '*',
   rate_limit_wait_timeout: 10,
   instrumentation: ActiveSupport::Notifications,
   connection: Faraday.new { |builder| ... },

data/app/jobs/wcc/contentful/webhook_enable_job.rb

@@ -51,7 +51,6 @@ module WCC::Contentful
         management_token: config.management_token,
         space: config.space,
         environment: config.environment,
-        default_locale: config.default_locale,
         connection: config.connection,
         webhook_username: config.webhook_username,
         webhook_password: config.webhook_password,

data/lib/wcc/contentful/active_record_shim.rb

@@ -33,7 +33,7 @@ module WCC::Contentful::ActiveRecordShim
 
   class_methods do
     def model_name
-      WCC::Contentful::Helpers.constant_from_content_type(content_type)
+      ActiveModel::Name.new(self, nil, WCC::Contentful::Helpers.constant_from_content_type(content_type))
     end
 
     def const_get(name)
@@ -46,7 +46,7 @@ module WCC::Contentful::ActiveRecordShim
     end
 
     def table_name
-      model_name.tableize
+      model_name.plural.tableize
     end
 
     def unscoped

data/lib/wcc/contentful/entry_locale_transformer.rb

@@ -26,7 +26,7 @@ module WCC::Contentful::EntryLocaleTransformer
       'WCC::Contentful::EntryLocaleTransformer:locales_included' => [entry_locale]
     })
     fields =
-      entry['fields'].transform_values do |value|
+      entry['fields']&.transform_values do |value|
         h = {}
         h[entry_locale] = value
         h
@@ -50,7 +50,6 @@ module WCC::Contentful::EntryLocaleTransformer
 
       return entry
     end
-    return entry unless entry['fields']
 
     # Transform the store's "locale=*" entry into a localized one
     locale ||= default_locale
@@ -58,7 +57,7 @@ module WCC::Contentful::EntryLocaleTransformer
     sys = entry['sys'].deep_dup
     sys['locale'] = locale
     fields =
-      entry['fields'].transform_values do |value|
+      entry['fields']&.transform_values do |value|
         next if value.nil?
 
         # replace the all-locales value with the localized value

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

@@ -34,7 +34,8 @@ module WCC::Contentful::Middleware::Store
       # Now that the one locale is in the cache, when we index next time we'll index the
       # all-locales version and we'll be fine.
       locale = options[:locale]&.to_s || default_locale
-      if found.dig('sys', 'locale') != locale
+      found_locale = found.dig('sys', 'locale')&.to_s
+      if found_locale && (found_locale != locale)
         event = 'miss'
         return store.find(key, **options)
       end
@@ -90,15 +91,21 @@ module WCC::Contentful::Middleware::Store
       id = json.dig('sys', 'id')
       type = json.dig('sys', 'type')
       prev = @cache.read(id)
-      return if prev.nil? && LAZILY_CACHEABLE_TYPES.include?(type)
+      if prev.nil? && LAZILY_CACHEABLE_TYPES.include?(type)
+        _instrument('miss.index', key: id, type: type, prev: nil, next: nil)
+        return
+      end
 
       if (prev_rev = prev&.dig('sys', 'revision')) && (next_rev = json.dig('sys', 'revision')) && (next_rev < prev_rev)
+        _instrument('miss.index', key: id, type: type, prev: prev_rev, next: next_rev)
         return prev
       end
 
       # we also set DeletedEntry objects in the cache - no need to go hit the API when we know
       # this is a nil object
-      @cache.write(id, json, expires_in: expires_in)
+      _instrument('write.index', key: id, type: type, prev: prev_rev, next: next_rev) do
+        @cache.write(id, json, expires_in: expires_in)
+      end
 
       case type
       when 'DeletedEntry', 'DeletedAsset'

data/lib/wcc/contentful/model_builder.rb

@@ -59,11 +59,11 @@ module WCC::Contentful
 
           define_method(:initialize) do |raw, context = nil|
             ct = content_type_from_raw(raw)
-            if ct != typedef.content_type
+            if ct.present? && ct != typedef.content_type
               raise ArgumentError, 'Wrong Content Type - ' \
                                    "'#{raw.dig('sys', 'id')}' is a #{ct}, expected #{typedef.content_type}"
             end
-            if raw.dig('sys', 'locale').blank?
+            if raw.dig('sys', 'locale').blank? && %w[Entry Asset].include?(raw.dig('sys', 'type'))
               raise ArgumentError, 'Model layer cannot represent "locale=*" entries. ' \
                                    "Please use a specific locale in your query.  \n" \
                                    "(Error occurred with entry id: #{raw.dig('sys', 'id')})"

data/lib/wcc/contentful/simple_client.rb

@@ -36,7 +36,6 @@ module WCC::Contentful
     # @param [Hash] options The remaining optional parameters, defined below
     # @option options [Symbol, Object] connection The Faraday connection to use to make requests.
     #   Auto-discovered based on what gems are installed if this is not provided.
-    # @option options [String] default_locale The locale query param to set by default.
     # @option options [String] environment The contentful environment to access. Defaults to 'master'.
     # @option options [Boolean] no_follow_redirects If true, do not follow 300 level redirects.
     # @option options [Number] rate_limit_wait_timeout The maximum time to block the thread waiting
@@ -51,7 +50,6 @@ module WCC::Contentful
       @options = options
       @_instrumentation = @options[:instrumentation]
       @query_defaults = {}
-      @query_defaults[:locale] = @options[:default_locale] if @options[:default_locale]
       # default 1.5 so that we retry one time then fail if still rate limited
       # https://www.contentful.com/developers/docs/references/content-preview-api/#/introduction/api-rate-limits
       @rate_limit_wait_timeout = @options[:rate_limit_wait_timeout] || 1.5

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.4.0.rc1'
+    VERSION = '1.4.0.rc3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0.rc3
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -698,8 +698,8 @@ summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://
   credentials, or to connect without setting up all the rest of WCC::Contentful, is
   easy:  ```ruby WCC::Contentful::SimpleClient::Cdn.new( # required access_token:
   ''xxxx'', space: ''1234'', # optional environment: ''staging'', # omit to use master
-  default_locale: ''*'', rate_limit_wait_timeout: 10, instrumentation: ActiveSupport::Notifications,
-  connection: Faraday.new { |builder| ... }, ) ```  You can also create a {WCC::Contentful::SimpleClient::Preview}
+  rate_limit_wait_timeout: 10, instrumentation: ActiveSupport::Notifications, connection:
+  Faraday.new { |builder| ... }, ) ```  You can also create a {WCC::Contentful::SimpleClient::Preview}
   to talk to the Preview API, or a {WCC::Contentful::SimpleClient::Management} to
   talk to the Management API.  ### Store Layer  The Store Layer represents the data
   store where Contentful entries are kept for querying.  By default, `WCC::Contentful.init!`