natra 0.0.7 → 2.0.0

data/lib/natra/generators/app/templates/bin/setup

@@ -1,7 +1,7 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 set -e
 
-RACK_ENV=development rake db:create db:migrate --trace
-RACK_ENV=development rake db:seed --trace
-RACK_ENV=test DATABASE_URL=$TEST_DATABASE_URL rake db:create db:migrate --trace
+RACK_ENV=development bundle exec rake db:create db:migrate --trace
+RACK_ENV=development bundle exec rake db:seed --trace
+RACK_ENV=test DATABASE_URL=$TEST_DATABASE_URL bundle exec rake db:create db:migrate --trace

data/lib/natra/generators/app/templates/config/database.yml

@@ -1,15 +1,15 @@
 development:
   adapter: postgresql
   encoding: unicode
-  database: ENV['DEV_DATABASE']
-  pool: 2
+  database: <%%= ENV.fetch('DEV_DATABASE', 'development_<%= @name.directory_name %>') %>
+  pool: 5
 production:
   adapter: postgresql
   encoding: unicode
-  database: ENV['PROD_DATABASE']
-  pool: 2
+  database: <%%= ENV.fetch('PROD_DATABASE', 'production_<%= @name.directory_name %>') %>
+  pool: 5
 test:
   adapter: postgresql
   encoding: unicode
-  database: ENV['TEST_DATABASE']
-  pool: 2
+  database: <%%= ENV.fetch('TEST_DATABASE', 'test_<%= @name.directory_name %>') %>
+  pool: 5

data/lib/natra/generators/app/templates/config/environment.rb

@@ -1,12 +1,11 @@
+# frozen_string_literal: true
+
 ENV['RACK_ENV'] ||= 'development'
-require 'rubygems'
 require 'bundler/setup'
-Bundler.require(:default, ENV['RACK_ENV'])
+Bundler.require(:default, ENV.fetch('RACK_ENV'))
 require 'active_support'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string'
-require 'rack-timeout'
-require 'scout_apm'
-require 'oj'
+require_all 'config/initializers'
 require './app/controllers/application_controller'
 require_all 'app'

data/lib/natra/generators/app/templates/config/initializers/oj.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 Oj.default_options = {
-    class_cache: true,
-    mode:        :strict
-  }
-  
+  class_cache: true,
+  mode: :strict
+}

data/lib/natra/generators/app/templates/config/initializers/redis.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 # Redis Configuration
-unless ENV['RACK_ENV'] == 'test'
-  redis_settings = YAML.load_file('config/redis.yml')
-  REDIS = Redis.new(redis_settings[ENV['RACK_ENV']])
+unless ENV.fetch('RACK_ENV') == 'test'
+  redis_settings = YAML.load_file('config/redis.yml').fetch(ENV.fetch('RACK_ENV'))
+  REDIS = Redis.new(**redis_settings.compact.transform_keys(&:to_sym))
 end

data/lib/natra/generators/app/templates/config/puma.rb

@@ -1,11 +1,17 @@
-threads_count = Integer(ENV['PUMA_MAX_THREADS'] || 5)
-port          = Integer(ENV['PORT'] || 9292)
+# frozen_string_literal: true
+
+threads_count = Integer(ENV.fetch('PUMA_MAX_THREADS', 5))
+port          = Integer(ENV.fetch('PORT', 9292))
+workers_count = Integer(ENV.fetch('WEB_CONCURRENCY', 0))
 
 threads threads_count, threads_count
-workers Integer(ENV['WEB_CONCURRENCY'] || 1)
 
-preload_app!
+# Cluster mode only when WEB_CONCURRENCY asks for workers.
+if workers_count.positive?
+  workers workers_count
+  preload_app!
+end
 
-environment ENV['SINATRA_ENV'] || 'development'
+environment ENV.fetch('RACK_ENV', 'development')
 
 bind "tcp://0.0.0.0:#{port}"

data/lib/natra/generators/app/templates/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require './config/environment'
 use Rack::Timeout, service_timeout: 5
 ScoutApm::Rack.install!

data/lib/natra/generators/app/templates/db/migrate/add_extensions.rb

@@ -1,4 +1,6 @@
-class AddExtensions < ActiveRecord::Migration[5.2]
+# frozen_string_literal: true
+
+class AddExtensions < ActiveRecord::Migration[8.1]
   def change
     enable_extension 'hstore'
     enable_extension 'uuid-ossp'

data/lib/natra/generators/app/templates/docker-compose.yml

@@ -1,20 +1,18 @@
-version: "2.3"
-
 services:
   web:
     build:
       context: .
       target: development
-    command: puma
+    command: bundle exec puma -C config/puma.rb
     volumes:
       - .:/usr/src/app
     ports:
       - '9292:9292'
-    links:
+    depends_on:
       - db
     env_file: secrets.env
   db:
-    image: postgres:10-alpine
+    image: postgres:17-alpine
     ports:
       - "54329:5432"
     env_file: secrets.env

data/lib/natra/generators/app/templates/rubocop.yml

@@ -1,23 +1,20 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.3
+  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - Guardfile
     - spec/spec_helper.rb
-    - tmp/**
+    - tmp/**/*
+    - vendor/**/*
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Encoding:
-  Enabled: false
-
-AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/MultilineMethodCallIndentation:
@@ -29,7 +26,7 @@ Layout/MultilineOperationIndentation:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-ClassAndModuleChildren:
+Style/ClassAndModuleChildren:
   Enabled: false
 
 Metrics/BlockLength:

data/lib/natra/generators/app/templates/spec/application_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 
 def app

data/lib/natra/generators/app/templates/spec/spec_helper.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start
+
 ENV['RACK_ENV'] = 'test'
 require_relative '../config/environment'
 require 'rack/test'
 require 'capybara/rspec'
 require 'capybara/dsl'
-require 'coveralls'
-Coveralls.wear!
-if ActiveRecord::Migrator.needs_migration?
-  raise 'Migrations are pending. Run `rake db:migrate RACK_ENV=test` to resolve the issue.'
-end
+
+ActiveRecord::Migration.check_all_pending!
 
 ActiveRecord::Base.logger = nil
 
 RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
+  config.filter_run_when_matching :focus
   config.include Rack::Test::Methods
   config.include Capybara::DSL
   DatabaseCleaner.strategy = :truncation
@@ -26,11 +27,11 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.order = 'default'
+  config.order = :defined
 end
 
 def app
-  Rack::Builder.parse_file('config.ru').first
+  Rack::Builder.parse_file('config.ru')
 end
 
 Capybara.app = app

data/lib/natra/generators/controller/controller_generator.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require 'thor/group'
 require 'active_support/inflector'
 module Natra
   module Generators
+    # Generates a controller, its routes and views (natra controller).
     class ControllerGenerator < Thor::Group
       include Thor::Actions
+
       attr_reader :controller_name, :class_name, :file_name
 
       desc 'Generate an Controller with associated views'

data/lib/natra/generators/model/migration.rb.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[8.1]
   def change
     create_table :<%= table_name %> ,id: :uuid do |t|
 <% attributes.each do |attribute| -%>

data/lib/natra/generators/model/model_generator.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require 'thor/group'
 require 'active_support/inflector'
 module Natra
   module Generators
+    # Generates an ActiveRecord model and its migration (natra model).
     class ModelGenerator < Thor::Group
       include Thor::Actions
+
       attr_reader :file_name, :class_name, :model_name, :migration_name, :migration_class_name, :table_name
 
       desc 'Generate an ActiveRecord model'
@@ -32,7 +36,8 @@ module Natra
 
       def create_model
         unless model_name == name
-          say "[WARNING] The model name '#{name}' was recognized as a plural, using the singular '#{model_name}' instead."
+          say "[WARNING] The model name '#{name}' was recognized as a plural, " \
+              "using the singular '#{model_name}' instead."
         end
 
         template 'model.rb.erb', File.join('app/models', "#{file_name}.rb")
@@ -43,7 +48,8 @@ module Natra
 
         migration_files = Dir.entries('db/migrate').reject { |path| File.directory? path }
 
-        if duplicate = migration_files.find { |file| file.include?(migration_name) }
+        duplicate = migration_files.find { |file| file.include?(migration_name) }
+        if duplicate
           say_status :identical, "db/migrate/#{duplicate}", :blue
         else
           version = Time.now.utc.strftime('%Y%m%d%H%M%S')

data/lib/natra/generators/scaffold/scaffold_generator.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'thor/group'
 require 'active_support/inflector'
 module Natra
   module Generators
+    # Generates a model with its controller and views (natra scaffold).
     class ScaffoldGenerator < Thor::Group
       include Thor::Actions
 

data/lib/natra/generators/service/service_generator.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'thor/group'
+require 'active_support/inflector'
+module Natra
+  module Generators
+    # Generates a plain Ruby service object.
+    class ServiceGenerator < Thor::Group
+      include Thor::Actions
+
+      attr_reader :service_name, :class_name, :file_name
+
+      desc 'Generate a Service Object'
+      argument :name, type: :string, desc: 'Name of the Service Object'
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def setup
+        @service_name = name.pluralize.underscore
+        @class_name      = "#{service_name.camel_case}Service"
+        @file_name       = class_name.underscore
+      end
+
+      def create_service
+        template 'template/service.rb.erb', File.join('app/services', "#{file_name}.rb")
+      end
+    end
+  end
+end

data/lib/natra/generators/service/template/service.rb.erb

@@ -0,0 +1,11 @@
+class <%= class_name %>
+  attr_reader :args
+
+  def initialize(*args)
+    @args = args
+  end
+
+  def call
+    args
+  end
+end

data/lib/natra/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Natra
-  VERSION = '0.0.7'.freeze
+  VERSION = '2.0.0'
 end

data/lib/natra.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require 'extensions/string'
 require 'natra/generators/app/app_generator'
 require 'natra/generators/model/model_generator'
 require 'natra/generators/scaffold/scaffold_generator'
 require 'natra/generators/controller/controller_generator'
+require 'natra/generators/service/service_generator'
 require 'natra/version'
 require 'natra/cli'
+# Generates lightweight Sinatra API applications and their models, controllers and services.
 module Natra; end

data/natra.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'natra/version'
@@ -5,27 +7,28 @@ require 'natra/version'
 Gem::Specification.new do |spec|
   spec.name          = 'natra'
   spec.version       = Natra::VERSION
-  spec.authors       = ['Thiru Njuguna']
-  spec.email         = ['thirunjuguna@outlook.com']
+  spec.authors       = ['James Njuguna']
+  spec.email         = ['jamesnjuguna0419@gmail.com']
 
-  spec.summary       = 'Natra generate a light weight sinatra application'
-  spec.description   = 'Natra generate a light weight sinatra application.It\'s ideal for building containerized micro-services with postgres database'
-  spec.homepage      = 'https://github.com/thirunjuguna/natra'
+  spec.summary       = 'Natra generates lightweight Sinatra applications'
+  spec.required_ruby_version = '>= 3.3'
+  spec.description   = 'Natra generates lightweight Sinatra applications, ideal for containerized ' \
+                       'API services with a PostgreSQL database.'
+  spec.homepage      = 'https://github.com/jamesnjuguna0419/natra'
   spec.license       = 'MIT'
   if spec.respond_to?(:metadata)
     spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = 'https://github.com/thirunjuguna/natra'
-    spec.metadata['changelog_uri'] = 'https://github.com/thirunjuguna/natra'
+    spec.metadata['source_code_uri'] = 'https://github.com/jamesnjuguna0419/natra'
+    spec.metadata['changelog_uri'] = 'https://github.com/jamesnjuguna0419/natra/blob/master/CHANGELOG.md'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.executables = ['natra']
   spec.require_paths = ['lib']
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_runtime_dependency('activesupport', '~> 5.0')
-  spec.add_runtime_dependency('thor', '~> 0.18')
+  spec.add_dependency('activesupport', '>= 6.1', '< 9')
+  spec.add_dependency('thor', '~> 1.3')
 end

metadata

@@ -1,70 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: natra
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 2.0.0
 platform: ruby
 authors:
-- Thiru Njuguna
-autorequire: 
+- James Njuguna
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2026-10-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-description: Natra generate a light weight sinatra application.It's ideal for building
-  containerized micro-services with postgres database
+        version: '1.3'
+description: Natra generates lightweight Sinatra applications, ideal for containerized
+  API services with a PostgreSQL database.
 email:
-- thirunjuguna@outlook.com
+- jamesnjuguna0419@gmail.com
 executables:
 - natra
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -115,16 +110,18 @@ files:
 - lib/natra/generators/model/model.rb.erb
 - lib/natra/generators/model/model_generator.rb
 - lib/natra/generators/scaffold/scaffold_generator.rb
+- lib/natra/generators/service/service_generator.rb
+- lib/natra/generators/service/template/service.rb.erb
 - lib/natra/version.rb
 - natra.gemspec
-homepage: https://github.com/thirunjuguna/natra
+homepage: https://github.com/jamesnjuguna0419/natra
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/thirunjuguna/natra
-  source_code_uri: https://github.com/thirunjuguna/natra
-  changelog_uri: https://github.com/thirunjuguna/natra
-post_install_message: 
+  homepage_uri: https://github.com/jamesnjuguna0419/natra
+  source_code_uri: https://github.com/jamesnjuguna0419/natra
+  changelog_uri: https://github.com/jamesnjuguna0419/natra/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,16 +129,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
-summary: Natra generate a light weight sinatra application
+summary: Natra generates lightweight Sinatra applications
 test_files: []

data/.coveralls.yml

@@ -1,2 +0,0 @@
-service_name: travis-pro
-repo_token: 8OEMw8ExmIqo7cLyL2qAlvBuxZO1N9SjO

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.3