grape-starter 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ae705b1f75703766962ff10fa9a36b38cfb7c9b1673d55a37c192c638006e6
-  data.tar.gz: 8e3217a9aef0ad3aefeb45dd1441fa8b4888ce5598af2666931afa12eaf7ef4b
+  metadata.gz: 70eb1ef044b58a9637cb920fcc9129a12ca25392d5d160de75a6ee3ea9483052
+  data.tar.gz: c700ad85e12e2406b11a647d8584d3070d7e6e9c10742fba0909a8182264dff5
 SHA512:
-  metadata.gz: d5aa8965c7fda25e74a9900be97818e142ce3d4983607a7436ed3bca1141ec7a6042c746668125f15b1a421a37e7bfdc5bef8fcbe107fccd14a93e75cf59653e
-  data.tar.gz: a7474690efa21fd3236e1686a69f211e63d706cc88e8f07a09025b1c19d65942ba7d4e0c239b4c26e0a3f40541af0bc02ac683618c568c6e29969aea56de6710
+  metadata.gz: c46ea6564c067d4174c29d705482068b991589503928bb5de57f0cfb5b0034485d48a8f3dc7f4b52621110727d6b78f7d86544682ea2d9ebf36054ba00029da8
+  data.tar.gz: ba9e7eb94b6e5412baba003037927310686dae982b439fffb5241d800101c405999c4246ad22c44b175ba3d676c52af632c8f24eb6241cfacab42995e36297d0

data/bin/grape-starter

@@ -38,7 +38,7 @@ command :new do |c|
       starter_gem = Gem::Specification.find_by_name('grape-starter').gem_dir
       src = File.join(starter_gem, 'template', '.')
 
-      Starter::Builder.new!(args.first, src, dest, options)
+      Starter::Build.new!(args.first, src, dest, options)
       $stdout.puts "created: #{args.first}"
 
       # after creating tasks
@@ -71,7 +71,7 @@ command :add do |c|
 
     begin
       builder_options = global_options.merge(set: set).merge(options)
-      created_files = Starter::Builder.add!(resource, builder_options)
+      created_files = Starter::Build.add!(resource, builder_options)
 
       `bundle exec rubocop -a #{created_files.join(' ')}`
       $stdout.puts "added resource: #{resource}"
@@ -87,11 +87,11 @@ command :rm do |c|
   c.desc 'removes also entity file'
   c.switch [:e, :entity], negatable: false
 
-  c.action do |global_options, options, args|
+  c.action do |_global_options, options, args|
     exit_now! 'no resource given' if args.empty?
     resource = args.first
 
-    Starter::Builder.remove!(resource, options)
+    Starter::Build.remove!(resource, options)
 
     $stdout.puts "removed resource: #{resource}"
   end

data/grape-starter.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 6', '< 8'
   spec.add_dependency 'rubocop', '~> 1.24'
   spec.add_dependency 'awesome_print', '~> 1.9'
+  spec.add_dependency 'zeitwerk'
 end

data/lib/starter/{builder.rb → build.rb}

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Starter
-  require 'starter/builder/orms'
-  require 'starter/builder/names'
-  require 'starter/builder/base_file'
-  require 'starter/builder/file_foo'
-  require 'starter/builder/templates/files'
-  require 'starter/builder/templates/endpoints'
-
-  class Builder
-    extend Names
-    extend BaseFile
-    extend Templates::Files
-    extend Templates::Endpoints
+  # require 'starter/builder/orms'
+  # require 'starter/builder/names'
+  # require 'starter/builder/base_file'
+  # require 'starter/builder/file_foo'
+  # require 'starter/builder/templates/files'
+  # require 'starter/builder/templates/endpoints'
+
+  class Build
+    extend Builder::Names
+    extend Builder::BaseFile
+    extend Builder::Templates::Files
+    extend Builder::Templates::Endpoints
 
     class << self
       attr_reader :prefix, :resource, :set, :force, :entity, :destination, :orm
@@ -120,7 +120,7 @@ module Starter
       # creates a new file in lib folder as namespace, includind the version
       def add_namespace_with_version
         new_lib = File.join(destination, 'lib', base_file_name)
-        FileFoo.write_file(new_lib, base_namespace_file.strip_heredoc)
+        FileOps.write_file(new_lib, base_namespace_file.strip_heredoc)
       end
 
       #
@@ -128,7 +128,7 @@ module Starter
       def replace_static(file, replacement)
         file_path = File.join(destination, file)
 
-        FileFoo.call!(file_path) { |content| content.gsub!('{{{grape-starter}}}', replacement.to_s) }
+        FileOps.call!(file_path) { |content| content.gsub!('{{{grape-starter}}}', replacement.to_s) }
       end
 
       # #add! a new resource releated helper methods
@@ -159,7 +159,7 @@ module Starter
       def save_file(new_file)
         new_file_name = send("#{new_file}_name")
         should_raise?(new_file_name)
-        FileFoo.write_file(new_file_name, send(new_file.strip_heredoc))
+        FileOps.write_file(new_file_name, send(new_file.strip_heredoc))
       end
 
       #

data/lib/starter/builder/base_file.rb

@@ -1,45 +1,47 @@
 # frozen_string_literal: true
 
 module Starter
-  module BaseFile
-    # add it in api base
-    def add_mount_point
-      FileFoo.call!(api_base_file_name) { |content| add_to_base(content) }
-    end
-
-    # adding mount point to base class
-    def add_to_base(file)
-      occurence = file.scan(/(\s+mount\s.*?\n)/).last.first
-      replacement = occurence + mount_point
-      file.sub!(occurence, replacement)
-    end
-
-    # removes in api base
-    def remove_mount_point
-      FileFoo.call!(api_base_file_name) { |content| remove_from_base(content) }
-    end
-
-    # removes mount point from base class
-    def remove_from_base(file)
-      file.sub!(mount_point, '')
-    end
-
-    # parses out the prefix from base api file
-    def base_prefix
-      Starter::Config.read[:prefix]
-    end
-
-    # parses out the version from base api file
-    def base_version
-      base_file
-
-      base_file.scan(/version\s+(.+),/).first.first.delete!("'")
-    end
-
-    # get api base file as string
-    def base_file
-      file = File.join(Dir.getwd, 'api', 'base.rb')
-      FileFoo.read_file(file)
+  module Builder
+    module BaseFile
+      # add it in api base
+      def add_mount_point
+        FileOps.call!(api_base_file_name) { |content| add_to_base(content) }
+      end
+
+      # adding mount point to base class
+      def add_to_base(file)
+        occurence = file.scan(/(\s+mount\s.*?\n)/).last.first
+        replacement = occurence + mount_point
+        file.sub!(occurence, replacement)
+      end
+
+      # removes in api base
+      def remove_mount_point
+        FileOps.call!(api_base_file_name) { |content| remove_from_base(content) }
+      end
+
+      # removes mount point from base class
+      def remove_from_base(file)
+        file.sub!(mount_point, '')
+      end
+
+      # parses out the prefix from base api file
+      def base_prefix
+        Starter::Config.read[:prefix]
+      end
+
+      # parses out the version from base api file
+      def base_version
+        base_file
+
+        base_file.scan(/version\s+(.+),/).first.first.delete!("'")
+      end
+
+      # get api base file as string
+      def base_file
+        file = File.join(Dir.getwd, 'api', 'base.rb')
+        FileOps.read_file(file)
+      end
     end
   end
 end

data/lib/starter/builder/names.rb

@@ -1,80 +1,82 @@
 # frozen_string_literal: true
 
 module Starter
-  module Names
-    def klass_name
-      for_klass = prepare_klass
-      singular? ? for_klass.classify : for_klass.classify.pluralize
-    end
+  module Builder
+    module Names
+      def klass_name
+        for_klass = prepare_klass
+        singular? ? for_klass.classify : for_klass.classify.pluralize
+      end
 
-    def lib_klass_name
-      return klass_name unless @orm
+      def lib_klass_name
+        return klass_name unless @orm
 
-      case ::Starter::Config.read[:orm]
-      when 'sequel'
-        require 'starter/builder/templates/sequel'
-        extend(::Starter::Templates::Sequel)
-        "#{klass_name} < #{model_klass}"
-      when 'activerecord', 'ar'
-        require 'starter/builder/templates/activerecord'
-        extend(::Starter::Templates::ActiveRecord)
-        "#{klass_name} < #{model_klass}"
-      else
-        klass_name
+        case Starter::Config.read[:orm]
+        when 'sequel'
+          require 'starter/builder/templates/sequel'
+          extend(Starter::Builder::Templates::Sequel)
+          "#{klass_name} < #{model_klass}"
+        when 'activerecord', 'ar'
+          require 'starter/builder/templates/activerecord'
+          extend(Starter::Builder::Templates::ActiveRecord)
+          "#{klass_name} < #{model_klass}"
+        else
+          klass_name
+        end
       end
-    end
 
-    # rubocop:disable Style/StringConcatenation
-    def base_file_name
-      @resource.tr('/', '-').downcase + '.rb'
-    end
-    # rubocop:enable Style/StringConcatenation
+      # rubocop:disable Style/StringConcatenation
+      def base_file_name
+        @resource.tr('/', '-').downcase + '.rb'
+      end
+      # rubocop:enable Style/StringConcatenation
 
-    def base_spec_name
-      base_file_name.gsub(/.rb$/, '_spec.rb')
-    end
+      def base_spec_name
+        base_file_name.gsub(/.rb$/, '_spec.rb')
+      end
 
-    def mount_point
-      "    mount Endpoints::#{klass_name}\n"
-    end
+      def mount_point
+        "    mount Endpoints::#{klass_name}\n"
+      end
 
-    def api_base_file_name
-      File.join(Dir.getwd, 'api', 'base.rb')
-    end
+      def api_base_file_name
+        File.join(Dir.getwd, 'api', 'base.rb')
+      end
 
-    # resource file
-    def api_file_name
-      File.join(Dir.getwd, 'api', 'endpoints', base_file_name)
-    end
+      # resource file
+      def api_file_name
+        File.join(Dir.getwd, 'api', 'endpoints', base_file_name)
+      end
 
-    # resource file
-    def entity_file_name
-      File.join(Dir.getwd, 'api', 'entities', base_file_name)
-    end
+      # resource file
+      def entity_file_name
+        File.join(Dir.getwd, 'api', 'entities', base_file_name)
+      end
 
-    # lib file
-    def lib_file_name
-      File.join(Dir.getwd, 'lib', 'models', base_file_name)
-    end
+      # lib file
+      def lib_file_name
+        File.join(Dir.getwd, 'lib', 'models', base_file_name)
+      end
 
-    # resource spec
-    def api_spec_name
-      File.join(Dir.getwd, 'spec', 'requests', base_spec_name)
-    end
+      # resource spec
+      def api_spec_name
+        File.join(Dir.getwd, 'spec', 'requests', base_spec_name)
+      end
 
-    # lib spec
-    def lib_spec_name
-      File.join(Dir.getwd, 'spec', 'lib', 'models', base_spec_name)
-    end
+      # lib spec
+      def lib_spec_name
+        File.join(Dir.getwd, 'spec', 'lib', 'models', base_spec_name)
+      end
 
-    private
+      private
 
-    def prepare_klass
-      @resource.tr('-', '/')
-    end
+      def prepare_klass
+        @resource.tr('-', '/')
+      end
 
-    def singular?
-      @resource.singularize.inspect == @resource.inspect
+      def singular?
+        @resource.singularize.inspect == @resource.inspect
+      end
     end
   end
 end

data/lib/starter/builder/templates/activerecord.rb

@@ -3,102 +3,104 @@
 require 'active_record'
 
 module Starter
-  module Templates
-    module ActiveRecord
-      def model_klass
-        'ActiveRecord::Base'
-      end
+  module Builder
+    module Templates
+      module ActiveRecord
+        def model_klass
+          'ActiveRecord::Base'
+        end
 
-      def initializer
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
-
-        require 'yaml'
-        require 'erb'
-        require 'active_record'
-
-        config_content = File.read(File.join('config', 'database.yml'))
-
-        db_conf = YAML.safe_load(ERB.new(config_content).result)
-        env = ENV['RACK_ENV'] || 'development'
-
-        ActiveRecord::Base.establish_connection db_conf[env]
-        logger = if %w[development test].include? env
-                   log_dir = File.join(Dir.getwd, 'log')
-                   log_file = File.join(log_dir, 'db.log')
-                   FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
-                   Logger.new(File.open(log_file, 'a'))
-                 else
-                   Logger.new($stdout)
-                 end
-
-        ActiveRecord::Base.logger = logger
-
-        # Middleware
-        module ActiveRecord
-          module Rack
-            # ActiveRecord >= 5 removes the Pool management
-            class ConnectionManagement
-              def initialize(app)
-                @app = app
-              end
+        def initializer
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
+
+          require 'yaml'
+          require 'erb'
+          require 'active_record'
+
+          config_content = File.read(File.join('config', 'database.yml'))
+
+          db_conf = YAML.safe_load(ERB.new(config_content).result)
+          env = ENV['RACK_ENV'] || 'development'
+
+          ActiveRecord::Base.establish_connection db_conf[env]
+          logger = if %w[development test].include? env
+                    log_dir = File.join(Dir.getwd, 'log')
+                    log_file = File.join(log_dir, 'db.log')
+                    FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
+                    Logger.new(File.open(log_file, 'a'))
+                  else
+                    Logger.new($stdout)
+                  end
+
+          ActiveRecord::Base.logger = logger
+
+          # Middleware
+          module ActiveRecord
+            module Rack
+              # ActiveRecord >= 5 removes the Pool management
+              class ConnectionManagement
+                def initialize(app)
+                  @app = app
+                end
+
+                def call(env)
+                  response = @app.call(env)
+                  response[2] = ::Rack::BodyProxy.new(response[2]) do
+                    ActiveRecord::Base.clear_active_connections!
+                  end
 
-              def call(env)
-                response = @app.call(env)
-                response[2] = ::Rack::BodyProxy.new(response[2]) do
+                  return response
+                rescue StandardError
                   ActiveRecord::Base.clear_active_connections!
+                  raise
                 end
-
-                return response
-              rescue StandardError
-                ActiveRecord::Base.clear_active_connections!
-                raise
               end
             end
           end
+          FILE
         end
-        FILE
-      end
 
-      def rakefile
-        <<-FILE.strip_heredoc
-        # ActiveRecord migration tasks
-        require 'active_record'
-        include ActiveRecord::Tasks
-        config_dir = File.expand_path('../config', __FILE__)
-        config_content = File.join(config_dir, 'database.yml')
-        DatabaseTasks.env = ENV['RACK_ENV'] || 'development'
-        DatabaseTasks.database_configuration = YAML.load_file(config_content)
-        DatabaseTasks.db_dir = 'db'
-        DatabaseTasks.migrations_paths = File.join('db', 'migrate')
-
-        ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
-        ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
-
-        load 'active_record/railties/databases.rake'
-        FILE
-      end
+        def rakefile
+          <<-FILE.strip_heredoc
+          # ActiveRecord migration tasks
+          require 'active_record'
+          include ActiveRecord::Tasks
+          config_dir = File.expand_path('../config', __FILE__)
+          config_content = File.join(config_dir, 'database.yml')
+          DatabaseTasks.env = ENV['RACK_ENV'] || 'development'
+          DatabaseTasks.database_configuration = YAML.load_file(config_content)
+          DatabaseTasks.db_dir = 'db'
+          DatabaseTasks.migrations_paths = File.join('db', 'migrate')
+
+          ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
+          ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
+
+          load 'active_record/railties/databases.rake'
+          FILE
+        end
 
-      def gemfile
-        <<-FILE.strip_heredoc
-        # DB stuff
-        gem 'activerecord', '>= 6'
-        gem 'pg'
-        FILE
-      end
+        def gemfile
+          <<-FILE.strip_heredoc
+          # DB stuff
+          gem 'activerecord', '>= 6'
+          gem 'pg'
+          FILE
+        end
 
-      def migration(klass_name, resource)
-        version = "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}"
-        <<-FILE.strip_heredoc
-        class Create#{klass_name} < ActiveRecord::Migration[#{version}]
-          def change
-            create_table :#{resource} do |t|
+        def migration(klass_name, resource)
+          version = "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}"
+          <<-FILE.strip_heredoc
+          class Create#{klass_name} < ActiveRecord::Migration[#{version}]
+            def change
+              create_table :#{resource} do |t|
 
-              t.timestamps
+                t.timestamps
+              end
             end
           end
+          FILE
         end
-        FILE
       end
     end
   end

data/lib/starter/builder/templates/endpoints.rb

@@ -1,117 +1,119 @@
 # frozen_string_literal: true
 
 module Starter
-  module Templates
-    # defining the endpoints -> http methods of a resource
-    module Endpoints
-      def crud
-        %i[
-          post
-          get_all
-          get_specific
-          put_specific
-          patch_specific
-          delete_specific
-        ]
-      end
-
-      def singular_one
-        %i[
-          post
-          get_one
-          put_one
-          patch_one
-          delete_one
-        ]
-      end
-
-      # available API/HTTP methods
-      # POST
-      def post
-        "
-        desc 'create #{resource.singularize}' do
-          tags %w[#{resource.singularize}]
+  module Builder
+    module Templates
+      # defining the endpoints -> http methods of a resource
+      module Endpoints
+        def crud
+          %i[
+            post
+            get_all
+            get_specific
+            put_specific
+            patch_specific
+            delete_specific
+          ]
         end
-        params do
-          # TODO: specify the parameters
-        end
-        post do
-          # your code goes here
-        end"
-      end
 
-      # GET
-      def get_all
-        "
-        desc 'get all of #{resource.pluralize}' do
-          is_array true
-          tags %w[#{resource.singularize}]
+        def singular_one
+          %i[
+            post
+            get_one
+            put_one
+            patch_one
+            delete_one
+          ]
         end
-        get do
-          # your code goes here
-        end"
-      end
 
-      # rubocop:disable Style/CombinableLoops
-      %w[get put patch delete].each do |verb|
-        define_method(:"#{verb}_one") do
+        # available API/HTTP methods
+        # POST
+        def post
           "
-          desc '#{verb} #{resource.singularize}' do
+          desc 'create #{resource.singularize}' do
             tags %w[#{resource.singularize}]
           end
-          #{verb} do
+          params do
+            # TODO: specify the parameters
+          end
+          post do
             # your code goes here
           end"
         end
-      end
 
-      %w[get put patch delete].each do |verb|
-        define_method(:"#{verb}_specific") do
+        # GET
+        def get_all
           "
-          desc '#{verb} specific #{resource.singularize}' do
+          desc 'get all of #{resource.pluralize}' do
+            is_array true
             tags %w[#{resource.singularize}]
           end
-          params do
-            requires :id
-          end
-          #{verb} ':id' do
+          get do
             # your code goes here
           end"
         end
-      end
-      # rubocop:enable Style/CombinableLoops
 
-      # request specs shared examples
-      #
-      def post_spec
-        "it_behaves_like 'POST', params: {}"
-      end
+        # rubocop:disable Style/CombinableLoops
+        %w[get put patch delete].each do |verb|
+          define_method(:"#{verb}_one") do
+            "
+            desc '#{verb} #{resource.singularize}' do
+              tags %w[#{resource.singularize}]
+            end
+            #{verb} do
+              # your code goes here
+            end"
+          end
+        end
 
-      def get_all_spec
-        "it_behaves_like 'GET all'"
-      end
+        %w[get put patch delete].each do |verb|
+          define_method(:"#{verb}_specific") do
+            "
+            desc '#{verb} specific #{resource.singularize}' do
+              tags %w[#{resource.singularize}]
+            end
+            params do
+              requires :id
+            end
+            #{verb} ':id' do
+              # your code goes here
+            end"
+          end
+        end
+        # rubocop:enable Style/CombinableLoops
 
-      %w[get delete].each do |verb|
-        define_method(:"#{verb}_one_spec") do
-          "it_behaves_like '#{verb.upcase} one'"
+        # request specs shared examples
+        #
+        def post_spec
+          "it_behaves_like 'POST', params: {}"
         end
-      end
 
-      %w[put patch].each do |verb|
-        define_method(:"#{verb}_one_spec") do
-          "it_behaves_like '#{verb.upcase} one', params: {}"
+        def get_all_spec
+          "it_behaves_like 'GET all'"
         end
-      end
 
-      %w[get delete].each do |verb|
-        define_method(:"#{verb}_specific_spec") do
-          "it_behaves_like '#{verb.upcase} specific', key: 1"
+        %w[get delete].each do |verb|
+          define_method(:"#{verb}_one_spec") do
+            "it_behaves_like '#{verb.upcase} one'"
+          end
         end
-      end
 
-      %w[put patch].each do |verb|
-        define_method(:"#{verb}_specific_spec") do
-          "it_behaves_like '#{verb.upcase} specific', key: 1, params: {}"
+        %w[put patch].each do |verb|
+          define_method(:"#{verb}_one_spec") do
+            "it_behaves_like '#{verb.upcase} one', params: {}"
+          end
+        end
+
+        %w[get delete].each do |verb|
+          define_method(:"#{verb}_specific_spec") do
+            "it_behaves_like '#{verb.upcase} specific', key: 1"
+          end
+        end
+
+        %w[put patch].each do |verb|
+          define_method(:"#{verb}_specific_spec") do
+            "it_behaves_like '#{verb.upcase} specific', key: 1, params: {}"
+          end
         end
       end
     end

data/lib/starter/builder/templates/files.rb

@@ -1,83 +1,85 @@
 # frozen_string_literal: true
 
 module Starter
-  module Templates
-    module Files
-      # API template for resource
-      def api_file
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+  module Builder
+    module Templates
+      module Files
+        # API template for resource
+        def api_file
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        module Api
-          module Endpoints
-            class #{klass_name} < Grape::API
-              namespace :#{resource.downcase} do
-                #{endpoints}
+          module Api
+            module Endpoints
+              class #{klass_name} < Grape::API
+                namespace :#{resource.downcase} do
+                  #{endpoints}
+                end
               end
             end
           end
+          FILE
         end
-        FILE
-      end
 
-      def entity_file
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+        def entity_file
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        module Api
-          module Entities
-            class #{klass_name} < Grape::Entity
+          module Api
+            module Entities
+              class #{klass_name} < Grape::Entity
+              end
             end
           end
+          FILE
         end
-        FILE
-      end
 
-      # LIB template for resource
-      def base_namespace_file
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+        # LIB template for resource
+        def base_namespace_file
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        module #{klass_name}
-          VERSION  = '0.1.0'
+          module #{klass_name}
+            VERSION  = '0.1.0'
+          end
+          FILE
         end
-        FILE
-      end
 
-      def lib_file
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+        def lib_file
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        module Models
-          class #{lib_klass_name}
+          module Models
+            class #{lib_klass_name}
+            end
           end
+          FILE
         end
-        FILE
-      end
 
-      def api_spec
-        prefix = base_prefix ? "/#{base_prefix}" : ''
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+        def api_spec
+          prefix = base_prefix ? "/#{base_prefix}" : ''
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        require 'spec_helper'
+          require 'spec_helper'
 
-        RSpec.describe '#{prefix}/#{base_version}/#{resource.downcase}' do
-          #{endpoint_specs}
+          RSpec.describe '#{prefix}/#{base_version}/#{resource.downcase}' do
+            #{endpoint_specs}
+          end
+          FILE
         end
-        FILE
-      end
 
-      def lib_spec
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+        def lib_spec
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        require 'spec_helper'
+          require 'spec_helper'
 
-        RSpec.describe Models::#{klass_name} do
-          pending 'write specs'
+          RSpec.describe Models::#{klass_name} do
+            pending 'write specs'
+          end
+          FILE
         end
-        FILE
       end
     end
   end

data/lib/starter/builder/templates/sequel.rb

@@ -1,105 +1,107 @@
 # frozen_string_literal: true
 
 module Starter
-  module Templates
-    module Sequel
-      def model_klass
-        'Sequel::Model'
-      end
+  module Builder
+    module Templates
+      module Sequel
+        def model_klass
+          'Sequel::Model'
+        end
 
-      def initializer
-        <<-FILE.strip_heredoc
-        # frozen_string_literal: true
+        def initializer
+          <<-FILE.strip_heredoc
+          # frozen_string_literal: true
 
-        require 'yaml'
+          require 'yaml'
 
-        # load Sequel Configuration
-        settings = YAML.load_file('config/database.yml')
-        DB = Sequel.connect(settings[ENV['RACK_ENV']])
+          # load Sequel Configuration
+          settings = YAML.load_file('config/database.yml')
+          DB = Sequel.connect(settings[ENV['RACK_ENV']])
 
-        env = ENV['RACK_ENV'] || 'development'
+          env = ENV['RACK_ENV'] || 'development'
 
-        logger = if %w[development test].include? env
-                   log_dir = File.join(Dir.getwd, 'log')
-                   log_file = File.join(log_dir, 'db.log')
-                   FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
-                   Logger.new(File.open(log_file, 'a'))
-                 else
-                   Logger.new($stdout)
-                 end
+          logger = if %w[development test].include? env
+                    log_dir = File.join(Dir.getwd, 'log')
+                    log_file = File.join(log_dir, 'db.log')
+                    FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
+                    Logger.new(File.open(log_file, 'a'))
+                  else
+                    Logger.new($stdout)
+                  end
 
-        DB.loggers << logger
+          DB.loggers << logger
 
-        # FIXME: maybe remove it later …
-        #   see: https://groups.google.com/forum/#!topic/sequel-talk/QIIv5qoltjs
-        Sequel::Model.require_valid_table = false
-        Sequel::Model.plugin :force_encoding, 'UTF-8'
-        FILE
-      end
+          # FIXME: maybe remove it later …
+          #   see: https://groups.google.com/forum/#!topic/sequel-talk/QIIv5qoltjs
+          Sequel::Model.require_valid_table = false
+          Sequel::Model.plugin :force_encoding, 'UTF-8'
+          FILE
+        end
 
-      def rakefile
-        <<-FILE.strip_heredoc
-        # Sequel migration tasks
-        namespace :db do
-          Sequel.extension(:migration)
+        def rakefile
+          <<-FILE.strip_heredoc
+          # Sequel migration tasks
+          namespace :db do
+            Sequel.extension(:migration)
 
-          desc "Prints current schema version"
-          task version: :connect do
-            version = DB.tables.include?(:schema_info) ? DB[:schema_info].first[:version] : 0
+            desc "Prints current schema version"
+            task version: :connect do
+              version = DB.tables.include?(:schema_info) ? DB[:schema_info].first[:version] : 0
 
-            $stdout.print 'Schema Version: '
-            $stdout.puts version
-          end
+              $stdout.print 'Schema Version: '
+              $stdout.puts version
+            end
 
-          desc 'Run all migrations in db/migrations'
-          task migrate: :connect do
-            Sequel::Migrator.apply(DB, 'db/migrations')
-            Rake::Task['db:version'].execute
-          end
+            desc 'Run all migrations in db/migrations'
+            task migrate: :connect do
+              Sequel::Migrator.apply(DB, 'db/migrations')
+              Rake::Task['db:version'].execute
+            end
 
-          desc "Perform rollback to specified target or full rollback as default"
-          task :rollback, [:target] => :connect do |t, args|
-            args.with_defaults(:target => 0)
+            desc "Perform rollback to specified target or full rollback as default"
+            task :rollback, [:target] => :connect do |t, args|
+              args.with_defaults(:target => 0)
 
-            Sequel::Migrator.run(DB, 'db/migrations', :target => args[:target].to_i)
-            Rake::Task['db:version'].execute
-          end
+              Sequel::Migrator.run(DB, 'db/migrations', :target => args[:target].to_i)
+              Rake::Task['db:version'].execute
+            end
 
-          desc "Perform migration reset (full rollback and migration)"
-          task reset: :connect do
-            Sequel::Migrator.run(DB, 'db/migrations', target: 0)
-            Sequel::Migrator.run(DB, 'db/migrations')
-            Rake::Task['db:version'].execute
-          end
+            desc "Perform migration reset (full rollback and migration)"
+            task reset: :connect do
+              Sequel::Migrator.run(DB, 'db/migrations', target: 0)
+              Sequel::Migrator.run(DB, 'db/migrations')
+              Rake::Task['db:version'].execute
+            end
 
-          task connect: :environment do
-            require './config/initializers/database'
+            task connect: :environment do
+              require './config/initializers/database'
+            end
           end
+          FILE
         end
-        FILE
-      end
 
-      def gemfile
-        <<-FILE.strip_heredoc
-        # DB stack
-        gem 'sequel'
-        gem 'pg'
-        FILE
-      end
+        def gemfile
+          <<-FILE.strip_heredoc
+          # DB stack
+          gem 'sequel'
+          gem 'pg'
+          FILE
+        end
 
-      def migration(_klass_name, resource)
-        <<-FILE.strip_heredoc
-        Sequel.migration do
-          change do
-            create_table :#{resource} do
-              primary_key :id
+        def migration(_klass_name, resource)
+          <<-FILE.strip_heredoc
+          Sequel.migration do
+            change do
+              create_table :#{resource} do
+                primary_key :id
 
-              DateTime :created_at
-              DateTime :updated_at
+                DateTime :created_at
+                DateTime :updated_at
+              end
             end
           end
+          FILE
         end
-        FILE
       end
     end
   end

data/lib/starter/{builder/file_foo.rb → file_ops.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Starter
-  class FileFoo
+  class FileOps
     class << self
       # general file stuff
       #

data/lib/starter/{builder/orms.rb → orms.rb}

@@ -61,7 +61,7 @@ module Starter
 
         file_name = "#{Time.now.strftime('%Y%m%d%H%m%S')}_create_#{klass_name.downcase}.rb"
         migration_dest = File.join(Dir.pwd, 'db', 'migrate', file_name)
-        FileFoo.write_file(migration_dest, migration(klass_name, resource))
+        FileOps.write_file(migration_dest, migration(klass_name, resource))
       end
 
       def load_orm(orm: ::Starter::Config.read[:orm])
@@ -70,10 +70,10 @@ module Starter
         case @orm
         when 'sequel'
           require 'starter/builder/templates/sequel'
-          extend(::Starter::Templates::Sequel)
+          extend(Starter::Builder::Templates::Sequel)
         when 'activerecord', 'ar'
           require 'starter/builder/templates/activerecord'
-          extend(::Starter::Templates::ActiveRecord)
+          extend(Starter::Builder::Templates::ActiveRecord)
         else
           @orm = nil
         end
@@ -87,26 +87,26 @@ module Starter
 
       def build_initializer(dest)
         FileUtils.mkdir_p(dest)
-        FileFoo.write_file(File.join(dest, 'database.rb'), initializer)
+        FileOps.write_file(File.join(dest, 'database.rb'), initializer)
       end
 
       def build_config(dest)
-        FileFoo.write_file(File.join(dest, 'database.yml'), config)
+        FileOps.write_file(File.join(dest, 'database.yml'), config)
       end
 
       def build_standalone_migrations(dest)
-        FileFoo.write_file(dest, standalone_migrations)
+        FileOps.write_file(dest, standalone_migrations)
       end
 
       # adds a middleware to config.ru
       def add_middleware(dest, middleware)
         replacement = "use #{middleware}\n\n\\1"
-        FileFoo.call!(File.join(dest, 'config.ru')) { |content| content.sub!(/^(run.+)$/, replacement) }
+        FileOps.call!(File.join(dest, 'config.ru')) { |content| content.sub!(/^(run.+)$/, replacement) }
       end
 
       def append_to_file(file_name, content)
-        original = FileFoo.read_file(file_name)
-        FileFoo.write_file(file_name, "#{original}\n\n#{content}")
+        original = FileOps.read_file(file_name)
+        FileOps.write_file(file_name, "#{original}\n\n#{content}")
       end
 
       def prepare_for_migrations(dest)

data/lib/starter/rake/grape_tasks.rb

@@ -6,8 +6,6 @@ require 'rack/test'
 
 module Starter
   module Rake
-    require 'starter/builder'
-
     class GrapeTasks < ::Rake::TaskLib
       include Rack::Test::Methods
 

data/lib/starter/rspec/request_specs.rb

@@ -45,7 +45,7 @@ RSpec.shared_examples 'DELETE one' do
   let(:route) { route_from_description }
 
   subject { delete route }
-  specify { expect(subject.status).to eql 200 }
+  specify { expect(subject.status).to eql 204 }
 end
 
 # plural forms
@@ -75,5 +75,5 @@ RSpec.shared_examples 'DELETE specific' do |key: nil|
   let(:specific_route) { "#{route_from_description}/#{key}" }
 
   subject { delete specific_route }
-  specify { expect(subject.status).to eql 200 }
+  specify { expect(subject.status).to eql 204 }
 end

data/lib/starter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Starter
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 end

data/lib/starter.rb

@@ -5,9 +5,13 @@ require 'awesome_print'
 require 'active_support'
 require 'active_support/core_ext/string'
 
-require 'starter/version'
-require 'starter/builder'
-require 'starter/config'
+# require 'starter/version'
+# require 'starter/builder'
+# require 'starter/config'
+
+require 'zeitwerk'
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 module Starter
   autoload :Rake, 'starter/rake/grape_tasks'

data/template/Dockerfile

@@ -13,4 +13,4 @@ RUN bundle install
 
 COPY . .
 
-CMD bundle exec thin start -p 9292 -e production --tag API-dummy --threaded
+CMD bundle exec puma --tag API-dummy

data/template/Gemfile

@@ -3,7 +3,7 @@
 source 'http://rubygems.org'
 
 # Server stuff
-gem 'thin'
+gem 'puma'
 
 gem 'rack'
 gem 'rack-cors'

data/template/config/puma.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+workers ENV.fetch('WEB_CONCURRENCY', 0)
+min_threads_count = ENV.fetch('MIN_THREADS', 1)
+max_threads_count = ENV.fetch('MAX_THREADS', 8)
+threads min_threads_count, max_threads_count
+
+port ENV.fetch('PORT', 9292)
+
+environment ENV.fetch('RACK_ENV', 'development')

data/template/script/server

@@ -7,16 +7,4 @@ cd "$(dirname "$0")/.."
 test -z "$RACK_ENV" &&
   RACK_ENV='development'
 
-if [ $1 ]; then
-  PORT=$1
-else
-  PORT=9292
-fi
-
-export PORT=$PORT
-
-if [ "$RACK_ENV" = 'production' ]; then
-  bundle exec thin start -p $PORT -e $RACK_ENV --tag {{{grape-starter}}} -d --threaded
-else
-  bundle exec thin start -p $PORT -e $RACK_ENV --tag {{{grape-starter}}} -D
-fi
+bundle exec puma --tag API-Baz

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - LeFnord
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CLI to create a API skeleton based on Grape and Rack
 email:
 - pscholz.le@gmail.com
@@ -96,16 +110,16 @@ files:
 - doc/re-doc.png
 - grape-starter.gemspec
 - lib/starter.rb
-- lib/starter/builder.rb
+- lib/starter/build.rb
 - lib/starter/builder/base_file.rb
-- lib/starter/builder/file_foo.rb
 - lib/starter/builder/names.rb
-- lib/starter/builder/orms.rb
 - lib/starter/builder/templates/activerecord.rb
 - lib/starter/builder/templates/endpoints.rb
 - lib/starter/builder/templates/files.rb
 - lib/starter/builder/templates/sequel.rb
 - lib/starter/config.rb
+- lib/starter/file_ops.rb
+- lib/starter/orms.rb
 - lib/starter/rake/grape_tasks.rb
 - lib/starter/rspec/request_specs.rb
 - lib/starter/version.rb
@@ -125,13 +139,13 @@ files:
 - template/config/boot.rb
 - template/config/environment.rb
 - template/config/initializers/.keep
+- template/config/puma.rb
 - template/lib/models.rb
 - template/lib/models/version.rb
 - template/public/.keep
 - template/script/console
 - template/script/server
 - template/script/setup
-- template/script/stop
 - template/script/test
 - template/script/update
 - template/spec/lib/models/.keep

data/template/script/stop

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-cd "$(dirname "$0")/.."
-
-# use only, if server was started in production mode
-thin stop