belt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 479b619266e398d1d3052c96eb18f05c8452306a01aa46576b82e072372820b5
-  data.tar.gz: d5697750193b1a1cbba8d39e81190035d8fd40db490efbdb24903e7647374767
+  metadata.gz: ebbefe3f44abda51ac10b219cda18678ca834d06d8eab39e31beb3e48e99b25a
+  data.tar.gz: 3233b91c7297982ef7f5037331ef003c3637ebc6dccf4321b4a5f758ed57f1d9
 SHA512:
-  metadata.gz: 73ac84ffd0e2238b929180f89972f70c55a7d43a92d0f9de23b85cc6c318982c40c9466f49fe1d2d0960a47685acc90e1352b43f7e390ffee2951c83568ba432
-  data.tar.gz: 74db2374a336ba5ac774a5a8a4f7c053136de9dc652907e4abeebd69ec6bfa6485f35d3339787e7e5b17feadb3cf23014ae356d8050e817c90a2ba1fbf817ba6
+  metadata.gz: af38bf5330f69577f37ab34a0bd7510b5d84aa14969efd8975ac6875ea85450aaa741beeb71bf3f51f627af11c0c5445806081156706cdfd4901fba4301e33ed
+  data.tar.gz: 2eade1680ebfe76e78ab38e38d273565cf34eb1f1789427d358706ac2c4c128a5f86448a5eb2a146161be8c912bf53f9229fceb0904719c9df5ef3444dc3481e

data/lib/belt/cli/destroy_command.rb

@@ -2,6 +2,8 @@
 
 require 'fileutils'
 require_relative 'app_detection'
+require_relative 'tables_command'
+require_relative '../inflector'
 
 module Belt
   module CLI
@@ -93,13 +95,9 @@ module Belt
         @name = name&.downcase&.gsub(/[^a-z0-9_]/, '_')
         @fields = fields
         @app_name = detect_namespace
-        @resource_name = if @name
-                           @name.end_with?('s') ? @name : "#{@name}s"
-                         end
-        @singular_name = if @name
-                           @name.end_with?('s') ? @name.chomp('s') : @name
-                         end
-        @class_name = @singular_name&.split('_')&.map(&:capitalize)&.join
+        @singular_name = @name ? Belt::Inflector.singularize(@name) : nil
+        @resource_name = @singular_name ? Belt::Inflector.pluralize(@singular_name) : nil
+        @class_name = @singular_name ? Belt::Inflector.classify(@singular_name) : nil
         @removed = []
         @updated = []
       end
@@ -124,6 +122,7 @@ module Belt
         destroy_controller
         remove_routes
         remove_schema
+        sync_tables
         destroy_views
         puts "\n✓ Scaffold '#{@singular_name}' destroyed!"
       end
@@ -157,6 +156,17 @@ module Belt
           FileUtils.rm_rf(dir)
           @removed << dir
           puts "  remove  #{dir}/"
+
+          # Remove frontend.tf and revert frontend_urls in main.tf for each environment
+          Dir.glob('infrastructure/*/frontend.tf').each do |frontend_tf|
+            FileUtils.rm_f(frontend_tf)
+            puts "  remove  #{frontend_tf}"
+
+            env_dir = File.dirname(frontend_tf)
+            main_tf = File.join(env_dir, 'main.tf')
+            revert_main_tf_frontend_urls(main_tf)
+          end
+
           puts "\n✓ Frontend removed!"
         else
           puts '✗ No frontend/ directory found.'
@@ -164,10 +174,29 @@ module Belt
         end
       end
 
+      def revert_main_tf_frontend_urls(main_tf)
+        return unless File.exist?(main_tf)
+
+        content = File.read(main_tf)
+        return unless content.include?('aws_cloudfront_distribution.frontend.domain_name')
+
+        # Replace the multi-line concat block back to a simple conditional
+        replaced = content.sub(
+          /^\s*frontend_urls\s*=\s*concat\(\n(?:.*\n)*?\s*\)\s*\n/,
+          "  frontend_urls     = var.environment == \"prod\" ? [] : [\"http://localhost:3000\"]\n"
+        )
+
+        if replaced != content
+          File.write(main_tf, replaced)
+          puts "  update  #{main_tf} (reverted frontend_urls)"
+        end
+      end
+
       def destroy_views
         return unless @resource_name
 
         pages_dir = "frontend/src/pages/#{@resource_name}"
+
         if Dir.exist?(pages_dir)
           FileUtils.rm_rf(pages_dir)
           @removed << pages_dir
@@ -255,6 +284,10 @@ module Belt
         end
       end
 
+      def sync_tables
+        Belt::CLI::TablesCommand.sync_all_environments
+      end
+
       def remove_view_routes
         app_jsx = 'frontend/src/App.jsx'
         return unless File.exist?(app_jsx)

data/lib/belt/cli/frontend_setup_command.rb

@@ -39,6 +39,7 @@ module Belt
       def run
         validate!
         generate_frontend_tf
+        update_main_tf_frontend_urls
         return if @quiet
 
         puts "\n✓ Frontend infrastructure generated for '#{@env}'!"
@@ -62,6 +63,35 @@ module Belt
         File.write(dest, content)
         puts "  create  #{dest}" unless @quiet
       end
+
+      def update_main_tf_frontend_urls
+        main_tf = File.join(@env_dir, 'main.tf')
+        return unless File.exist?(main_tf)
+
+        content = File.read(main_tf)
+        cloudfront_url = '"https://${aws_cloudfront_distribution.frontend.domain_name}"'
+
+        # Already patched — skip
+        return if content.include?('aws_cloudfront_distribution.frontend.domain_name')
+
+        # Match any frontend_urls line (hardcoded list or conditional expression)
+        new_frontend_urls = <<~HCL.chomp
+          frontend_urls     = concat(
+            [#{cloudfront_url}],
+            var.environment == "prod" ? [] : ["http://localhost:3000"]
+          )
+        HCL
+
+        replaced = content.sub(
+          /^(\s*)frontend_urls\s*=\s*.+$/,
+          new_frontend_urls
+        )
+
+        if replaced != content
+          File.write(main_tf, replaced)
+          puts "  update  #{main_tf} (added CloudFront URL to frontend_urls)" unless @quiet
+        end
+      end
     end
   end
 end

data/lib/belt/cli/generate_command.rb

@@ -5,7 +5,9 @@ require 'erb'
 require_relative 'app_detection'
 require_relative 'environment_command'
 require_relative 'frontend_command'
+require_relative 'tables_command'
 require_relative 'views_command'
+require_relative '../inflector'
 
 module Belt
   module CLI
@@ -25,9 +27,9 @@ module Belt
             ['--skip-views', 'Skip generating frontend view pages']
           ],
           examples: [
-            ['belt g scaffold post title:string body:text', 'Post with title and body fields'],
-            ['belt g scaffold comment author:string body:text status:string', 'Scaffold with multiple fields'],
-            ['belt g scaffold task --skip-views', 'Scaffold without frontend pages']
+            ['belt g scaffold post title body:text'],
+            ['belt g scaffold comment author body:text status'],
+            ['belt g scaffold task --skip-views']
           ],
           notes: <<~NOTES
             Creates:
@@ -46,8 +48,8 @@ module Belt
           usage: 'belt generate model <name> [field:type ...]',
           options: [],
           examples: [
-            ['belt g model user email:string name:string', 'User model with email and name'],
-            ['belt g model event title:string starts_at:datetime', 'Event model with datetime field']
+            ['belt g model user email name'],
+            ['belt g model event title starts_at:datetime']
           ],
           notes: <<~NOTES
             Creates:
@@ -59,8 +61,8 @@ module Belt
           usage: 'belt generate controller <name>',
           options: [],
           examples: [
-            ['belt g controller posts', 'Posts controller with CRUD actions'],
-            ['belt g controller admin/users', 'Namespaced controller']
+            ['belt g controller posts'],
+            ['belt g controller admin/users']
           ],
           notes: <<~NOTES
             Creates:
@@ -132,7 +134,7 @@ module Belt
         errors << 'must only contain letters, numbers, and underscores' unless name.match?(/\A[a-zA-Z][a-zA-Z0-9_]*\z/)
         errors << 'must not start or end with an underscore' if name.match?(/\A_|_\z/)
         errors << 'must not contain consecutive underscores' if name.include?('__')
-        errors << "is a reserved name" if RESERVED_NAMES.include?(name.downcase.chomp('s'))
+        errors << "is a reserved name" if RESERVED_NAMES.include?(Belt::Inflector.singularize(name.downcase))
         errors << "is a reserved name" if RESERVED_NAMES.include?(name.downcase)
 
         return if errors.empty?
@@ -161,14 +163,15 @@ module Belt
 
           Field Types:
             #{FIELD_TYPES.join(', ')}
+            (defaults to string if omitted)
 
           Examples:
-            belt g scaffold post title:string body:text status:string
-            belt g model user email:string name:string
+            belt g scaffold post title body:text status
+            belt g model user email name
             belt g controller comments
             belt g environment staging
             belt g frontend react
-            belt g views post title:string body:text
+            belt g views post title body:text
 
           Run 'belt generate <generator> --help' for detailed help on a specific generator.
         HELP
@@ -197,21 +200,18 @@ module Belt
 
         puts "\nField Types:"
         puts "  #{FIELD_TYPES.join(', ')}"
+        puts "  (defaults to string if omitted)"
 
         puts "\nExamples:"
         info[:examples].each do |cmd, desc|
-          puts "  #{cmd}"
-          puts "    #{desc}" if desc
+          if desc
+            puts "  #{cmd}  — #{desc}"
+          else
+            puts "  #{cmd}"
+          end
         end
 
         puts "\n#{info[:notes]}" if info[:notes]
-
-        puts "Naming Rules:"
-        puts "  - Must start with a letter"
-        puts "  - At least 2 characters"
-        puts "  - Letters, numbers, and single underscores only"
-        puts "  - No leading/trailing/consecutive underscores"
-        puts "  - Cannot use reserved names (help, new, create, destroy, etc.)"
       end
 
       def initialize(generator, name, fields, skip_views: false)
@@ -221,15 +221,15 @@ module Belt
         @skip_views = skip_views
         @app_name = detect_namespace
         @module_name = @app_name.split(/[-_]/).map(&:capitalize).join
-        @resource_name = @name.end_with?('s') ? @name : "#{@name}s"
-        @singular_name = @name.end_with?('s') ? @name.chomp('s') : @name
-        @class_name = @singular_name.split('_').map(&:capitalize).join
+        @singular_name = Belt::Inflector.singularize(@name)
+        @resource_name = Belt::Inflector.pluralize(@singular_name)
+        @class_name = Belt::Inflector.classify(@singular_name)
       end
 
       def generate
         case @generator
         when 'scaffold'  then generate_resource
-        when 'model'     then generate_model
+        when 'model'     then generate_model_standalone
         when 'controller' then generate_controller
         end
       end
@@ -241,6 +241,7 @@ module Belt
         generate_controller
         inject_routes
         inject_schema
+        sync_tables
         generate_views_if_frontend
         puts "\n✓ Scaffold '#{@singular_name}' generated!"
         puts "\nFiles created/updated:"
@@ -252,6 +253,12 @@ module Belt
         puts "  frontend/src/pages/#{@resource_name}/ (views)" if Dir.exist?('frontend/src')
       end
 
+      def generate_model_standalone
+        generate_model
+        inject_schema
+        sync_tables
+      end
+
       def generate_model
         dest = "lambda/models/#{@singular_name}.rb"
         write_template('model.rb.erb', dest)
@@ -373,6 +380,10 @@ module Belt
         puts "  update  #{schema_file}"
       end
 
+      def sync_tables
+        Belt::CLI::TablesCommand.sync_all_environments
+      end
+
       def write_template(template_name, dest_path)
         template_path = File.join(TEMPLATE_DIR, template_name)
         FileUtils.mkdir_p(File.dirname(dest_path))

data/lib/belt/cli/new_command.rb

@@ -109,7 +109,6 @@ module Belt
         %W[
           #{@app_name}/lambda/controllers/api
           #{@app_name}/lambda/models
-          #{@app_name}/lambda/models/concerns
           #{@app_name}/lambda/lib/routes
           #{@app_name}/lambda/config
           #{@app_name}/lambda/spec
@@ -124,7 +123,6 @@ module Belt
           'lambda/api.rb.erb' => "#{@app_name}/lambda/api.rb",
           'lambda/config/environment.rb.erb' => "#{@app_name}/lambda/config/environment.rb",
           'lambda/models/application_record.rb.erb' => "#{@app_name}/lambda/models/application_record.rb",
-          'lambda/models/concerns/timestampable.rb.erb' => "#{@app_name}/lambda/models/concerns/timestampable.rb",
           'lambda/controllers/application_controller.rb.erb' =>
             "#{@app_name}/lambda/controllers/api/application_controller.rb",
           'lambda/lib/routes/routes.rb.erb' => "#{@app_name}/lambda/lib/routes/api_routes.rb",

data/lib/belt/cli/routes_command.rb

@@ -292,15 +292,7 @@ module Belt
       end
 
       def singularize(word)
-        if word.end_with?('ies')
-          "#{word[0..-4]}y"
-        elsif word.end_with?('ses') || word.end_with?('xes') || word.end_with?('zes')
-          word[0..-3]
-        elsif word.end_with?('s') && !word.end_with?('ss')
-          word[0..-2]
-        else
-          word
-        end
+        Belt::Inflector.singularize(word)
       end
     end
   end

data/lib/belt/cli/tables_command.rb

@@ -2,6 +2,8 @@
 
 require_relative 'app_detection'
 require_relative 'env_resolver'
+require_relative 'terraform_command'
+require_relative '../inflector'
 
 module Belt
   module CLI
@@ -27,8 +29,22 @@ module Belt
         new(env).run
       end
 
-      def initialize(env)
+      # Automatically sync dynamodb.tf for all existing environments.
+      # Called by generators after updating schema.tf.rb.
+      def self.sync_all_environments
+        return unless File.exist?(SCHEMA_FILE)
+
+        environments = TerraformCommand.list_environments
+        return if environments.empty?
+
+        environments.each do |env|
+          new(env, quiet: true).run
+        end
+      end
+
+      def initialize(env, quiet: false)
         @env = env
+        @quiet = quiet
         @app_name = detect_app_name
         @env_dir = "infrastructure/#{@env}"
       end
@@ -37,8 +53,8 @@ module Belt
         validate!
         models = parse_schema
         if models.empty?
-          puts "No models found in #{SCHEMA_FILE}"
-          exit 0
+          puts "No models found in #{SCHEMA_FILE}" unless @quiet
+          return
         end
 
         generate_dynamodb_tf(models)
@@ -47,32 +63,54 @@ module Belt
       private
 
       def validate!
-        abort "Error: #{SCHEMA_FILE} not found. Run `belt generate resource` first." unless File.exist?(SCHEMA_FILE)
+        unless File.exist?(SCHEMA_FILE)
+          abort "Error: #{SCHEMA_FILE} not found. Run `belt generate resource` first." unless @quiet
+          return
+        end
         return if Dir.exist?(@env_dir)
 
-        abort "Error: Environment '#{@env}' not found at #{@env_dir}/.\n" \
-              "Create it with: belt generate environment #{@env}"
+        unless @quiet
+          abort "Error: Environment '#{@env}' not found at #{@env_dir}/.\n" \
+                "Create it with: belt generate environment #{@env}"
+        end
       end
 
       def parse_schema
+        return [] unless File.exist?(SCHEMA_FILE)
+
         parser = SchemaParser.new
         schema_content = File.read(SCHEMA_FILE)
 
         # Replace DSL wrapper with direct parser call
         # Belt.application.schema.draw do ... end → parser.instance_eval do ... end
-        inner = schema_content.sub(/\A(?:Belt\.application)\.schema\.draw do\n?/, '').sub(/\nend\s*\z/, '')
+        inner = schema_content.sub(/\A(?:Belt\.application)\.schema\.draw do\n?/, '').sub(/\n?end\s*\z/, '')
+        inner.strip!
+
+        return [] if inner.empty? || inner.match?(/\A\s*\z/m)
+
         parser.instance_eval(inner, SCHEMA_FILE)
         parser.models
       end
 
       def generate_dynamodb_tf(models)
         dest = File.join(@env_dir, 'dynamodb.tf')
-        content = render_dynamodb(models)
-        File.write(dest, content)
-        puts "  create  #{dest}"
-        puts "\n✓ Generated DynamoDB tables for #{models.size} model(s):"
-        models.each { |m| puts "    • #{table_name(m[:name])}" }
-        puts "\nRun `belt apply #{@env}` to create them."
+        existing_content = File.exist?(dest) ? File.read(dest) : nil
+        new_content = render_dynamodb(models)
+
+        # Skip if content is unchanged
+        return if existing_content == new_content
+
+        File.write(dest, new_content)
+
+        if @quiet
+          verb = existing_content ? 'update' : 'create'
+          puts "  #{verb}  #{dest}"
+        else
+          puts "  create  #{dest}"
+          puts "\n✓ Generated DynamoDB tables for #{models.size} model(s):"
+          models.each { |m| puts "    • #{table_name(m[:name])}" }
+          puts "\nRun `belt deploy` to create them."
+        end
       end
 
       def render_dynamodb(models)
@@ -84,7 +122,7 @@ module Belt
       def render_table(model)
         name = table_name(model[:name])
         <<~HCL
-          resource "aws_dynamodb_table" "#{model[:name]}s" {
+          resource "aws_dynamodb_table" "#{Belt::Inflector.pluralize(model[:name])}" {
             name         = "#{name}"
             billing_mode = "PAY_PER_REQUEST"
             hash_key     = "id"
@@ -104,7 +142,7 @@ module Belt
       end
 
       def table_name(model_name)
-        "#{@app_name}-#{@env}-#{model_name}s"
+        "#{@app_name}-#{@env}-#{Belt::Inflector.pluralize(model_name)}"
       end
 
       # Minimal DSL parser for schema.tf.rb

data/lib/belt/cli/views_command.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'erb'
+require_relative '../inflector'
 
 module Belt
   module CLI
@@ -35,7 +36,7 @@ module Belt
         return [] unless File.exist?(schema_file)
 
         content = File.read(schema_file)
-        singular = name.end_with?('s') ? name.chomp('s') : name
+        singular = Belt::Inflector.singularize(name)
 
         # Extract fields from model block
         if content =~ /model :#{singular} do\n(.*?)\n\s*end/m
@@ -53,9 +54,9 @@ module Belt
       def initialize(name, fields)
         @name = name.downcase.gsub(/[^a-z0-9_]/, '_')
         @fields = fields
-        @resource_name = @name.end_with?('s') ? @name : "#{@name}s"
-        @singular_name = @name.end_with?('s') ? @name.chomp('s') : @name
-        @class_name = @singular_name.split('_').map(&:capitalize).join
+        @singular_name = Belt::Inflector.singularize(@name)
+        @resource_name = Belt::Inflector.pluralize(@singular_name)
+        @class_name = Belt::Inflector.classify(@singular_name)
       end
 
       def generate
@@ -65,9 +66,10 @@ module Belt
         end
 
         pages_dir = "frontend/src/pages/#{@resource_name}"
+        @plural_class_name = Belt::Inflector.camelize(@resource_name)
         FileUtils.mkdir_p(pages_dir)
 
-        write_template('Index.jsx.erb', "#{pages_dir}/#{@class_name}sIndex.jsx")
+        write_template('Index.jsx.erb', "#{pages_dir}/#{@plural_class_name}Index.jsx")
         write_template('Show.jsx.erb', "#{pages_dir}/#{@class_name}Show.jsx")
         write_template('New.jsx.erb', "#{pages_dir}/#{@class_name}New.jsx")
         write_template('Edit.jsx.erb', "#{pages_dir}/#{@class_name}Edit.jsx")
@@ -77,7 +79,7 @@ module Belt
 
         puts "\n✓ Views for '#{@singular_name}' generated!"
         puts "\nFiles created:"
-        puts "  #{pages_dir}/#{@class_name}sIndex.jsx"
+        puts "  #{pages_dir}/#{@plural_class_name}Index.jsx"
         puts "  #{pages_dir}/#{@class_name}Show.jsx"
         puts "  #{pages_dir}/#{@class_name}New.jsx"
         puts "  #{pages_dir}/#{@class_name}Edit.jsx"
@@ -100,16 +102,17 @@ module Belt
 
         content = File.read(app_jsx)
         pages_dir = @resource_name
+        plural_class = @plural_class_name || Belt::Inflector.camelize(@resource_name)
 
         import_lines = [
-          "import #{@class_name}sIndex from './pages/#{pages_dir}/#{@class_name}sIndex'",
+          "import #{plural_class}Index from './pages/#{pages_dir}/#{plural_class}Index'",
           "import #{@class_name}Show from './pages/#{pages_dir}/#{@class_name}Show'",
           "import #{@class_name}New from './pages/#{pages_dir}/#{@class_name}New'",
           "import #{@class_name}Edit from './pages/#{pages_dir}/#{@class_name}Edit'"
         ]
 
         route_lines = [
-          "        <Route path=\"/#{@resource_name}\" element={<#{@class_name}sIndex />} />",
+          "        <Route path=\"/#{@resource_name}\" element={<#{plural_class}Index />} />",
           "        <Route path=\"/#{@resource_name}/new\" element={<#{@class_name}New />} />",
           "        <Route path=\"/#{@resource_name}/:id\" element={<#{@class_name}Show />} />",
           "        <Route path=\"/#{@resource_name}/:id/edit\" element={<#{@class_name}Edit />} />"

data/lib/belt/inflector.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'active_support/inflector'
+
+# Add common inflection rules that ActiveSupport doesn't include by default
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.irregular 'hero', 'heroes'
+  inflect.irregular 'potato', 'potatoes'
+  inflect.irregular 'volcano', 'volcanoes'
+  inflect.irregular 'echo', 'echoes'
+  inflect.irregular 'embargo', 'embargoes'
+  inflect.irregular 'veto', 'vetoes'
+end
+
+module Belt
+  # Provides proper English inflection rules (pluralize, singularize, classify, etc.)
+  # via ActiveSupport::Inflector. Used throughout Belt for resource name derivation.
+  #
+  # ActiveSupport is already a transitive dependency (via activeitem → activemodel → activesupport)
+  # so this adds zero new weight.
+  module Inflector
+    module_function
+
+    # "hero" → "heroes", "post" → "posts", "person" → "people"
+    def pluralize(word)
+      word.to_s.pluralize
+    end
+
+    # "heroes" → "hero", "posts" → "post", "people" → "person"
+    def singularize(word)
+      word.to_s.singularize
+    end
+
+    # "blog_post" → "BlogPost", "hero" → "Hero"
+    def classify(word)
+      singularize(word).split('_').map(&:capitalize).join
+    end
+
+    # "blog_posts" → "BlogPosts", "heroes" → "Heroes" (no singularization)
+    def camelize(word)
+      word.to_s.split('_').map(&:capitalize).join
+    end
+
+    # "BlogPost" → "blog_post"
+    def underscore(word)
+      word.to_s
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .downcase
+    end
+
+    # "heroes_controller" → "heroes", "PostsController" → "posts"
+    def resource_name(word)
+      pluralize(word.to_s.sub(/_?controller$/i, '').downcase)
+    end
+  end
+end

data/lib/belt/lambda_handler.rb

@@ -41,6 +41,17 @@ module Belt
         subdir = File.join(controllers_dir, child)
         Belt.controller_paths << subdir if File.directory?(subdir)
       end
+
+      # Auto-load all models (application_record first, then the rest)
+      models_dir = File.join(File.dirname(caller_file), 'models')
+      if File.directory?(models_dir)
+        all_models = Dir[File.join(models_dir, '**', '*.rb')].sort
+        app_record = all_models.find { |f| File.basename(f) == 'application_record.rb' }
+        rest = all_models - [app_record].compact
+
+        require app_record if app_record
+        rest.each { |f| require f }
+      end
     end
 
     # API Gateway Lambda handler.

data/lib/belt/route_dsl.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'inflector'
+
 module Belt
   # DSL for defining API Gateway routes.
   # Ported from terraform-provider-conveyor-belt/scripts/lib/route_dsl.rb
@@ -256,17 +258,7 @@ module Belt
     end
 
     def singularize(word)
-      if word.end_with?('ies')
-        "#{word[0..-4]}y"
-      elsif word.end_with?('xes') || word.end_with?('zes') || word.end_with?('ses')
-        word[0..-3]
-      elsif word.end_with?('ches') || word.end_with?('shes')
-        word[0..-3]
-      elsif word.end_with?('s') && !word.end_with?('ss')
-        word[0..-2]
-      else
-        word
-      end
+      Belt::Inflector.singularize(word)
     end
   end
 

data/lib/belt/table_inference.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'inflector'
+
 module Belt
   # Infers DynamoDB table names from route paths by matching against
   # tables defined in a Terraform file containing aws_dynamodb_table resources.
@@ -45,27 +47,11 @@ module Belt
     end
 
     def pluralize(word)
-      if word.end_with?('y')
-        "#{word[0..-2]}ies"
-      elsif word.end_with?('s', 'x', 'z', 'ch', 'sh')
-        "#{word}es"
-      else
-        "#{word}s"
-      end
+      Belt::Inflector.pluralize(word)
     end
 
     def singularize(word)
-      if word.end_with?('ies')
-        "#{word[0..-4]}y"
-      elsif word.end_with?('xes', 'zes', 'ses')
-        word[0..-3]
-      elsif word.end_with?('ches', 'shes')
-        word[0..-3]
-      elsif word.end_with?('s') && !word.end_with?('ss')
-        word[0..-2]
-      else
-        word
-      end
+      Belt::Inflector.singularize(word)
     end
   end
 end

data/lib/belt/version.rb

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

data/lib/templates/environment/main.tf.erb

@@ -38,7 +38,7 @@ resource "conveyor_belt" "main" {
   app_name          = var.app_name
   lambda_source_dir = "${path.module}/../../lambda"
   lambda_shared_dirs = ["controllers", "helpers", "lib", "models", "views"]
-  frontend_urls     = ["http://localhost:3000"]
+  frontend_urls     = var.environment == "prod" ? [] : ["http://localhost:3000"]
   friendly_errors   = var.environment != "prod"
 
   # Per-lambda configuration: env vars, timeouts, memory

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'application_controller'
-require_relative '../../models/<%= @singular_name %>'
 
 module <%= @module_name %>Controllers
   class <%= @class_name %>sController < ApplicationController

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class <%= @class_name %> < ApplicationRecord
-  include Concerns::Timestampable
-
 <% @fields.each do |field| -%>
   attr_accessor :<%= field[:name] %>
 <% end -%>

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

@@ -15,4 +15,10 @@ end
 
 # Load lib and models
 Dir[File.join(__dir__, '..', 'lib', '**', '*.rb')].sort.each { |f| require f }
-Dir[File.join(__dir__, '..', 'models', '**', '*.rb')].sort.each { |f| require f }
+
+models_dir = File.join(__dir__, '..', 'models')
+all_models = Dir[File.join(models_dir, '**', '*.rb')].sort
+app_record = all_models.find { |f| File.basename(f) == 'application_record.rb' }
+rest = all_models - [app_record].compact
+require app_record if app_record
+rest.each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Stowzilla
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: lambda_loadout
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,7 @@ files:
 - lib/belt/helpers/cors_origin.rb
 - lib/belt/helpers/error_logging.rb
 - lib/belt/helpers/response.rb
+- lib/belt/inflector.rb
 - lib/belt/lambda_handler.rb
 - lib/belt/observability.rb
 - lib/belt/parameters.rb
@@ -118,7 +133,6 @@ files:
 - lib/templates/new_app/lambda/controllers/application_controller.rb.erb
 - lib/templates/new_app/lambda/lib/routes/routes.rb.erb
 - lib/templates/new_app/lambda/models/application_record.rb.erb
-- lib/templates/new_app/lambda/models/concerns/timestampable.rb.erb
 - lib/templates/views/Edit.jsx.erb
 - lib/templates/views/Form.jsx.erb
 - lib/templates/views/Index.jsx.erb

data/lib/templates/new_app/lambda/models/concerns/timestampable.rb.erb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Concerns
-  module Timestampable
-    def self.included(base)
-      base.attr_accessor :created_at, :updated_at
-      base.set_callback :create, :before, :set_timestamps
-      base.set_callback :update, :before, :set_updated_at
-    end
-
-    private
-
-    def set_timestamps
-      now = Time.now.utc.iso8601
-      self.created_at ||= now
-      self.updated_at = now
-    end
-
-    def set_updated_at
-      self.updated_at = Time.now.utc.iso8601
-    end
-  end
-end