belt 0.3.39 → 0.3.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e529a712ad25eb12761d155d77b9a62f4342858c9b2272713edd0eef36ce7b6c
-  data.tar.gz: e1e38c997a9bcfc0f454315915412cc4911cd832771cb389e8733b64d082fac9
+  metadata.gz: 1a7141bc9a4eff54bdc3b4c010d47f08c3917aed5072dfa2f976f83429c7c00e
+  data.tar.gz: 367789f59346408d662c87a955d22f95b7405d90f9711e819e216c58c155db17
 SHA512:
-  metadata.gz: 4f2dbd95f0dfe51d250baeed09aa65d0704fbe783b67054b61f8eb6d46519c1fc0ebad6c641db6a5bd76fe75acd2f7a74a60abca16589b4e89da1dcb1d796bc2
-  data.tar.gz: 462ba513dc663920b9cdd8af7fe12632d541c99f14234e8b43c4dd6e706de16995852a72781f38a572e3aa92f78111e304a924e92e8e03eb791a80209163df2b
+  metadata.gz: a5c9427efe1511e4f429ff46a7f14043a17b06c490915f62c535471ac984abcccda54801f765bf24e2b39e8a8f83b8939af53c69ad1414ae677cdf15d1943dd8
+  data.tar.gz: 4e90da0c8d2391bd3f7170acffeb083d04c3585092df86f413d4f3d2663386c21bac8ca6e833aecdea6883882569360d3b02e4239a17f52cf457fe65ed31b5d0

data/CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## 0.3.41
+
+### Bug Fix
+
+- **Fix API Gateway sibling path parameter conflict**: When a resource has nested
+  resources (a block), member routes (show, update, destroy) now use `{param_name}`
+  (e.g., `{project_id}`) instead of `{id}` to match the nested routes. This prevents
+  API Gateway from rejecting routes due to sibling path segments having different
+  parameter names.
+
+  Without nested resources (no block):
+  ```
+  GET  /posts/{id}
+  PUT  /posts/{id}
+  DELETE /posts/{id}
+  ```
+
+  With nested resources:
+  ```
+  GET  /projects/{project_id}
+  PUT  /projects/{project_id}
+  DELETE /projects/{project_id}
+  GET  /projects/{project_id}/epics
+  GET  /projects/{project_id}/epics/{id}
+  ```
+
+  This fixes the error: "Unable to create resource at path '...': A sibling ({id})
+  of this resource already has a variable path part".
+
+## 0.3.40
+
+### Breaking Change
+
+- **Rails-style `{id}` for member routes**: Member routes (show, update, destroy)
+  now use `{id}` instead of `{singular_id}`. This matches Rails conventions where
+  the resource being operated on uses `:id`, and only parent resources use prefixed
+  names like `:project_id`.
+
+  Before:
+  ```
+  GET  /projects/{project_id}
+  GET  /projects/{project_id}/epics/{epic_id}
+  ```
+
+  After:
+  ```
+  GET  /projects/{id}
+  GET  /projects/{project_id}/epics/{id}
+  ```
+
+  Parent resources in nested routes still use `{singular_id}` (e.g., `{project_id}`,
+  `{epic_id}` when they are parents of nested resources).
+
 ## 0.3.39
 
 ### Enhancement

data/lib/belt/route_dsl.rb

@@ -251,7 +251,8 @@ module Belt
       end
     end
 
-    def add_nested_resource_routes(resource_name, param_name, resource_options, actions)
+    def add_nested_resource_routes(resource_name, _param_name, resource_options, actions)
+      # Member routes (show/update/destroy) use {id}, not {singular_id} — Rails convention
       if actions.include?(:index)
         @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}",
                       resolve_request_model_for(resource_options, :index))
@@ -261,16 +262,16 @@ module Belt
                       resolve_request_model_for(resource_options, :create))
       end
       if actions.include?(:show)
-        @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}/{#{param_name}}",
+        @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}/{id}",
                       resolve_request_model_for(resource_options, :show))
       end
       if actions.include?(:update)
-        @gateway.send(:add_route, :put, "#{@prefix}/#{resource_name}/{#{param_name}}",
+        @gateway.send(:add_route, :put, "#{@prefix}/#{resource_name}/{id}",
                       resolve_request_model_for(resource_options, :update))
       end
       return unless actions.include?(:destroy)
 
-      @gateway.send(:add_route, :delete, "#{@prefix}/#{resource_name}/{#{param_name}}",
+      @gateway.send(:add_route, :delete, "#{@prefix}/#{resource_name}/{id}",
                     resolve_request_model_for(resource_options, :destroy))
     end
 
@@ -415,9 +416,12 @@ module Belt
       resource_options = options.merge(route_type: :resources)
       actions = determine_actions(options)
 
-      add_resource_routes(resource_name, param_name, resource_options, actions)
+      # When there are nested resources, use {param_name} for member routes to avoid
+      # API Gateway sibling path parameter conflicts. Without nested resources, use {id}.
+      has_nested = block_given?
+      add_resource_routes(resource_name, param_name, resource_options, actions, use_param_name: has_nested)
 
-      return unless block_given?
+      return unless has_nested
 
       collection_prefix = "/#{resource_name}"
       member_prefix = "/#{resource_name}/{#{param_name}}"
@@ -496,7 +500,11 @@ module Belt
       options.merge(tables: [resource_name.to_sym])
     end
 
-    def add_resource_routes(resource_name, param_name, resource_options, actions)
+    def add_resource_routes(resource_name, param_name, resource_options, actions, use_param_name: false)
+      # Member routes (show/update/destroy) use {id} by default (Rails convention).
+      # When nested resources exist (use_param_name: true), use {param_name} instead
+      # to avoid API Gateway sibling path parameter conflicts.
+      member_param = use_param_name ? param_name : 'id'
       if actions.include?(:index)
         add_route(:get, "/#{resource_name}",
                   resolve_request_model_for(resource_options, :index))
@@ -506,16 +514,16 @@ module Belt
                   resolve_request_model_for(resource_options, :create))
       end
       if actions.include?(:show)
-        add_route(:get, "/#{resource_name}/{#{param_name}}",
+        add_route(:get, "/#{resource_name}/{#{member_param}}",
                   resolve_request_model_for(resource_options, :show))
       end
       if actions.include?(:update)
-        add_route(:put, "/#{resource_name}/{#{param_name}}",
+        add_route(:put, "/#{resource_name}/{#{member_param}}",
                   resolve_request_model_for(resource_options, :update))
       end
       return unless actions.include?(:destroy)
 
-      add_route(:delete, "/#{resource_name}/{#{param_name}}", resolve_request_model_for(resource_options, :destroy))
+      add_route(:delete, "/#{resource_name}/{#{member_param}}", resolve_request_model_for(resource_options, :destroy))
     end
 
     def resolve_request_model_for(options, action)
@@ -797,7 +805,11 @@ module Belt
         end
       end
 
-      def add_scoped_resource_routes(resource_name, param_name, resource_options, actions)
+      def add_scoped_resource_routes(resource_name, param_name, resource_options, actions, use_param_name: false)
+        # Member routes (show/update/destroy) use {id} by default (Rails convention).
+        # When nested resources exist (use_param_name: true), use {param_name} instead
+        # to avoid API Gateway sibling path parameter conflicts.
+        member_param = use_param_name ? param_name : 'id'
         if actions.include?(:index)
           @gateway.send(:add_route, :get, build_path("/#{resource_name}"),
                         resolve_request_model_for(resource_options, :index))
@@ -807,16 +819,16 @@ module Belt
                         resolve_request_model_for(resource_options, :create))
         end
         if actions.include?(:show)
-          @gateway.send(:add_route, :get, build_path("/#{resource_name}/{#{param_name}}"),
+          @gateway.send(:add_route, :get, build_path("/#{resource_name}/{#{member_param}}"),
                         resolve_request_model_for(resource_options, :show))
         end
         if actions.include?(:update)
-          @gateway.send(:add_route, :put, build_path("/#{resource_name}/{#{param_name}}"),
+          @gateway.send(:add_route, :put, build_path("/#{resource_name}/{#{member_param}}"),
                         resolve_request_model_for(resource_options, :update))
         end
         return unless actions.include?(:destroy)
 
-        @gateway.send(:add_route, :delete, build_path("/#{resource_name}/{#{param_name}}"),
+        @gateway.send(:add_route, :delete, build_path("/#{resource_name}/{#{member_param}}"),
                       resolve_request_model_for(resource_options, :destroy))
       end
 
@@ -839,7 +851,10 @@ module Belt
         resource_options = options.merge(route_type: :resources, controller: controller)
         actions = determine_scoped_actions(options)
 
-        add_scoped_resource_routes(resource_name, param_name, resource_options, actions)
+        # When there are nested resources, use {param_name} for member routes to avoid
+        # API Gateway sibling path parameter conflicts. Without nested resources, use {id}.
+        has_nested = !block.nil?
+        add_scoped_resource_routes(resource_name, param_name, resource_options, actions, use_param_name: has_nested)
         build_nested_resource_block(resource_name, param_name, options, controller, &block) if block
       end
 

data/lib/belt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.3.39'
+  VERSION = '0.3.41'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.3.39
+  version: 0.3.41
 platform: ruby
 authors:
 - Stowzilla