thecore_backend_commons 3.6.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ec05c4d8a628a806dea48ae8df9448d8292c0cabfc24e527b6134f947ad70b
-  data.tar.gz: ade58f1987fc9036d1177ec8aa13f66556b398fb382c5a361598160354319f03
+  metadata.gz: 87cd88199c064c66426aa326171b69d52fb1833e3e9cabf5cfb8856f9193a151
+  data.tar.gz: 9564c73bdf8b9167d6a6116a9c86290dbdf9a032af5f770d2f14a5800b213ba0
 SHA512:
-  metadata.gz: cc964bdd0ddaed6a82194249ae4ae43021488ffde211f64148e1345915301d9751cb5a52f10a4bd6193dfafb80cddbb43e2e9686bed0dbd99c89cabeb589d2d9
-  data.tar.gz: 4477a604d9a15b2e2c82cd52d66335cabff4792f5571fd06ab78833eb2a3318a59fdfebd195369c2a0d61ee18a08547fdc2f3fe0ac713329ccda965e600e0285
+  metadata.gz: adde92df4fa407e41ce14f125eb1a97392cd73c4509f221f2a68064a9078fb72b07bd3e1c0676d9404d6727500b41002c76320de9a3ea900065cb0377ed88537
+  data.tar.gz: 92d69794ef610e4e9dc402bb87c331e82400812d51660f7f2c60c604422c54fec0ccb881bc20e3547ff58fac5643a6282809b896baf1159531a3b9f0e178ae62

data/app/models/concerns/time_zone_aware.rb

@@ -24,7 +24,7 @@ module TimeZoneAware
         end
 
         cattr_accessor :json_attrs unless respond_to?(:json_attrs)
-        self.json_attrs = ::ModelDrivenApi.smart_merge(json_attrs || {}, {
+        self.json_attrs = ::ThecoreBackendCommons.smart_merge(json_attrs || {}, {
           methods: [:"#{field}_server_tz", :"#{field}_record_tz"],
         })
       end

data/config/initializers/application_config.rb

@@ -7,3 +7,11 @@ Rails.application.config.active_storage.routes_prefix = ENV.fetch("RAILS_RELATIV
 Rails.application.config.action_mailer.delivery_method = :smtp
 
 Rails.application.config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/, /file:\/\/*/, 'file://', nil]
+
+# Every Thecore app ships a dedicated Sidekiq worker service alongside the web backend (see
+# thecore_devcontainer's docker-compose.yml) — this gem already hard-requires the sidekiq gems
+# and mounts Sidekiq::Web unconditionally (thecore_background_jobs), so ActiveJob should actually
+# route through it rather than defaulting to Rails' in-process :async, which silently drops any
+# job in flight when its process restarts. Production only: :async remains the default in
+# development/test so neither requires a reachable Redis. See docs/adr/0001, CONTEXT.md.
+Rails.application.config.active_job.queue_adapter = :sidekiq if Rails.env.production?

data/config/initializers/concern_application_record.rb

@@ -21,7 +21,7 @@ module BaseApplicationRecordConcern
     after_rollback :message_ko
 
     cattr_accessor :json_attrs
-    self.json_attrs = ::ModelDrivenApi.smart_merge (json_attrs || {}), {
+    self.json_attrs = ::ThecoreBackendCommons.smart_merge (json_attrs || {}), {
       methods: [:assets_paths, :rich_content_html],
     }
   end

data/lib/thecore_backend_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreBackendCommons
-  VERSION = "3.6.0".freeze
+  VERSION = "3.8.0".freeze
 end

data/lib/thecore_backend_commons.rb

@@ -11,6 +11,7 @@ require "active_storage_validations"
 require "ulid"
 require "csv"
 require "seed_dump"
+require "deep_merge/rails_compat"
 
 require "thecore_backend_commons/version"
 require "thecore_backend_commons/engine"
@@ -20,4 +21,14 @@ require "thecore_backend_commons/push_notification_service"
 require "thecore_backend_commons/default_module_registry"
 
 module ThecoreBackendCommons
+  # Deep-merges +dest+ into +src+ (mutating and returning +src+), extending existing arrays
+  # instead of replacing them — the way json_attrs are composed across concerns.
+  # Lives here, not in model_driven_api: model_driven_api depends on this gem, so this gem's own
+  # TimeZoneAware / BaseApplicationRecordConcern (and gems built on it) calling
+  # ::ModelDrivenApi.smart_merge crashed with NameError in any app without model_driven_api.
+  # ModelDrivenApi.smart_merge now delegates here.
+  def self.smart_merge(src, dest)
+    src.deeper_merge!(dest, extend_existing_arrays: true, merge_hash_arrays: true)
+    src
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_backend_commons
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement