model_driven_api 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a387e4cb1fccde214f680920f4ea2c0f69e9afa948ecad67670613b6306b24
-  data.tar.gz: 72849e5f1f4ef21dde1aef3974fa98375cdae76207ac09c38d3ecb6406b3ff2b
+  metadata.gz: 4282b6de5aa1f0692ad907c6e711b69c5c300ca41562311f49c33113b0c2c002
+  data.tar.gz: 5b103be64cfedc3dca3688aedcfe4d3e0d53d5476821debc6e3a6cae96ec7d65
 SHA512:
-  metadata.gz: d7e790ae561684ef9ac0a0be51dc6dc6f9d3b1f9e6b6069f550f8f4d124bfe943243bf98c07dabbc07cf257c309025ff3b402e06cafd2fe0b18d9aed6e5e0101
-  data.tar.gz: 5ba4463d54423d0260e17fda9c06de588c98c92d0fbae78b8adb1c6f0448d1d0055c426504cb90d04e982976fff3cb99dd73d1bb9f51e0c641b5aafbbf99de81
+  metadata.gz: 50fbc04a16be3c132b3b1afbb95a5730f766c6b51310d49cc49b76a139138cd42eeb45a1359ac855d69d8bab8df7eddff8c8093610c961c42376bcc1a5e52832
+  data.tar.gz: a77ade2a13edb03093a425c0e01c3d6c1ffb526557463a1b02f2b8d63a8e99776b7d2ce21b94481520fc832a2e7b899103f687cb659323f1506fa04fb6e7860a

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

@@ -163,6 +163,7 @@ class Api::V2::ApplicationController < ActionController::API
     # 2. As a module instance method in the model, like Track::Endpoints.inventory
     # Example:
     # Endpoints::TestApi.new(:test, {request_verb: "POST", is_connected: "Uhhhh"}).result
+    Rails.logger.debug("Checking for custom action #{custom_action} in #{@model}")
     if @model.respond_to?("custom_action_#{custom_action}")
       body, status = @model.send("custom_action_#{custom_action}", params)
     elsif ("Endpoints::#{@model}".constantize rescue false) && "Endpoints::#{@model}".constantize.instance_methods.include?(custom_action.to_sym)

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

@@ -516,9 +516,9 @@ class Api::V2::InfoController < Api::V2::ApplicationController
         }
         # Non CRUD or Search, but custom, usually bulk operations endpoints
         new_custom_actions = ("Endpoints::#{d.model_name.name}".constantize.instance_methods(false) rescue [])
-        # Rails.logger.debug "New Custom Actions (#{d.model_name.name}): #{new_custom_actions}"
+        Rails.logger.debug "New Custom Actions (#{d.model_name.name}): #{new_custom_actions}"
         new_custom_actions.each do |action|
-          openapi_definition = "Endpoints::#{d.model_name.name}".constantize.definitions[action.to_sym] rescue false
+          openapi_definition = "Endpoints::#{d.model_name.name}".constantize.definitions[d.model_name.name][action.to_sym] rescue []
           
           # Add the tag to the openapi definition
           openapi_definition.each do |k, v|

data/app/models/endpoints/test_api.rb

@@ -1,5 +1,5 @@
 class Endpoints::TestApi < NonCrudEndpoints
-  self.desc :test, {
+  self.desc 'TestApi', :test, {
     # Define the action name using openapi swagger format
     get: {
       summary: "Test API Custom Action",

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.2".freeze
 end

data/lib/non_crud_endpoints.rb

@@ -4,9 +4,16 @@ class NonCrudEndpoints
     self.definitions = {}
     # Add a validation method which will be inherited by all the instances, and automatically run before any method call
     def initialize(m, params)
-        # Check if self hase the m method, if not, raise a NoMethodError
+        # Rails.logger.debug "Initializing NonCrudEndpoints"
+        # Showing the class name of the instance, and also, if there's a class inheriting from this one, the name of the child class
+        # Rails.logger.debug "Class: #{self.class.name} - Child Class: #{self.class.superclass.name if self.class.superclass != Object}"
+        # Check if self has the m method, if not, raise a NoMethodError
         raise NoMethodError, "The method #{m} does not exist in #{self.class.name}" unless self.respond_to? m
-        @definition = self.definitions[m.to_sym].with_indifferent_access
+        # To avoid having conflicting keys from different classes, we will use a two levels object to store the definitions
+        # the first level is the class name, and the second level is the method name
+        self.definitions[self.class.name] ||= {}
+        self.definitions[self.class.name][m.to_sym] ||= {}
+        @definition = self.definitions[self.class.name][m.to_sym].with_indifferent_access
 
         # self.send(m, { explain: true }) rescue []
         validate_request(params)
@@ -25,8 +32,9 @@ class NonCrudEndpoints
 
     private
 
-    def self.desc(key, definition)
-        self.definitions[key] = definition
+    def self.desc(endpoint, key, definition)
+        self.definitions[endpoint] ||= {}
+        self.definitions[endpoint][key] = definition
     end
 
     def get_type(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons