thecore_backend_commons 3.7.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82db8e6c6b82cca8191867896dff88204e7fee3d3c9630a2479ba01d217da73f
-  data.tar.gz: 1f86cbae0d9a88ea2d9c11547a241523b428d561ce0284779511b6cb7259fa1a
+  metadata.gz: 4ab4135c3f942d5333ade592af3ae92b194dd0aa6c32b8ee26d6992b8fa30e51
+  data.tar.gz: 317b0d39134b558ffa1cabfe7f2a6b137269e95438dc736c230ed557608554db
 SHA512:
-  metadata.gz: d2e8cfc24547a64c22ece5deb69850716462ff57354563a2ad5356dbd3ef7cfc062eeb5221363560dda8bbb7f7c6d620715dc464474ba92a7d52536ee01384c0
-  data.tar.gz: aaf01c35547236f4fce81905966d44d70a6eea017bace4336e1a47fcdd4be5063a83a929354996434eee945c8c25224aee28b8a779ed89b86643e5c9afb42182
+  metadata.gz: 70d5413c5d89753ed3c1b011d2e76b216a016df55db0dbf90d7162949912a9b4f3e7f363f5a6d9ae257468dd62de6a67358086bf1d0dfe85226a40691459fa8b
+  data.tar.gz: c88ad248c63439a693e8d6f726cc5066a8765d628774b46ef6a5a9150ed016a6981d96040c0cb7f2f52b844e4e33a47acb3c2fef4a1771202f3bdbbcbf09e653

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/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.7.0".freeze
+  VERSION = "3.9.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.7.0
+  version: 3.9.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
@@ -99,28 +113,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: roo-xls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
   requirement: !ruby/object:Gem::Requirement