model_driven_api 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a387e4cb1fccde214f680920f4ea2c0f69e9afa948ecad67670613b6306b24
-  data.tar.gz: 72849e5f1f4ef21dde1aef3974fa98375cdae76207ac09c38d3ecb6406b3ff2b
+  metadata.gz: 484b0a3f30e3d9f1bf3b5345a46698ae66a35aeff259a50d6260adfadbd355c3
+  data.tar.gz: fbde7e739014cfeb049f55421aaac00c2b14461de0911aae40b623a089b177d2
 SHA512:
-  metadata.gz: d7e790ae561684ef9ac0a0be51dc6dc6f9d3b1f9e6b6069f550f8f4d124bfe943243bf98c07dabbc07cf257c309025ff3b402e06cafd2fe0b18d9aed6e5e0101
-  data.tar.gz: 5ba4463d54423d0260e17fda9c06de588c98c92d0fbae78b8adb1c6f0448d1d0055c426504cb90d04e982976fff3cb99dd73d1bb9f51e0c641b5aafbbf99de81
+  metadata.gz: a0f5da89ce627a15211a2b5e69fc415453bec5781d81089369d8198b83d8a56e8ddbeabe5f44a4a38b7caba3daf82a90175f036f3c4af2cfee38af218e887486
+  data.tar.gz: 1bacbc9b718fa72eaae21cdb139859d098873a41e8256020bcc32619e5299b7cdb17f297bd94ac73f130a899e1a663cad381efec89406e69122fa69d44205d28

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.1".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.1
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons