belt 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17e0755e497e26d8bd10604e6f050b0c6e0b69e3627276f8d83be984862d5da
-  data.tar.gz: b4249c4ac11715ae45a091c3eced0d0bad8ecd5d89a750edfaa8586ab6449758
+  metadata.gz: f2a6059e3ba3ce67327476626815d9a1b61b441836877277c44d04978dfa2727
+  data.tar.gz: d714bba5f18070ed1504e33f473a9fd2497019da7fe7c5609b9d97e4676d70ee
 SHA512:
-  metadata.gz: abe5b18f7eeeb92bba2863746e7cc71d854078462274993403c4d7b93af81ff2c82a3b5c1db2fbdf537f8a139ec15964d76aad042505ade12ad64e6069f40a5a
-  data.tar.gz: dba1d0cca64620fc48b495ee844600e7a8e38c577ad3f27ada191263038f38a081a3d640f9a66e00fd97c138e1686ae91654d6995225d357bec8a5016e903f5e
+  metadata.gz: d6feaddb7cb071ee7cb75427544d2d32b65ddf9354c3fa08461a67247485fdd6adddf986d93d0ee3fa778ab491136ca14395e5b6dc67fc918eb19b748b8a4214
+  data.tar.gz: 56b99bafbc94e4abcb7fa64cb3ca7b1744591c17c84afea3fe1cab07bb1cbeffe6c76f7af5b6c6f19a51bebffecba10091a70125de012f885709e417cf817bd2

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 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
 
 ### Bug Fix

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/version.rb

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

metadata

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