belt 0.1.6 → 0.1.8

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.6'
+  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/environment/outputs.tf.erb

@@ -1,5 +1,10 @@
 output "api_url" {
   description = "API Gateway base URL"
+  value       = values(conveyor_belt.main.api_gateway_urls)[0]
+}
+
+output "api_urls" {
+  description = "Map of gateway names to API Gateway URLs"
   value       = conveyor_belt.main.api_gateway_urls
 }
 

data/lib/templates/frontend_infra/frontend.tf.erb

@@ -153,7 +153,3 @@ output "frontend_distribution_id" {
 output "frontend_url" {
   value = "https://${aws_cloudfront_distribution.frontend.domain_name}"
 }
-
-output "api_url" {
-  value = values(conveyor_belt.main.api_gateway_urls)[0]
-}

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.6
+  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
@@ -59,6 +73,7 @@ files:
 - lib/belt/cli/bucket_security.rb
 - lib/belt/cli/console_command.rb
 - lib/belt/cli/deploy_command.rb
+- lib/belt/cli/destroy_command.rb
 - lib/belt/cli/env_resolver.rb
 - lib/belt/cli/environment_command.rb
 - lib/belt/cli/frontend_command.rb
@@ -79,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
@@ -117,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