belt 0.2.12 → 0.2.14

data/lib/belt/cli/views_command.rb

@@ -10,10 +10,14 @@ module Belt
       TEMPLATE_DIR = File.expand_path('../../templates/views', __dir__)
 
       def self.run(args)
+        force = args.delete('--force') || args.delete('-f')
+
         name = args.shift
         if name.nil? || name.empty?
-          puts 'Usage: belt generate views <resource> [field:type ...]'
+          puts 'Usage: belt generate views <resource> [field:type ...] [options]'
           puts "\nGenerates React pages for all REST actions (index, show, new, edit)."
+          puts "\nOptions:"
+          puts '  --force, -f    Overwrite existing files without prompting'
           puts "\nExamples:"
           puts '  belt generate views post title:string content:text status:string'
           puts '  belt generate views comment body:text author:string'
@@ -28,7 +32,7 @@ module Belt
         # If no fields provided, try to read from contracts.rb
         fields = read_schema_fields(name) if fields.empty?
 
-        new(name, fields).generate
+        new(name, fields, force: force).generate
       end
 
       def self.read_schema_fields(name)
@@ -45,20 +49,37 @@ module Belt
 
         # Extract fields from model block
         if content =~ /model :#{singular} do\n(.*?)\n\s*end/m
-          ::Regexp.last_match(1).scan(/field :(\w+), type: :(\w+)/).except('created_at', 'updated_at')
-                  .map do |n, t|
-            {
-              name: n, type: t
-            }
+          block_content = ::Regexp.last_match(1)
+          timestamp_fields = %w[created_at updated_at]
+
+          # Support both formats:
+          #   field :name, type: :string   (legacy)
+          #   string :name                 (current schema DSL)
+          dsl_types = %w[string text integer number boolean float date datetime]
+          dsl_pattern = /(?:#{dsl_types.join('|')}) :(\w+)/
+          fields = block_content.scan(/field :(\w+), type: :(\w+)/)
+          fields += block_content.scan(dsl_pattern).map do |match|
+            field_name = match[0]
+            # Extract type from the DSL method name on that line
+            type_match = block_content.match(/(\w+) :#{Regexp.escape(field_name)}/)
+            [field_name, type_match ? type_match[1] : 'string']
+          end
+
+          fields.filter_map do |n, t|
+            next if timestamp_fields.include?(n)
+
+            { name: n, type: t }
           end
         else
           []
         end
       end
 
-      def initialize(name, fields)
+      def initialize(name, fields, force: false)
         @name = name.downcase.gsub(/[^a-z0-9_]/, '_')
         @fields = fields
+        @force = force
+        @overwrite_all = false
         @singular_name = Belt::Inflector.singularize(@name)
         @resource_name = Belt::Inflector.pluralize(@singular_name)
         @class_name = Belt::Inflector.classify(@singular_name)
@@ -97,8 +118,61 @@ module Belt
       def write_template(template_name, dest_path)
         template_path = File.join(TEMPLATE_DIR, template_name)
         content = ERB.new(File.read(template_path), trim_mode: '-').result(binding)
+        existed = File.exist?(dest_path)
+
+        if existed && !@force && !@overwrite_all
+          action = prompt_overwrite(dest_path)
+          case action
+          when :yes
+            # fall through to write
+          when :all
+            @overwrite_all = true
+            # fall through to write
+          when :no
+            puts "  skip    #{dest_path}"
+            return
+          when :quit
+            puts "\nAborted."
+            exit 1
+          end
+        end
+
         File.write(dest_path, content)
-        puts "  create  #{dest_path}"
+        puts "  #{existed ? 'overwrite' : 'create'}  #{dest_path}"
+      end
+
+      def prompt_overwrite(path)
+        return :yes if @overwrite_all
+
+        print "  conflict  #{path}\n"
+        print "  Overwrite #{path}? (enter \"h\" for help) [Ynaqh] "
+        $stdout.flush
+
+        loop do
+          answer = $stdin.gets&.strip&.downcase
+          case answer
+          when '', 'y', 'yes'
+            return :yes
+          when 'n', 'no'
+            return :no
+          when 'a', 'all'
+            @overwrite_all = true
+            return :all
+          when 'q', 'quit'
+            return :quit
+          when 'h', 'help'
+            puts '  Y - yes, overwrite this file'
+            puts '  n - no, skip this file'
+            puts '  a - all, overwrite this and all remaining files'
+            puts '  q - quit, abort the generator'
+            puts '  h - help, show this help'
+            print "  Overwrite #{path}? (enter \"h\" for help) [Ynaqh] "
+            $stdout.flush
+          else
+            print '  Please enter Y, n, a, q, or h: '
+            $stdout.flush
+          end
+        end
       end
 
       def inject_routes
@@ -109,6 +183,12 @@ module Belt
         pages_dir = @resource_name
         plural_class = @plural_class_name || Belt::Inflector.camelize(@resource_name)
 
+        # Skip route injection if routes for this resource already exist
+        if content.include?("path=\"/#{@resource_name}\"")
+          puts "  skip    #{app_jsx} (routes already exist)"
+          return
+        end
+
         import_lines = [
           "import #{plural_class}Index from './pages/#{pages_dir}/#{plural_class}Index'",
           "import #{@class_name}Show from './pages/#{pages_dir}/#{@class_name}Show'",

data/lib/belt/cli.rb

@@ -22,6 +22,7 @@ require_relative 'cli/contracts_command'
 require_relative 'cli/lambda_config_command'
 require_relative 'cli/tasks_command'
 require_relative 'cli/console_command'
+require_relative 'cli/logs_command'
 require_relative 'cli/doctor_command'
 require_relative 'cli/plugin_command'
 
@@ -35,6 +36,7 @@ module Belt
       'contracts' => Belt::CLI::ContractsCommand,
       'lambda-config' => Belt::CLI::LambdaConfigCommand,
       %w[console c] => Belt::CLI::ConsoleCommand,
+      'logs' => Belt::CLI::LogsCommand,
       %w[tasks --tasks -T] => Belt::CLI::TasksCommand,
       'setup' => Belt::CLI::SetupCommand,
       'doctor' => Belt::CLI::DoctorCommand,
@@ -116,6 +118,7 @@ module Belt
 
           console                                     Start an interactive console (IRB)
           c                                           Alias for console
+          logs [lambda] [-f] [-s 5m] [-e env]         View Lambda function logs
           tasks [-g PATTERN] [-a]                     List available rake tasks
           -T [-g PATTERN] [-a]                        Alias for tasks
           setup state                                 Create/select S3 state bucket

data/lib/belt/route_dsl.rb

@@ -520,7 +520,7 @@ module Belt
 
   # SchemaBuilder captures request and response model definitions from contracts.rb
   class SchemaBuilder
-    SUPPORTED_TYPES = %i[string number integer boolean array object map list].freeze
+    SUPPORTED_TYPES = %i[string text number integer boolean date datetime array object map list].freeze
 
     attr_reader :request_models, :response_models
 
@@ -557,7 +557,7 @@ module Belt
   end
 
   class RequestModelBuilder
-    SUPPORTED_TYPES = %i[string number integer boolean array object map list].freeze
+    SUPPORTED_TYPES = %i[string text number integer boolean date datetime array object map list].freeze
 
     attr_reader :name, :fields
 
@@ -590,6 +590,7 @@ module Belt
 
     def map_type(dsl_type)
       case dsl_type
+      when :text, :date, :datetime then 'string'
       when :map then 'object'
       when :list then 'array'
       else dsl_type.to_s
@@ -598,7 +599,7 @@ module Belt
   end
 
   class ResponseModelBuilder
-    SUPPORTED_TYPES = %i[string number integer boolean array object map list].freeze
+    SUPPORTED_TYPES = %i[string text number integer boolean date datetime array object map list].freeze
 
     attr_reader :name, :contexts, :fields
 
@@ -636,6 +637,7 @@ module Belt
 
     def map_type(dsl_type)
       case dsl_type
+      when :text, :date, :datetime then 'string'
       when :map then 'object'
       when :list then 'array'
       else dsl_type.to_s
@@ -644,7 +646,7 @@ module Belt
   end
 
   class ContextBuilder
-    SUPPORTED_TYPES = %i[string number integer boolean array object map list].freeze
+    SUPPORTED_TYPES = %i[string text number integer boolean date datetime array object map list].freeze
 
     attr_reader :name, :fields
 
@@ -673,6 +675,7 @@ module Belt
 
     def map_type(dsl_type)
       case dsl_type
+      when :text, :date, :datetime then 'string'
       when :map then 'object'
       when :list then 'array'
       else dsl_type.to_s

data/lib/belt/version.rb

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

data/lib/belt.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'activeitem'
 require_relative 'belt/version'
 require_relative 'belt/root'
 require_relative 'belt/configuration'

data/lib/templates/generate/controller.rb.erb

@@ -4,55 +4,105 @@ require_relative 'application_controller'
 
 module <%= @module_name %>Controllers
   class <%= @class_name %>sController < ApplicationController
+<% if @references.any? -%>
+<% parent = @references.first -%>
+<% parent_resource = Belt::Inflector.pluralize(parent[:referenced_model]) -%>
+<% parent_class = Belt::Inflector.classify(parent[:referenced_model]) -%>
+    # GET /<%= parent_resource %>/:id/<%= @resource_name %>
+    def index
+      @<%= @resource_name %> = <%= @class_name %>.where(<%= parent[:referenced_model] %>_id: params[:<%= parent[:referenced_model] %>_id], index: '<%= Belt::Inflector.classify(parent[:referenced_model]) %>Index')
+    end
+
+    # POST /<%= parent_resource %>/:id/<%= @resource_name %>
+    def create
+      @<%= @singular_name %> = <%= @class_name %>.new(<%= (["#{parent[:referenced_model]}_id: params[:#{parent[:referenced_model]}_id]"] + @regular_fields.map { |f| "#{f[:name]}: params[:#{f[:name]}]" }).join(', ') %>)
+
+      if @<%= @singular_name %>.save
+        response_status :created
+      else
+        error_response(@<%= @singular_name %>.errors.full_messages.join(', '), :unprocessable_entity)
+      end
+    end
+
+    # GET /<%= parent_resource %>/:id/<%= @resource_name %>/:<%= @singular_name %>_id
+    def show
+      @<%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
+      return error_response('<%= @class_name %> not found', :not_found) unless @<%= @singular_name %>
+    end
+
+    # PUT /<%= parent_resource %>/:id/<%= @resource_name %>/:<%= @singular_name %>_id
+    def update
+      @<%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
+      return error_response('<%= @class_name %> not found', :not_found) unless @<%= @singular_name %>
+
+      attrs = {}
+<% @regular_fields.each do |field| -%>
+      attrs[:<%= field[:name] %>] = params[:<%= field[:name] %>] if params.key?(:<%= field[:name] %>)
+<% end -%>
+
+      if @<%= @singular_name %>.update(attrs)
+        # implicit response
+      else
+        error_response(@<%= @singular_name %>.errors.full_messages.join(', '), :unprocessable_entity)
+      end
+    end
+
+    # DELETE /<%= parent_resource %>/:id/<%= @resource_name %>/:<%= @singular_name %>_id
+    def destroy
+      <%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
+      return error_response('<%= @class_name %> not found', :not_found) unless <%= @singular_name %>
+
+      <%= @singular_name %>.destroy
+      head :no_content
+    end
+<% else -%>
     # GET /<%= @resource_name %>
     def index
-      <%= @resource_name %> = <%= @class_name %>.all
-      success_response(<%= @resource_name %>: <%= @resource_name %>.map(&:to_h))
+      @<%= @resource_name %> = <%= @class_name %>.all
     end
 
     # POST /<%= @resource_name %>
     def create
-      <%= @singular_name %> = <%= @class_name %>.new(<%= @fields.map { |f| "#{f[:name]}: params[:#{f[:name]}]" }.join(', ') %>)
+      @<%= @singular_name %> = <%= @class_name %>.new(<%= @regular_fields.map { |f| "#{f[:name]}: params[:#{f[:name]}]" }.join(', ') %>)
 
-      if <%= @singular_name %>.save
-        success_response(<%= @singular_name %>: <%= @singular_name %>.to_h)
+      if @<%= @singular_name %>.save
+        response_status :created
       else
-        error_response(<%= @singular_name %>.errors.full_messages.join(', '), 422)
+        error_response(@<%= @singular_name %>.errors.full_messages.join(', '), :unprocessable_entity)
       end
     end
 
     # GET /<%= @resource_name %>/:<%= @singular_name %>_id
     def show
-      <%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
-      return error_response('<%= @class_name %> not found', 404) unless <%= @singular_name %>
-
-      success_response(<%= @singular_name %>: <%= @singular_name %>.to_h)
+      @<%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
+      return error_response('<%= @class_name %> not found', :not_found) unless @<%= @singular_name %>
     end
 
     # PUT /<%= @resource_name %>/:<%= @singular_name %>_id
     def update
-      <%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
-      return error_response('<%= @class_name %> not found', 404) unless <%= @singular_name %>
+      @<%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
+      return error_response('<%= @class_name %> not found', :not_found) unless @<%= @singular_name %>
 
       attrs = {}
-<% @fields.each do |field| -%>
+<% @regular_fields.each do |field| -%>
       attrs[:<%= field[:name] %>] = params[:<%= field[:name] %>] if params.key?(:<%= field[:name] %>)
 <% end -%>
 
-      if <%= @singular_name %>.update(attrs)
-        success_response(<%= @singular_name %>: <%= @singular_name %>.to_h)
+      if @<%= @singular_name %>.update(attrs)
+        # implicit response
       else
-        error_response(<%= @singular_name %>.errors.full_messages.join(', '), 422)
+        error_response(@<%= @singular_name %>.errors.full_messages.join(', '), :unprocessable_entity)
       end
     end
 
     # DELETE /<%= @resource_name %>/:<%= @singular_name %>_id
     def destroy
       <%= @singular_name %> = <%= @class_name %>.find(params[:<%= @singular_name %>_id])
-      return error_response('<%= @class_name %> not found', 404) unless <%= @singular_name %>
+      return error_response('<%= @class_name %> not found', :not_found) unless <%= @singular_name %>
 
       <%= @singular_name %>.destroy
-      success_response(message: '<%= @class_name %> deleted')
+      head :no_content
     end
+<% end -%>
   end
 end

data/lib/templates/generate/model.rb.erb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
 class <%= @class_name %> < ApplicationRecord
-<% @fields.each do |field| -%>
-  attr_accessor :<%= field[:name] %>
+<% @references.each do |ref| -%>
+  belongs_to :<%= ref[:referenced_model] %>
 <% end -%>
+<% if @references.any? && (@regular_fields.any? || @references.any?) -%>
 
-  def to_h
-    {
-      id: id,
-<% @fields.each do |field| -%>
-      <%= field[:name] %>: <%= field[:name] %>,
 <% end -%>
-      created_at: created_at,
-      updated_at: updated_at
-    }
-  end
+<% @references.each do |ref| -%>
+  attr_accessor :<%= ref[:referenced_model] %>_id
+<% end -%>
+<% @regular_fields.each do |field| -%>
+  attr_accessor :<%= field[:name] %>
+<% end -%>
 end

data/lib/templates/new_app/Gemfile.erb

@@ -2,6 +2,4 @@
 
 source 'https://rubygems.org'
 
-gem 'activeitem'
 gem 'belt'
-gem 'lambda_loadout'

data/lib/templates/new_app/gitignore.erb

@@ -12,3 +12,6 @@
 # Lambda build artifacts
 /lambda/vendor/
 /lambda/.bundle/
+
+# Generated route manifests (belt routes --namespace)
+/lambda/lib/routes/

data/lib/templates/new_app/lambda/api.rb.erb

@@ -1,15 +1,9 @@
 # frozen_string_literal: true
 
 require 'belt'
-require 'activeitem'
 
 include Belt::LambdaHandler
 
-ActiveItem.configure do |config|
-  config.table_prefix = ENV['APP_NAME']
-  config.environment = ENV['ENVIRONMENT']
-end
-
 require_relative 'lib/routes/api_routes'
 <% @resources&.each do |r| -%>
 require_relative 'controllers/<%= @app_name %>/<%= r %>_controller'

data/lib/templates/new_app/lambda/config/environment.rb.erb

@@ -3,16 +3,10 @@
 # Boot the application. Used by `belt console` and Lambda at runtime.
 
 require 'belt'
-require 'activeitem'
 
 ENV['APP_NAME'] ||= '<%= @app_name %>'
 ENV['AWS_REGION'] ||= 'us-east-1'
 
-ActiveItem.configure do |config|
-  config.table_prefix = ENV['APP_NAME']
-  config.environment = ENV['ENVIRONMENT']
-end
-
 # Load lib and models
 Dir[File.join(__dir__, '..', 'lib', '**', '*.rb')].sort.each { |f| require f }
 

data/lib/templates/new_app/lambda/models/application_record.rb.erb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
-require 'activeitem'
-
 class ApplicationRecord < ActiveItem::Base
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Stowzilla
@@ -16,6 +16,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +95,7 @@ files:
 - lib/belt/cli/generate_command.rb
 - lib/belt/cli/generator_registry.rb
 - lib/belt/cli/lambda_config_command.rb
+- lib/belt/cli/logs_command.rb
 - lib/belt/cli/new_command.rb
 - lib/belt/cli/path_gem_materializer.rb
 - lib/belt/cli/plugin_command.rb