model_driven_api 3.11.1 → 3.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61b86707e2570cba451926c97e8f3859aab908d3cafeeeb4a3ef1a1688319db
-  data.tar.gz: 05d89a0b5675947a69579aeab316fc320de7e061c648d13882148c1c471c462f
+  metadata.gz: dedba0b7639aab134fe0f553794df1b69d41802b8a6b4ebb2d4209856f9549b0
+  data.tar.gz: 7d3b0cf36298b1c0eb71313b249bfa1d52cd9730a8c2e105e568449a13833121
 SHA512:
-  metadata.gz: 266a7903c7736fa65577d7e7f33466a965882af174619b957755eca5ca8901c920429a3c39daf48f1689450d40177a71a4db9c413eb4442210abae2c4ec3f6ec
-  data.tar.gz: 37139ea1c430213aa4e8bdd43b9d770f7e08bd7d1df4bd898dd561a3112f550d9ded0b411f38ab4bd982af5716a0b0963042aca2c7a782d25b59fa7f459dc850
+  metadata.gz: baaf85e519014c7c5a068fae14b0b12d43c96486956d109dacfe8d9976a01134c06118e4f26e36f4355e11c644324ac00c74d50d1115be89115ce0bfcd9317e4
+  data.tar.gz: d01443fd40d8b85cda33c531cab0646a58e5ad985834403366eeee80b291f35ac4c40b11fb169d367de28b37c32d8315cf1d96c68a17c594789b8a775577ea69

data/app/controllers/api/v2/info_controller.rb

@@ -6,7 +6,7 @@ class Api::V2::InfoController < Api::V2::ApplicationController
 
   # api :GET, '/api/v2/info/version', "Just prints the APPVERSION."
   def version
-    render json: { version: "TODO: Find a Way to Dynamically Obtain It" }.to_json, status: 200
+    render json: { version: ModelDrivenApi.app_version }.to_json, status: 200
   end
 
   # api :GET, '/api/v2/info/roles'

data/lib/concerns/api_exception_management.rb

@@ -9,7 +9,6 @@ module ApiExceptionManagement
             # AccessDenied (wrong login credentials), RecordNotFound, RecordInvalid, CanCan
             # denial... answered 500. Covered by spec/lib/concerns/api_exception_management_spec.rb.
             rescue_from StandardError, with: :fivehundred!
-            rescue_from NoMethodError, with: :not_found!
             rescue_from CanCan::AccessDenied, with: :unauthorized!
             rescue_from AuthenticateUser::AccessDenied, with: :unauthenticated!
             rescue_from ActionController::RoutingError, with: :not_found!

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.11.1".freeze
+  VERSION = "3.11.3".freeze
 end

data/lib/model_driven_api.rb

@@ -28,6 +28,14 @@ require "api/v3/serializer_factory"
 module ModelDrivenApi
   UTC_ZONE_NAMES = %w[UTC Etc/UTC].freeze
 
+  # The host app's deployed version: the `version` file in its root (Thecore release convention —
+  # CI builds and deploys when it changes; the image is `ADD . /app`, so it ships in Rails.root).
+  # nil when the app has no such file. Served by GET /api/v2|v3/info/version.
+  def self.app_version
+    file = Rails.root.join("version")
+    file.file? ? file.read.strip.presence : nil
+  end
+
   # Raises unless the app is UTC-only: +time_zone+ is config.time_zone, +db_zone+ is
   # config.active_record.default_timezone (nil = Rails' default, :utc). Called at boot by
   # ModelDrivenApi::Engine's :enforce_utc_time_zone initializer.
@@ -42,11 +50,10 @@ module ModelDrivenApi
                          "(got #{db_zone.inspect})."
   end
 
+  # Kept for the many existing callers (host apps, mytask, ...): the implementation lives in
+  # thecore_backend_commons (ThecoreBackendCommons.smart_merge), which this gem depends on, so
+  # that lower-layer gems can compose json_attrs without referencing this gem.
   def self.smart_merge src, dest
-      src.deeper_merge! dest, {
-          extend_existing_arrays: true, 
-          merge_hash_arrays: true
-      }
-      src
+    ThecoreBackendCommons.smart_merge(src, dest)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.11.3
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement