belt 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17e0755e497e26d8bd10604e6f050b0c6e0b69e3627276f8d83be984862d5da
-  data.tar.gz: b4249c4ac11715ae45a091c3eced0d0bad8ecd5d89a750edfaa8586ab6449758
+  metadata.gz: 8a4efb62a37845ad3c311558cebdd71fcf74ba7ae31870f3c2728e286dc33a72
+  data.tar.gz: 8278be1ba1c44b6d355d00963ca1d33c401749b0af584a4cb5c07f6ae25bca54
 SHA512:
-  metadata.gz: abe5b18f7eeeb92bba2863746e7cc71d854078462274993403c4d7b93af81ff2c82a3b5c1db2fbdf537f8a139ec15964d76aad042505ade12ad64e6069f40a5a
-  data.tar.gz: dba1d0cca64620fc48b495ee844600e7a8e38c577ad3f27ada191263038f38a081a3d640f9a66e00fd97c138e1686ae91654d6995225d357bec8a5016e903f5e
+  metadata.gz: b3d9d4782cd23143c6674b674780072784077105eeef396ec04d55b194ef102c643c5cd646311cdf024983c1e1a7f70407bea5bb2e0cb5261938e58d0dcceb87
+  data.tar.gz: a7e6cc11a4e2625b135cf967af4f614dcaa21fd7ee7b8cfcbea42bd68eea8976368a6392e257f2f229f8a6e9673414546044628cefa1f4fe0d6a2d9042b0b90f

data/CHANGELOG.md

@@ -1,9 +1,40 @@
 # Changelog
 
+## 0.4.3
+
+### Bug Fix
+
+- **`belt deploy` preflight no longer false-fails on `belongs_to ..., index: false`.**
+  The deploy preflight added in 0.4.2 demanded a `{Assoc}Index` GSI for *every*
+  `belongs_to`, ignoring `index: false` and `index: 'CustomName'` — the exact
+  opt-outs the table generator honours. The two halves of the gem disagreed: a
+  model that opts out (its reverse lookup is covered by another GSI, or it doesn't
+  need one) got a passing `belt setup tables` and a failing `belt deploy`, with no
+  way out but `--force`-ing the generator or pinning back to 0.4.1. The preflight's
+  index extraction now mirrors the generator exactly: it skips `index: false` and
+  honours an explicit `index: 'Name'`. `foreign_key:`-remapped associations
+  (`belongs_to :user, foreign_key: 'cognito_sub', index: false`) no longer demand a
+  phantom `UserIndex` either.
+
 ## 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/cli/doctor_command.rb

@@ -262,19 +262,33 @@ module Belt
         end
       end
 
+      # Which GSIs a model's belongs_to declarations require. This MUST agree with the
+      # generator (TablesCommand#extract_belongs_to_indexes) or the two halves of the gem
+      # disagree: the generator refuses to create an index the preflight then demands,
+      # and `belt setup tables` → `belt deploy` loops forever.
+      #
+      # `index: false` opts out — the reverse lookup is covered some other way (the
+      # model's own indexes() entry under a different key, or no reverse lookup at all).
+      # The generator skips those, so the preflight must too.
+      #
+      # An explicit `index: 'Name'` overrides the convention name; we honour it so the
+      # check matches the GSI the model actually declared.
       def extract_expected_indexes(content)
         indexes = []
-        content.lines.reject { |line| line.strip.start_with?('#') }.join
-               .scan(/belongs_to\s+:(\w+)/) do |match|
-          association_name = match[0]
-          indexes << {
-            name: "#{Belt::Inflector.classify(association_name)}Index",
-            association: association_name
-          }
+        uncommented(content).scan(/belongs_to\s+:(\w+)([^\n]*)/) do |association_name, options|
+          next if options.match?(/index:\s*false/)
+
+          explicit = options.match(/index:\s*['"]([^'"]+)['"]/)
+          name = explicit ? explicit[1] : "#{Belt::Inflector.classify(association_name)}Index"
+          indexes << { name: name, association: association_name }
         end
         indexes
       end
 
+      def uncommented(content)
+        content.lines.reject { |line| line.strip.start_with?('#') }.join
+      end
+
       def check_cognito_auth
         return unless Belt.root?
 

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.2'
+  VERSION = '0.4.4'
 end

metadata

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