model_driven_api 2.4.4 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7f4f3089407a7bdb2a1f4174c9c134599fbe2a3ffd7c4bd1fa8d45424fabfe
-  data.tar.gz: 1a863a98f07a3311782c8b6d4c8123ba6318ffa1476a056f35ed62fd75b25f3c
+  metadata.gz: 73cfe08fc31b7f30f5fa957336815aac4a3e50ecc087d112e229788726544367
+  data.tar.gz: 94627de57118c1469e0831c4bd76f6f777ead4f75954108dc27578d1754e6cff
 SHA512:
-  metadata.gz: 79cf4fd763c17311165ada17fa4067f9151914e62aaa494eb9661dfbe5c41a7d2248c92caf1803518c430eba6d1dd77692a4148db3a18b681618775a51151f59
-  data.tar.gz: 38b734d317dbb08b3b7bfce009b5636e38d1647cfd3bf40dea78703dfec89356fe09bcdbd2013a096b4c06a9456c10a9bc5419b512d125a757d1e588e77fab52
+  metadata.gz: e1563f942781fa8f6f42421b6140cc2696b3e54be822413309d4b56e7435295398347b09c3ad86e81a5ade4ba018a1e9ecc4d9e430a3101e540b1d805f013e36
+  data.tar.gz: 31314a903fbd5d88e31954d3303c0602e9d697532e6d723fe9ee1d7a4910137b574c6a30ea11c7d0e54a7505c7af6aa718cb0ebb4957bd32a089e4715c651dd1

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

@@ -16,8 +16,8 @@ class Api::V2::ApplicationController < ActionController::API
         authorize! :index, @model
 
         # Custom Action
-        status, result = check_for_custom_action
-        return render json: result, status: 200 if status == true
+        status, result, status_number = check_for_custom_action
+        return render json: result, status: (status_number.presence || 200) if status == true
 
         # Normal Index Action with Ransack querying
         # Keeping this automation can be too dangerous and lead to unpredicted results
@@ -52,8 +52,8 @@ class Api::V2::ApplicationController < ActionController::API
         authorize! :show, @record_id
 
         # Custom Show Action
-        status, result = check_for_custom_action
-        return render json: result, status: 200 if status == true
+        status, result, status_number = check_for_custom_action
+        return render json: result, status: (status_number.presence || 200) if status == true
 
         # Normal Show
         result = @record.to_json(json_attrs)
@@ -65,8 +65,8 @@ class Api::V2::ApplicationController < ActionController::API
         authorize! :create, @record
 
         # Custom Action
-        status, result = check_for_custom_action
-        return render json: result, status: 200 if status == true
+        status, result, status_number = check_for_custom_action
+        return render json: result, status: (status_number.presence || 200) if status == true
 
         # Normal Create Action
         # Keeping this automation can be too dangerous and lead to unpredicted results
@@ -80,8 +80,8 @@ class Api::V2::ApplicationController < ActionController::API
         authorize! :update, @record
 
         # Custom Action
-        status, result = check_for_custom_action
-        return render json: result, status: 200 if status == true
+        status, result, status_number = check_for_custom_action
+        return render json: result, status: (status_number.presence || 200) if status == true
 
         # Normal Update Action
         # Raisl 6 vs Rails 6.1
@@ -93,8 +93,8 @@ class Api::V2::ApplicationController < ActionController::API
         authorize! :destroy, @record
 
         # Custom Action
-        status, result = check_for_custom_action
-        return render json: result, status: 200 if status == true
+        status, result, status_number = check_for_custom_action
+        return render json: result, status: (status_number.presence || 200) if status == true
 
         # Normal Destroy Action
         return api_error(status: 500) unless @record.destroy
@@ -114,8 +114,9 @@ class Api::V2::ApplicationController < ActionController::API
             resource = "custom_action_#{params[:do]}"
             raise NoMethodError unless @model.respond_to?(resource)
             # return true, MultiJson.dump(params[:id].blank? ? @model.send(resource, params) : @model.send(resource, params[:id].to_i, params))
-            puts json_attrs
-            return true, @model.send(resource, params).to_json(json_attrs)
+            # puts json_attrs
+            body, status = @model.send(resource, params)
+            return true, body.to_json(json_attrs), status
         end
         # if it's here there is no custom action in the request querystring
         return false

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

@@ -1,4 +1,4 @@
-require 'model_driven_api/version'
+# require 'model_driven_api/version'
 class Api::V2::InfoController < Api::V2::ApplicationController
   # Info uses a different auth method: username and password
   skip_before_action :authenticate_request, only: [:version], raise: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.1
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement