belt 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a6059e3ba3ce67327476626815d9a1b61b441836877277c44d04978dfa2727
-  data.tar.gz: d714bba5f18070ed1504e33f473a9fd2497019da7fe7c5609b9d97e4676d70ee
+  metadata.gz: 8a4efb62a37845ad3c311558cebdd71fcf74ba7ae31870f3c2728e286dc33a72
+  data.tar.gz: 8278be1ba1c44b6d355d00963ca1d33c401749b0af584a4cb5c07f6ae25bca54
 SHA512:
-  metadata.gz: d6feaddb7cb071ee7cb75427544d2d32b65ddf9354c3fa08461a67247485fdd6adddf986d93d0ee3fa778ab491136ca14395e5b6dc67fc918eb19b748b8a4214
-  data.tar.gz: 56b99bafbc94e4abcb7fa64cb3ca7b1744591c17c84afea3fe1cab07bb1cbeffe6c76f7af5b6c6f19a51bebffecba10091a70125de012f885709e417cf817bd2
+  metadata.gz: b3d9d4782cd23143c6674b674780072784077105eeef396ec04d55b194ef102c643c5cd646311cdf024983c1e1a7f70407bea5bb2e0cb5261938e58d0dcceb87
+  data.tar.gz: a7e6cc11a4e2625b135cf967af4f614dcaa21fd7ee7b8cfcbea42bd68eea8976368a6392e257f2f229f8a6e9673414546044628cefa1f4fe0d6a2d9042b0b90f

data/CHANGELOG.md

@@ -18,8 +18,23 @@
 
 ## Unreleased
 
+## 0.4.4
+
 ### Bug Fix
 
+- **Gateway-level `scope path:` with a param segment no longer emits malformed paths.**
+  A gateway-level `scope path: 'accounts/:account_id'` used to leak the raw Rails-style
+  `:account_id` segment straight into route paths (`/accounts/:account_id/changes`)
+  instead of the API Gateway `{account_id}` form, and — worse — a bare-param scope with a
+  path that didn't start with `/` (e.g. `get 'summary'`) produced fused garbage like
+  `/accounts/{account_idsummary}`. It also folded the param segment into the derived
+  controller module (`accounts/:account_id/changes`). Now `build_path` joins the scope
+  prefix and route path with exactly one `/` and normalizes `:param` → `{param}`, and
+  the controller module is derived only from the scope's *static* segments (matching
+  Rails, where `scope path:` shapes the URL, not the module). Static-only scopes
+  (`scope path: 'admin'` → `admin/users`) are unchanged. A scope nested inside a
+  `resources` block was already fine; only the gateway-level case was broken.
+
 - **`belt setup tables` no longer silently clobbers hand-added tables/GSIs.**
   Regenerating `dynamodb.tf` is a full overwrite from `lambda/models/*.rb`, so a
   table or `global_secondary_index` added straight into the `.tf` file — one the

data/lib/belt/route_dsl.rb

@@ -788,14 +788,25 @@ module Belt
       private
 
       def build_path(path)
-        @scope_prefix.empty? ? path : "/#{@scope_prefix}#{path}"
+        path = path.to_s
+        sep = @scope_prefix.empty? || path.empty? || path.start_with?('/') ? '' : '/'
+        prefix = @scope_prefix.empty? ? '' : "/#{@scope_prefix}"
+        # Normalize Rails-style `:param` → API Gateway `{param}` so a gateway-level
+        # `scope path:` with a param (e.g. "accounts/:account_id") emits valid paths.
+        "#{prefix}#{sep}#{path}".gsub(/:([a-zA-Z_]\w*)/) { "{#{::Regexp.last_match(1)}}" }
+      end
+
+      # Strip param segments (`:param` / `{param}`) from a scope prefix before using it
+      # as a controller module: `scope path:` affects the URL, not the module.
+      def controller_module_from_prefix(prefix)
+        prefix.to_s.split('/').reject { |s| s.empty? || s.start_with?(':', '{') }.join('/')
       end
 
       def determine_scoped_controller(resource_name)
         if @scope_module && !@scope_module.empty?
           "#{@scope_module}/#{resource_name}"
-        elsif !@scope_prefix.empty?
-          "#{@scope_prefix}/#{resource_name}"
+        elsif !@scope_prefix.empty? && !(mod = controller_module_from_prefix(@scope_prefix)).empty?
+          "#{mod}/#{resource_name}"
         else
           resource_name
         end

data/lib/belt/version.rb

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

metadata

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