belt 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c48b3087bb87bb86b2111cc243cf57d889e8f3d94fb25f1b023e5ba3dabf4973
-  data.tar.gz: 53b43e092412aaab0a0fae0e531d7d7ffb07c7a69e19c3e7e7480cf19753184f
+  metadata.gz: 68099232d7da2991436a263de28721bfc4e15822116f11a42cd2433588293b59
+  data.tar.gz: ba091a54897cfd88b02e2ddf48750ca8a47ca3f4c298b7b4371be799e835550e
 SHA512:
-  metadata.gz: 2443a472879d551084bd9f6a72b468e6dab20105ae84b3d906cbc33d42c8af6cc32229468300b00f9788a19c324b747f6cd0872d7d652c8d17e96a20cd2c95a6
-  data.tar.gz: a6dd1cc9483792736335058a41b983df0380d8d48ee180b47e3a619a92d7d0a47fcd33af811cff20d7c451d1a783a8ccc49c3934dae60155c7aa6d039b8b7f27
+  metadata.gz: 8e3d77c55c4297f2978486d9d0755ce45fda7f4a8886c372af0b211952502e5f5fde50c0d8881d4d5db39be4c3747a469825dfbd1b5d6f9be1120d441116600a
+  data.tar.gz: 7226f0ce500b1d19a7bccf60f9f087573998f3589ae7b41dceba7f35289a71e7e4ea3250269b96b18ef823acff06bbd67916f8d39c1ecb025ce97fbb8288019e

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.1.11
+
+### Route DSL
+
+- `resources` / `resource` honor `scope path:` (and nested path scopes).  
+  Example: `scope path: "admin", auth: :cognito { resources :users }` → `/admin/users…` with Cognito auth.
+- Nested `scope path:` segments stack (`a` then `b` → `a/b`) instead of replacing.
+- `scope controller:` is applied to `resources` / `resource` the same way as verb routes.
+- Controller inference for multi-segment resource paths joins segments (`/admin/users` → `admin/users`), matching nested-resource convention.
+
 ## 0.1.10
 
 ### Frontend env map

data/lib/belt/cli/routes_command/route_inference.rb

@@ -14,7 +14,11 @@ module Belt
           non_param = segments.reject { |s| s.start_with?(':', '{') }
           return gateway.name if non_param.empty?
 
-          return non_param.map { |s| s.gsub('-', '_') }.join('/') if route.resource? && nested_resource?(segments)
+          # Nested resources (/posts/{id}/comments) and scoped resources (/admin/users):
+          # join non-param segments → posts/comments, admin/users
+          if route.resource? && non_param.length > 1
+            return non_param.map { |s| s.gsub('-', '_') }.join('/')
+          end
 
           # For non-resource routes with a single segment (e.g., post '/signup' in :onboarding),
           # the segment is the action name, not the controller. Use the gateway name as controller.

data/lib/belt/route_dsl.rb

@@ -174,20 +174,22 @@ module Belt
       resource_name = name.to_s
       singular = singularize(resource_name)
       param_name = options[:param] || "#{singular}_id"
+      base_path = resource_base_path(resource_name, options)
+      options = options.except(:path_prefix)
       options = auto_infer_tables(resource_name, options)
       resource_options = options.merge(route_type: :resources)
       actions = determine_actions(options)
 
-      add_route(:get, "/#{resource_name}", resource_options) if actions.include?(:index)
-      add_route(:post, "/#{resource_name}", resource_options) if actions.include?(:create)
-      add_route(:get, "/#{resource_name}/{#{param_name}}", resource_options) if actions.include?(:show)
-      add_route(:put, "/#{resource_name}/{#{param_name}}", resource_options) if actions.include?(:update)
-      add_route(:delete, "/#{resource_name}/{#{param_name}}", resource_options) if actions.include?(:destroy)
+      add_route(:get, base_path, resource_options) if actions.include?(:index)
+      add_route(:post, base_path, resource_options) if actions.include?(:create)
+      add_route(:get, "#{base_path}/{#{param_name}}", resource_options) if actions.include?(:show)
+      add_route(:put, "#{base_path}/{#{param_name}}", resource_options) if actions.include?(:update)
+      add_route(:delete, "#{base_path}/{#{param_name}}", resource_options) if actions.include?(:destroy)
 
       return unless block_given?
 
-      collection_prefix = "/#{resource_name}"
-      member_prefix = "/#{resource_name}/{#{param_name}}"
+      collection_prefix = base_path
+      member_prefix = "#{base_path}/{#{param_name}}"
       resource_tables = Array(options[:tables] || [])
       inherited_tables = (@default_tables + resource_tables).uniq
       inherited_auth = options[:auth] || @default_auth
@@ -199,17 +201,25 @@ module Belt
 
     def resource(name, options = {})
       resource_name = name.to_s
+      base_path = resource_base_path(resource_name, options)
+      options = options.except(:path_prefix)
       actions = determine_actions(options, default: %i[show update destroy])
       resource_options = options.merge(route_type: :resource)
 
-      add_route(:get, "/#{resource_name}", resource_options) if actions.include?(:show)
-      add_route(:put, "/#{resource_name}", resource_options) if actions.include?(:update)
-      add_route(:delete, "/#{resource_name}", resource_options) if actions.include?(:destroy)
-      add_route(:post, "/#{resource_name}", resource_options) if actions.include?(:create)
+      add_route(:get, base_path, resource_options) if actions.include?(:show)
+      add_route(:put, base_path, resource_options) if actions.include?(:update)
+      add_route(:delete, base_path, resource_options) if actions.include?(:destroy)
+      add_route(:post, base_path, resource_options) if actions.include?(:create)
     end
 
     private
 
+    # Builds "/users" or "/admin/users" when path_prefix is set (from scope path:).
+    def resource_base_path(resource_name, options)
+      prefix = options[:path_prefix].to_s.gsub(%r{^/|/$}, '')
+      prefix.empty? ? "/#{resource_name}" : "/#{prefix}/#{resource_name}"
+    end
+
     def add_route(method, path, options = {})
       lambda_to_use = options[:lambda] || @current_lambda_context || @default_lambda
       route_tables = Array(options[:tables] || [])
@@ -308,7 +318,11 @@ module Belt
         previous_tables = @scope_tables
         previous_controller = @scope_controller
 
-        @scope_prefix = options[:path] || @scope_prefix
+        # Nest path segments (Rails-style): scope path: "a" { scope path: "b" } → "a/b"
+        if options.key?(:path)
+          segment = options[:path].to_s.gsub(%r{^/|/$}, '')
+          @scope_prefix = @scope_prefix.to_s.empty? ? segment : "#{@scope_prefix}/#{segment}"
+        end
         @scope_module = options[:module] || @scope_module
         @scope_auth = options[:auth] || @scope_auth
         @scope_tables = (@scope_tables + Array(options[:tables] || [])).uniq
@@ -340,11 +354,13 @@ module Belt
 
       def resources(name, options = {}, &)
         options = apply_scope_options(options)
+        options = options.merge(path_prefix: @scope_prefix) unless @scope_prefix.to_s.empty?
         @gateway.resources(name, options, &)
       end
 
       def resource(name, options = {})
         options = apply_scope_options(options)
+        options = options.merge(path_prefix: @scope_prefix) unless @scope_prefix.to_s.empty?
         @gateway.resource(name, options)
       end
 
@@ -400,6 +416,7 @@ module Belt
         result = options.dup
         result[:auth] ||= @scope_auth if @scope_auth
         result[:lambda] ||= @scope_module if @scope_module
+        result[:controller] ||= @scope_controller if @scope_controller
         result[:tables] = (@scope_tables + Array(result[:tables] || [])).uniq if @scope_tables.any? || result[:tables]
         result
       end

data/lib/belt/version.rb

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

metadata

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