roda-project 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31e88696427968c61a574f01c1860abcede888273244d75d258bacc35da4935
-  data.tar.gz: b24dc4b5f0ad6a8e9acc24dd192e927c6c6251dd3d163088daf862e941d52e71
+  metadata.gz: ba772c511bc001bfa35bf4345638652b7291dd2e144003922fa85880e7dc03f3
+  data.tar.gz: be9c85ed58652607a5614d7f37d0878085f7834f257cd2053d766d067fd71a44
 SHA512:
-  metadata.gz: 0fdf4cc809987b8b6167e06499989a9d101f39923aba2d7493fcc479609d141b9dd24229f33bae3fd897604ab92f812179ae7c13be7148579d1ba822b3691c14
-  data.tar.gz: 6206ac4f835a181f839277576bb52b572b25a2b163e2a9403819c8b0d4ff5a0ce913871083328a9c01f4c8f146938fa42f733f7a94a5f7130f448689675f8b75
+  metadata.gz: 63ef03a38f04ae88bda73eb7d890c3d80fda95521695a4e7ad6f19bd30a84630bff9f4daa4b7a8d08818fe77a235241bcb60f48e58e060646b2cd8c3dad62fd0
+  data.tar.gz: 9737a1545992102d0e82c5563cc0a29ae6c0c15d6b24bf07f16f493f5421b043b77be2b15ca2894157358f89b077e9cc9e7f42f84ed114fb9e59d8da0c92be38

data/lib/roda/project/bin/generators/migration/action_detector.rb

@@ -19,18 +19,18 @@ class Roda
               camel_name = camelize(name)
 
               if (m = camel_name.match(/^CreateJoinTable(?<t1>[A-Z][a-zA-Z0-9]*?)(?<t2>[A-Z][a-zA-Z0-9]*)$/)) ||
-                 (m = camel_name.match(/JoinTable(?<t1>[A-Z][a-zA-Z0-9]*?)(?<t2>[A-Z][a-zA-Z0-9]*)$/)) ||
-                 camel_name.start_with?("CreateJoinTable") || camel_name.include?("JoinTable")
+                  (m = camel_name.match(/JoinTable(?<t1>[A-Z][a-zA-Z0-9]*?)(?<t2>[A-Z][a-zA-Z0-9]*)$/)) ||
+                  camel_name.start_with?("CreateJoinTable") || camel_name.include?("JoinTable")
                 tables = parse_join_tables(m)
-                { action: :create_join_table, tables: tables }
+                {action: :create_join_table, tables: tables}
               elsif (m = camel_name.match(/^Create(?<table_name>[A-Z0-9].*)$/))
-                { action: :create_table, table_name: pluralize(underscore(m[:table_name])) }
+                {action: :create_table, table_name: pluralize(underscore(m[:table_name]))}
               elsif (m = camel_name.match(/^Add.+To(?<table_name>[A-Z0-9].*)$/))
-                { action: :add_columns, table_name: pluralize(underscore(m[:table_name])) }
+                {action: :add_columns, table_name: pluralize(underscore(m[:table_name]))}
               elsif (m = camel_name.match(/^Remove.+From(?<table_name>[A-Z0-9].*)$/))
-                { action: :drop_columns, table_name: pluralize(underscore(m[:table_name])) }
+                {action: :drop_columns, table_name: pluralize(underscore(m[:table_name]))}
               else
-                { action: :generic, table_name: nil }
+                {action: :generic, table_name: nil}
               end
             end
 

data/lib/roda/project/bin/generators/migration/code_builder.rb

@@ -166,13 +166,13 @@ class Roda
 
               formatted = opts.map do |k, v|
                 val_str = case v
-                          when Array
-                            "[#{v.join(', ')}]"
-                          when Symbol
-                            ":#{v}"
-                          else
-                            v.inspect
-                          end
+                when Array
+                  "[#{v.join(", ")}]"
+                when Symbol
+                  ":#{v}"
+                else
+                  v.inspect
+                end
                 "#{k}: #{val_str}"
               end.join(", ")
 

data/lib/roda/project/bin/generators/migration/field_parser.rb

@@ -6,6 +6,8 @@ class Roda
       class Generators
         class Migration
           class FieldParser
+            include Roda::Project::Helpers::Inflections
+
             TYPE_MAP = {
               "string" => "String",
               "text" => "String",
@@ -80,7 +82,7 @@ class Roda
                     if modifier.include?(".")
                       prec, scale = modifier.split(".").map(&:to_i)
                       options[:size] = [prec, scale]
-                    elsif modifier =~ /^\d+$/
+                    elsif /^\d+$/.match?(modifier)
                       options[:size] = modifier.to_i
                     end
                   end
@@ -119,30 +121,6 @@ class Roda
                 false
               end
             end
-
-            def singularize(str)
-              if str.end_with?("ies")
-                "#{str[0..-4]}y"
-              elsif str.end_with?("es") && !str.end_with?("ques")
-                str[0..-3]
-              elsif str.end_with?("s") && !str.end_with?("ss")
-                str[0..-2]
-              else
-                str
-              end
-            end
-
-            def pluralize(str)
-              return str if str.end_with?("s")
-
-              if str.end_with?("y") && !str.end_with?("ay", "ey", "oy", "uy")
-                "#{str[0..-2]}ies"
-              elsif str.end_with?("s", "x", "z", "ch", "sh")
-                "#{str}es"
-              else
-                "#{str}s"
-              end
-            end
           end
         end
       end

data/lib/roda/project/bin/generators/migration.rb

@@ -11,6 +11,7 @@ class Roda
               exit 1
             end
 
+            puts "* creating migration"
             FileUtils.mkdir_p(migrations_path) unless File.directory?(migrations_path)
 
             existing_migrations = Dir.glob(File.join(migrations_path, "*.rb"))
@@ -27,7 +28,8 @@ class Roda
             content = CodeBuilder.new(detection: detection, fields: fields).build
 
             File.write(filename, content)
-            puts "* created migration: #{filename}"
+
+            action_success_message(filename)
           end
 
           def migrations_path
@@ -39,16 +41,16 @@ class Roda
           end
 
           def field_args
-            @field_args ||= (@args[1..] || [])
+            @field_args ||= @args[1..] || []
           end
 
           private
 
           def underscore(str)
             str.to_s.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-               .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-               .tr("-", "_")
-               .downcase
+              .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+              .tr("-", "_")
+              .downcase
           end
         end
       end

data/lib/roda/project/bin/generators/model.rb

@@ -0,0 +1,119 @@
+class Roda
+  module Project
+    module Bin
+      class Generators < ::Thor
+        class Model < Roda::Project::Bin::Generator
+          include Roda::Project::Helpers::Inflections
+
+          def call
+            if model_name.nil? || field_args == []
+              puts "Usage: bin/roda g model name field1 field2"
+              exit 1
+            end
+
+            puts "* creating model"
+            create_model
+            create_model_test
+            Migration.new(args: [migration_name].concat(field_args)).call
+          end
+
+          def create_model_test
+            ensure_and_get_path("spec/app/models", model_relative_path)
+            filename = File.join("spec/app/models", *name_segments[0..-2], "#{model_file_basename}_spec.rb")
+            File.write(filename, spec_code)
+
+            action_success_message(filename)
+          end
+
+          def create_model
+            ensure_and_get_path("app/models", model_relative_path)
+            filename = File.join("app/models", *name_segments[0..-2], "#{model_file_basename}.rb")
+            File.write(filename, code)
+
+            action_success_message(filename)
+          end
+
+          def spec_code
+            depth = 2 + name_segments.length - 1
+            relative_prefix = "../" * depth
+            <<~RUBY
+              require_relative "#{relative_prefix}spec_helper"
+
+              describe #{qualified_class_name} do
+              end
+            RUBY
+          end
+
+          def code
+            if name_segments.length == 1
+              <<~RUBY
+                class #{qualified_class_name}
+                end
+              RUBY
+            else
+              depth = name_segments.length - 1
+              class_indent = "  " * depth
+              lines = [
+                "#{class_indent}class #{camelize(name_segments.last)} < Sequel::Model(:#{table_name})",
+                "#{class_indent}end"
+              ]
+
+              name_segments[0..-2].map { |s| camelize(s) }.reverse.each_with_index do |mod, idx|
+                mod_indent = "  " * (depth - 1 - idx)
+                lines = ["#{mod_indent}class #{mod}"] + lines + ["#{mod_indent}end"]
+              end
+
+              lines.join("\n") + "\n"
+            end
+          end
+
+          def migration_name
+            segs = name_segments.map { |s| camelize(s) }
+            segs[-1] = pluralize(segs[-1])
+            "Create" + segs.join("_")
+          end
+
+          def name_segments
+            @name_segments ||= @args[0].to_s.split("/")
+          end
+
+          def qualified_class_name
+            @qualified_class_name ||= name_segments.map { |s| camelize(s) }.join("::")
+          end
+
+          def flat_class_name
+            @flat_class_name ||= name_segments.map { |s| camelize(s) }.join
+          end
+
+          def table_name
+            @table_name ||= begin
+              segs = name_segments.map { |s| underscore(camelize(s)) }
+              segs[-1] = pluralize(segs[-1])
+              segs.join("_")
+            end
+          end
+
+          def model_relative_path
+            @model_relative_path ||= if name_segments.length > 1
+              File.join(*name_segments[0..-2], model_file_basename)
+            else
+              model_file_basename
+            end
+          end
+
+          def model_file_basename
+            @model_file_basename ||= underscore(name_segments.last)
+          end
+
+          def model_name
+            @model_name ||= @args[0].nil? ? nil : qualified_class_name
+          end
+
+          def field_args
+            @field_args ||= @args[1..] || []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/roda/project/bin/generators/routes.rb

@@ -10,6 +10,7 @@ class Roda
               exit 1
             end
 
+            puts "* creating routes"
             generate_routes
             generate_views
             generate_tests
@@ -19,11 +20,18 @@ class Roda
           private
 
           def generate_routes
-            filename = File.join(ensure_and_get_path("app/routes"), "#{branch_name}.rb")
+            filename = File.join(ensure_and_get_path("app/routes", branch_name), "#{branch_name}.rb")
             route_definitions = routes_list.map do |route_str|
               method, name = parse_route_string(route_str)
-              view_line = (method == "get" && must_generate_views?) ? "\n      view('#{name}')" : ""
-              "    r.#{method} \"#{name}\" do#{view_line}\n    end"
+              view_name = name
+              view_name = "index" if view_name == ""
+              view_line = (method == "get" && must_generate_views?) ? "\n      view('#{view_name}')" : ""
+
+              if name != ""
+                "    r.#{method} \"#{name}\" do#{view_line}\n    end"
+              else
+                "    r.#{method} do#{view_line}\n    end"
+              end
             end.join("\n\n")
 
             hash_branch_header = if branch_name.include?("/")
@@ -44,7 +52,7 @@ class Roda
       end
             RUBY
             File.write(filename, content)
-            puts "* created routes file: #{filename}"
+            action_success_message(filename)
           end
 
           def generate_views
@@ -54,25 +62,34 @@ class Roda
               routes_list.each do |route_str|
                 method, name = parse_route_string(route_str)
                 if method == "get"
+                  name = "index" if name == ""
                   view_filename = File.join(branch_views_dir, "#{name}.erb")
                   File.write(view_filename, "")
-                  puts "* created view file: #{view_filename}"
+                  action_success_message(view_filename)
                 end
               end
             end
           end
 
           def generate_tests
-            test_filename = File.join(ensure_and_get_path("spec/app/routes"), "#{branch_name}_spec.rb")
+            test_filename = File.join(ensure_and_get_path("spec/app/routes", branch_name), "#{branch_name}_spec.rb")
             nesting_level = branch_name.count("/")
             relative_spec_helper_path = "../" * (2 + nesting_level) + "spec_helper"
 
             test_route_definitions = routes_list.map do |route_str|
               method, name = parse_route_string(route_str)
-              "  it \"responds to #{method.upcase} /#{branch_name}/#{name}\" do\n" \
-                "    #{method} \"/#{branch_name}/#{name}\"\n" \
-                "    expect(last_response.status).to eq(200)\n" \
-                "  end"
+
+              if name != ""
+                "  it \"responds to #{method.upcase} /#{branch_name}/#{name}\" do\n" \
+                  "    #{method} \"/#{branch_name}/#{name}\"\n" \
+                  "    expect(last_response.status).to eq(200)\n" \
+                  "  end"
+              else
+                "  it \"responds to #{method.upcase} /#{branch_name} do\n" \
+                  "    #{method} \"/#{branch_name}\n" \
+                  "    expect(last_response.status).to eq(200)\n" \
+                  "  end"
+              end
             end.join("\n")
 
             test_content = <<~RUBY
@@ -83,7 +100,7 @@ class Roda
       end
             RUBY
             File.write(test_filename, test_content)
-            puts "* created test file: #{test_filename}"
+            action_success_message(test_filename)
           end
 
           def must_generate_views?
@@ -96,13 +113,6 @@ class Roda
             [method, name]
           end
 
-          def ensure_and_get_path(path)
-            full_path_dir = File.join(path, File.dirname(branch_name))
-            FileUtils.mkdir_p(full_path_dir) unless File.directory?(full_path_dir)
-
-            path
-          end
-
           def routes_list
             @routes_list ||= @args[1..]
           end

data/lib/roda/project/bin/generators.rb

@@ -15,6 +15,11 @@ class Roda
           Routes.new(context:, args:, options:).call
         end
 
+        desc "model", "Create model and migrations"
+        def model(*args)
+          Model.new(context:, args:, options:).call
+        end
+
         private
 
         def context

data/lib/roda/project/cli.rb

@@ -10,8 +10,8 @@ class Roda
         puts pastel.italic("#{Roda::Project.messages.sample.first}\n")
 
         get_user_context
-
         puts pastel.bright_black("\n[project: #{@context.project_name}]\n")
+        return JeremyTemplateCreator.new(context: @context).call if jeremy?
 
         create_base_project
         add_front_end
@@ -44,6 +44,8 @@ class Roda
 
       def get_user_context
         retry_on_error { @context.project_name = read_line("Project name › ", "project") }
+        return if jeremy?
+
         retry_on_error { @context.base = read_line("(#{fullstack_id}) Fullstack (#{api_id}) API (#{minimal_id}) Minimal › ", fullstack_id).to_i }
         retry_on_error { @context.tests = read_line("(#{rspec_id}) RSpec (#{minitest_id}) Minitest › ", rspec_id).to_i }
 
@@ -63,6 +65,10 @@ class Roda
         end
       end
 
+      def jeremy?
+        @jeremy ||= ARGV[0] == "--jeremy"
+      end
+
       def create_base_project
         puts "* creating base project"
         if @context.minimal?
@@ -97,8 +103,11 @@ class Roda
           erb_cp_file("front-end", "esbuild.js")
           erb_cp_file("front-end", "package.json")
           cp_dir("front-end", "app/views")
+          action_success_message("app/views")
           cp_dir("front-end", "public/assets")
+          action_success_message("public/assets")
           cp_dir("front-end", "public/images")
+          action_success_message("public/images")
         end
       end
 
@@ -118,6 +127,7 @@ class Roda
           erb_cp_file("rodauth", "db/migrations/001_add_rodauth.rb")
           if @context.fullstack?
             cp_file("rodauth", "app/views/create-account.erb")
+            action_success_message("app/views/create-account.erb")
           end
         end
       end

data/lib/roda/project/generator.rb

@@ -4,16 +4,25 @@ class Roda
       include Helpers::Template
       include Helpers::Ids
 
-      def initialize(context: MainContext.new, args: [], options: {}, dir: nil)
+      attr_reader :pastel
+
+      def initialize(context: MainContext.new, args: [], options: {}, dir: nil, pastel: Pastel.new)
         @context = context
         @args = args
         @options = options
         @dir = dir
+        @pastel = pastel
       end
 
       def call
         false
       end
+
+      protected
+
+      def action_success_message(path, action = "create")
+        puts(pastel.green("      #{action}  ") + path)
+      end
     end
   end
 end

data/lib/roda/project/helpers/inflections.rb

@@ -7,16 +7,16 @@ class Roda
         module_function
 
         def camelize(str)
-          return str if str =~ /[A-Z]/
+          return str if /[A-Z]/.match?(str)
 
           str.split("_").map(&:capitalize).join
         end
 
         def underscore(str)
           str.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-             .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-             .tr("-", "_")
-             .downcase
+            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+            .tr("-", "_")
+            .downcase
         end
 
         def pluralize(str)
@@ -42,6 +42,14 @@ class Roda
             str
           end
         end
+
+        def singular?(str)
+          str == singularize(str)
+        end
+
+        def plural?(str)
+          str == pluralize(str)
+        end
       end
     end
   end

data/lib/roda/project/helpers/interactive_input.rb

@@ -22,10 +22,6 @@ class Roda
 
           yield
         end
-
-        def pastel
-          @pastel ||= Pastel.new
-        end
       end
     end
   end

data/lib/roda/project/helpers/template.rb

@@ -34,6 +34,13 @@ class Roda
           )
         end
 
+        def ensure_and_get_path(path, name)
+          full_path_dir = File.join(path, File.dirname(name))
+          FileUtils.mkdir_p(full_path_dir) unless File.directory?(full_path_dir)
+
+          path
+        end
+
         def templates_root
           @templates_root ||= "../templates"
         end

data/lib/roda/project/jeremy_template_creator.rb

@@ -0,0 +1,33 @@
+require 'fileutils'
+
+class Roda
+  module Project
+    class JeremyTemplateCreator < Generator
+      include Helpers::Inflections
+
+      def call
+        repo_url = "https://github.com/jeremyevans/roda-sequel-stack"
+        puts "* Downloading template with git...\n\n"
+
+        success = system("git clone --depth 1 #{repo_url} #{@context.project_name}")
+        abort("\nCould not download the template.") unless success
+
+        git_dir = File.join(@context.project_name, '.git')
+        if Dir.exist?(git_dir)
+          FileUtils.rm_rf(git_dir)
+          puts "\n* Cleaned up template git history.\n\n"
+        end
+
+        action_success_message("./#{@context.project_name}")
+
+        setup_command = "cd #{@context.project_name} && rake setup[#{camelize(@context.project_name)}]"
+        system(setup_command)
+
+        action_success_message(setup_command, "run")
+        puts "\n Setup is done! follow the link below to learn about this template:"
+        puts "\n #{repo}"
+      end
+    end
+  end
+end
+

data/lib/roda/project/main_context.rb

@@ -23,9 +23,9 @@ class Roda
   option :main_context, type: :hash, default: {
       project_name: "#{project_name}",
       base: #{id_to_string(base, :base)},
-      rodauth: #{rodauth},
+      rodauth: #{rodauth || false},
       tests: #{id_to_string(tests, :tests)},
-      database: #{database},
+      database: #{database || false},
         RUBY
         if database?
           option << "    database_type: #{id_to_string(database_type, :database)},"

data/lib/roda/project/templates/base/app/app.rb.erb

@@ -8,7 +8,7 @@ class <%= context.const_project_name %> < Roda
   <% if context.fullstack? %>
   # Views
   plugin :partials, views: "app/views"
-  plugin :render, layout: "./layout"
+  plugin :render, **Config.get[:render]
   plugin :content_for, append: false
   plugin :flash
   plugin :assets_manifest

data/lib/roda/project/templates/base/scaffold/app/config/config.rb.erb

@@ -12,7 +12,20 @@ module Config
         }<% end %><% if context.database? %>,
         db: {
           url: not_production? ? <%= context.default_db_url %> : ENV["DATABASE_URL"]
-        }<% end %>
+        }<% end %><% if context.fullstack? %>,
+        render: {
+          layout: "./layout",
+          assume_fixed_locals: true,    # Optimize plugin by assuming all templates use fixed locals
+          template_opts: {
+            scope_class: self,          # Always uses current class as scope class for compiled templates
+            freeze: true,               # Freeze string literals in templates
+            extract_fixed_locals: true, # Support fixed locals in templates
+            default_fixed_locals: '()', # Default to templates not supporting local variables
+            escape: true,               # For Erubi templates, escapes %= by default (use %== for unescaped
+            chain_appends: true,        # For Erubi templates, improves performance
+            skip_compiled_encoding_detection: true, # Unless you need encodings explicitly specified
+          }<% end %>
+        }
       }
     end
 

data/lib/roda/project/version.rb

@@ -2,6 +2,6 @@
 
 class Roda
   module Project
-    VERSION = "0.1.10"
+    VERSION = "0.1.12"
   end
 end

data/lib/roda/project.rb

@@ -59,14 +59,16 @@ require_relative "project/helpers/inflections"
 # Base
 require_relative "project/main_context"
 require_relative "project/generator"
+require_relative "project/jeremy_template_creator"
 require_relative "project/cli"
-# Generators/base
 require_relative "project/bin/generator"
 # Generators/migration
 require_relative "project/bin/generators/migration"
 require_relative "project/bin/generators/migration/action_detector"
 require_relative "project/bin/generators/migration/field_parser"
 require_relative "project/bin/generators/migration/code_builder"
+# Generators/model
+require_relative "project/bin/generators/model"
 # Generators/routes
 require_relative "project/bin/generators/routes"
 # Generators/base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Henrique F. Teixeira
@@ -83,6 +83,7 @@ files:
 - lib/roda/project/bin/generators/migration/action_detector.rb
 - lib/roda/project/bin/generators/migration/code_builder.rb
 - lib/roda/project/bin/generators/migration/field_parser.rb
+- lib/roda/project/bin/generators/model.rb
 - lib/roda/project/bin/generators/routes.rb
 - lib/roda/project/cli.rb
 - lib/roda/project/generator.rb
@@ -90,6 +91,7 @@ files:
 - lib/roda/project/helpers/inflections.rb
 - lib/roda/project/helpers/interactive_input.rb
 - lib/roda/project/helpers/template.rb
+- lib/roda/project/jeremy_template_creator.rb
 - lib/roda/project/main_context.rb
 - lib/roda/project/templates/base/app/app.rb.erb
 - lib/roda/project/templates/base/minimal/AGENTS.md
@@ -163,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="