roda-project 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fceab0441f37da52ca87b8c028d4fa72573854e2a1adc25f34f76ac6e7b4e2a
-  data.tar.gz: 24c9c54923283bee8394d0597206feed0d1a914cbf30caa1368bef696a2ffa3a
+  metadata.gz: ba772c511bc001bfa35bf4345638652b7291dd2e144003922fa85880e7dc03f3
+  data.tar.gz: be9c85ed58652607a5614d7f37d0878085f7834f257cd2053d766d067fd71a44
 SHA512:
-  metadata.gz: 7aa0cc8165bd3a515e8e06a625e0621ffd9257fa276431fd1babfd2ba1f3a4fd8336dc595c4a56d41f09c18505a8809870e1369612e46c810204ad65d9511c71
-  data.tar.gz: 9cf9d5bda0e6f992d820b20ec16647df888bcf36246500669a828efac54b1c091ddf73d628a54706af50bdd9b466b027076765755e74d00aa4fee6ea05fdf06b
+  metadata.gz: 63ef03a38f04ae88bda73eb7d890c3d80fda95521695a4e7ad6f19bd30a84630bff9f4daa4b7a8d08818fe77a235241bcb60f48e58e060646b2cd8c3dad62fd0
+  data.tar.gz: 9737a1545992102d0e82c5563cc0a29ae6c0c15d6b24bf07f16f493f5421b043b77be2b15ca2894157358f89b077e9cc9e7f42f84ed114fb9e59d8da0c92be38

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

@@ -29,7 +29,7 @@ class Roda
 
             File.write(filename, content)
 
-            puts_create_message(filename)
+            action_success_message(filename)
           end
 
           def migrations_path

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

@@ -22,7 +22,7 @@ class Roda
             filename = File.join("spec/app/models", *name_segments[0..-2], "#{model_file_basename}_spec.rb")
             File.write(filename, spec_code)
 
-            puts_create_message(filename)
+            action_success_message(filename)
           end
 
           def create_model
@@ -30,7 +30,7 @@ class Roda
             filename = File.join("app/models", *name_segments[0..-2], "#{model_file_basename}.rb")
             File.write(filename, code)
 
-            puts_create_message(filename)
+            action_success_message(filename)
           end
 
           def spec_code

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

@@ -23,8 +23,15 @@ class Roda
             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?("/")
@@ -45,7 +52,7 @@ class Roda
       end
             RUBY
             File.write(filename, content)
-            puts_create_message(filename)
+            action_success_message(filename)
           end
 
           def generate_views
@@ -55,9 +62,10 @@ 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_create_message(view_filename)
+                  action_success_message(view_filename)
                 end
               end
             end
@@ -70,10 +78,18 @@ class Roda
 
             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
@@ -84,7 +100,7 @@ class Roda
       end
             RUBY
             File.write(test_filename, test_content)
-            puts_create_message(test_filename)
+            action_success_message(test_filename)
           end
 
           def must_generate_views?

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,11 +103,11 @@ class Roda
           erb_cp_file("front-end", "esbuild.js")
           erb_cp_file("front-end", "package.json")
           cp_dir("front-end", "app/views")
-          puts_create_message("app/views")
+          action_success_message("app/views")
           cp_dir("front-end", "public/assets")
-          puts_create_message("public/assets")
+          action_success_message("public/assets")
           cp_dir("front-end", "public/images")
-          puts_create_message("public/images")
+          action_success_message("public/images")
         end
       end
 
@@ -121,7 +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")
-            puts_create_message("app/views/create-account.erb")
+            action_success_message("app/views/create-account.erb")
           end
         end
       end

data/lib/roda/project/generator.rb

@@ -20,8 +20,8 @@ class Roda
 
       protected
 
-      def puts_create_message(path)
-        puts(pastel.green("      create  ") + path)
+      def action_success_message(path, action = "create")
+        puts(pastel.green("      #{action}  ") + path)
       end
     end
   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.11"
+    VERSION = "0.1.12"
   end
 end

data/lib/roda/project.rb

@@ -59,6 +59,7 @@ 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"
 require_relative "project/bin/generator"
 # Generators/migration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Henrique F. Teixeira
@@ -91,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