wcc-contentful 1.4.0.rc2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1a0aa21bc1bc749fdfc169eecf55d5bf829e0d4ac4272e90649c2d46abf622
-  data.tar.gz: 12812d6728c4992ea3763cdbe0dc8f204267a75c3f35a052a663ec8c4f380115
+  metadata.gz: 63f3ef5be57de2373cfb7af9def7e9227fe0be9d7acc22977f650f4638f8835d
+  data.tar.gz: 80021d370e0b6e4238515658f491cd6fee5bafe39c813822dcf3e44d86d7a6fa
 SHA512:
-  metadata.gz: 9226778b6abf97db358f836ed0659e202f13266fbf946acd793cbeed23f69cb3cab475e9750ca64761ba6ceecd38cdaaad7f919ea2a2d04f00fa4d8e940d9653
-  data.tar.gz: c4f0bb1b6e44fa8b0a4aa647e246ff7dd6726d62e2905d026f2bb201867fb09af640b266ab95c22e04dab6b23f4c162ec6d88cf3bd45ca41c9a5853eb4842d80
+  metadata.gz: 4a26f8d7e360cac5511bf68fd083c980f0ab8d9f5c81657b363f157c2c811fa0316bcd6987fff4ae0225a74db8450a196d2a21cafee9d6cb42213d9c55556a4f
+  data.tar.gz: 26299e68f65c992b226c8c17064913454d582795ac2bd2345784f0b4550f73f77047bf8f3a67d2110652843508d885f20f45d6202bb36ede4b3d7b3244b0d6b7

data/lib/wcc/contentful/entry_locale_transformer.rb

@@ -22,20 +22,21 @@ module WCC::Contentful::EntryLocaleTransformer
       return entry
     end
 
-    sys = entry['sys'].except('locale').merge({
+    new_entry = entry.dup
+
+    new_entry['sys'] = entry['sys'].except('locale').merge({
       'WCC::Contentful::EntryLocaleTransformer:locales_included' => [entry_locale]
     })
-    fields =
-      entry['fields'].transform_values do |value|
-        h = {}
-        h[entry_locale] = value
-        h
-      end
+    if entry.key?('fields')
+      new_entry['fields'] =
+        entry['fields'].transform_values do |value|
+          h = {}
+          h[entry_locale] = value
+          h
+        end
+    end
 
-    {
-      'sys' => sys,
-      'fields' => fields
-    }
+    new_entry
   end
 
   ##
@@ -50,34 +51,33 @@ 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
 
-    sys = entry['sys'].deep_dup
-    sys['locale'] = locale
-    fields =
-      entry['fields'].transform_values do |value|
-        next if value.nil?
-
-        # replace the all-locales value with the localized value
-        l = locale
-        v = nil
-        while l
-          v = value[l]
-          break if v
-
-          l = configuration.locale_fallbacks[l]
+    new_entry = entry.dup
+    new_entry['sys'] = entry['sys'].deep_dup
+    new_entry['sys']['locale'] = locale
+    if entry.key?('fields')
+      new_entry['fields'] =
+        entry['fields']&.transform_values do |value|
+          next if value.nil?
+
+          # replace the all-locales value with the localized value
+          l = locale
+          v = nil
+          while l
+            v = value[l]
+            break if v
+
+            l = configuration.locale_fallbacks[l]
+          end
+
+          v
         end
+    end
 
-        v
-      end
-
-    {
-      'sys' => sys,
-      'fields' => fields
-    }
+    new_entry
   end
 
   ##

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

@@ -22,9 +22,11 @@ module WCC::Contentful::Middleware::Store
       found =
         @cache.fetch(key, expires_in: expires_in) do
           event = 'miss'
-          # if it's not a contentful ID don't hit the API.
+          # if it's from the sync engine don't hit the API.
+          next if key =~ /^sync:/
+
           # 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))
         end
 
       return unless found

data/lib/wcc/contentful/sync_engine.rb

@@ -138,7 +138,8 @@ module WCC::Contentful
       # This job uses the Contentful Sync API to update the configured store with
       # the latest data from Contentful.
       class Job < ActiveJob::Base
-        self.queue_adapter ||= :async
+        # This should always be "async", because the configured store could be an in-memory store.
+        self.queue_adapter = :async
         queue_as :default
 
         def configuration

data/lib/wcc/contentful/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc2
+  version: 1.4.0
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -508,9 +508,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: