roda-project 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25bc9c837d828281d16cc27a589316eeebcb26389a14a3bcb512d83072e532c2
-  data.tar.gz: 8aa90aeb23cae8f188bfc8355a46b8b7fc89bf697ba3a0f1a39b3199f3d7c038
+  metadata.gz: aeff4fdaddf4c0b61eb4fe2f5f2f89b025897eda318d92ecf1a786ee9ff110d1
+  data.tar.gz: 50891c013749f5b94378d1259834d5b6c8dafb7bc92ec3092aef74b5ac24080f
 SHA512:
-  metadata.gz: 3d146d6279989b6ee8cea4017f932931bd353623f9c0293022793a6e56c153f0e902fe05522b76696092b6e962aae44a57e34ab4835b53aa233d2e8308bb2983
-  data.tar.gz: 9d2e04b540e188cd4b986cc761c8e3319fa216f2dc7ef1c892e2358e771fee3f936a9189f4b998d809a63813d175a42ef6c9b31f79b250986f1a9cd1bf212950
+  metadata.gz: 9bc4575aeb9625e2728ef01c6b5ce699c3b8d1c86a55936e75c5bf2a76105a6b91eaafbd2bca11c47118bd57ae30145b83e7ffda4e17099d09d1ea993f802211
+  data.tar.gz: b57e42ba6d7e0c9867801bf52ddb25b341914b0d575761f23a6190ff12b36660ad9db8afb78535847b83ee06496ff78cce8ed422b0f4879e96e52c95371a8dab

data/lib/roda/project/context.rb

@@ -45,6 +45,7 @@ module Roda
         @database = val
       end
 
+      # rubocop:disable Lint/InterpolationCheck
       def database_type=(val)
         if ![mysql_id, postgresql_id, sqlite_id].include?(val)
           raise InvalidValue, "Invalid database option"
@@ -63,6 +64,7 @@ module Roda
           @db_gem = "sqlite3"
         end
       end
+      # rubocop:enable Lint/InterpolationCheck
 
       def project_name=(val)
         if !(val =~ VALID_PROJECT_NAME_REGEX)
@@ -133,7 +135,7 @@ module Roda
       end
 
       def const_project_name
-        @const_project_name ||= project_name.split('_').map(&:capitalize).join
+        @const_project_name ||= project_name.split("_").map(&:capitalize).join
       end
     end
   end

data/lib/roda/project/version.rb

@@ -2,6 +2,6 @@
 
 module Roda
   module Project
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/roda/project.rb

@@ -50,7 +50,7 @@ module Roda
         ['"Start where you are. Use what you have. Do what you can." - Arthur Ashe'],
         ['"A goal is a dream with a deadline." - Napoleon Hill'],
         ['"Things do not happen. Things are made to happen." - John F. Kennedy'],
-        ['"Quality is not an act, it is a habit." - Aristotle'],
+        ['"Quality is not an act, it is a habit." - Aristotle']
       ]
     end
   end

data/lib/roda/templates/base/minimal/app.rb

@@ -14,7 +14,7 @@ class App < Roda
 
   route do |r|
     r.root do
-      { message: "Hello world" }
+      {message: "Hello world"}
     end
   end
 

data/lib/roda/templates/base/minimal/config.ru

@@ -1,4 +1,4 @@
-require_relative 'boot'
+require_relative "boot"
 # Rack::Attack.throttle('signup/ip', limit: 3, period: 15.minutes) do |req|
 # req.ip if req.path == '/signup'
 # end

data/lib/roda/templates/base/scaffold/Rakefile.erb

@@ -137,7 +137,7 @@ namespace :g do<% if context.database? %>
       exit 1
     end
 
-    must_generate_views = Dir.exist?(File.expand_path("../../app/views", __dir__))
+    must_generate_views = Dir.exist?(File.expand_path("./app/views", __dir__))
     ensure_and_get_path = proc do |path|
       base_path = File.expand_path(path, __dir__)
       full_path_dir = File.join(base_path, File.dirname(branch_name))
@@ -145,14 +145,14 @@ namespace :g do<% if context.database? %>
 
       base_path
     end
-    parse_route_string = proc do
+    parse_route_string = proc do |route_str|
       name, method = route_str.split(":", 2)
       method ||= "get"
       [method, name]
     end
 
     # Generate routes
-    filename = File.join(ensure_and_get_path.call("../../app/routes"), "#{branch_name}.rb")
+    filename = File.join(ensure_and_get_path.call("./app/routes"), "#{branch_name}.rb")
     route_definitions = routes_list.map do |route_str|
       method, name = parse_route_string.call(route_str)
       view_line = (method == "get" && must_generate_views) ? "\n      view('#{name}')" : ""
@@ -171,7 +171,7 @@ namespace :g do<% if context.database? %>
 
     # Generate views
     if must_generate_views
-      branch_views_dir = File.join(File.expand_path("../../app/views", __dir__), branch_name)
+      branch_views_dir = File.join(File.expand_path("./app/views", __dir__), branch_name)
       FileUtils.mkdir_p(branch_views_dir)
       routes_list.each do |route_str|
         method, name = parse_route_string.call(route_str)
@@ -184,7 +184,7 @@ namespace :g do<% if context.database? %>
     end
 
     # Generate tests
-    test_filename = File.join(ensure_and_get_path.call("../../spec/app/routes"), "#{branch_name}_spec.rb")
+    test_filename = File.join(ensure_and_get_path.call("./spec/app/routes"), "#{branch_name}_spec.rb")
     nesting_level = branch_name.count("/")
     relative_spec_helper_path = "../" * (2 + nesting_level) + "spec_helper"
 

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

@@ -9,15 +9,25 @@ module Config
         i18n: {
           translations: ["app/config/locales", "app/config/locales/foo"],
           locale: ["en", "pt-br"]
-        },<% if context.database? %>
+        }<% if context.database? %>,
         db: {
           url: not_production? ? <%= context.dev_db_url %> : ENV["DATABASE_URL"]
+        }<% end %><% if context.fullstack? %>,
+        assets: {
+          host: '/public/assets',
+          manifest:
         }<% end %>
       }
     end
 
-    def not_production? = environment != "production"
+    def not_production? = environment != "production"<% if context.fullstack? %>
+    def manifest
+      manifest_path = File.expand_path("../../public/assets/manifest.json", __dir__)
+      return JSON.parse(File.read(manifest_path)) if File.exist?(manifest_path)
 
+      {}
+    end
+    <% end %>
     def environment
       ENV["RACK_ENV"] || "development"
     end

data/lib/roda/templates/front-end/app/views/html.rb

@@ -10,6 +10,22 @@ module Views
       @foo = Views::Foo::Html.new
     end
 
+    def js_entrypoint_tag(entrypoint)
+      if Config.not_production?
+        "<script src=\"/public/assets/#{entrypoint}.js\" defer></script>"
+      else
+        "<script src=\"#{Config.get[:assets][:host]}/#{Config.get[:assets][:manifest]["#{entrypoint}.js"]}\" defer></script>"
+      end
+    end
+
+    def css_entrypoint_tag(entrypoint)
+      if Config.not_production?
+        "<link rel=\"stylesheet\" href=\"/public/assets/#{entrypoint}.css\" />"
+      else
+        "<link rel=\"stylesheet\" href=\"#{Config.get[:assets][:host]}/#{Config.get[:assets][:manifest]["#{entrypoint}.css"]}\" />"
+      end
+    end
+
     def navbar
       html_slice do
         div class: "navbar" do

data/lib/roda/templates/front-end/app/views/layout.erb

@@ -1,7 +1,9 @@
 <html>
   <head>
     <meta charset='utf-8' />
-    <link rel="stylesheet" type="text/css" href="/public/css/app.css">
+
+    <%= html.css_entrypoint_tag(:app) %>
+    <%= html.js_entrypoint_tag(:app) %>
   </head>
   <body>
     <img src='/public/images/roda-project.png' />

data/lib/roda/templates/front-end/esbuild.js

@@ -1,33 +1,40 @@
 const esbuild = require('esbuild');
-
+const manifestPlugin = require('esbuild-plugin-manifest');
 const isWatchMode = process.argv.includes('--watch');
+const isProduction = process.env.RACK_ENV === 'production';
+
+const cssEntryPoints = ['app']
+const jsEntryPoints = ['app']
 
-const entrypoints = [
-  'js/app.js',
-  'css/app.css'
-]
+function config() {
+  const assetsEntryPoints =
+    cssEntryPoints.map((e) => `css/${e}.css`)
+    .concat(
+      jsEntryPoints.map((e) => `js/${e}.js`)
+    )
 
-function configFor(name) {
   return {
-    entryPoints: [`app/assets/${name}`],
+    entryPoints: assetsEntryPoints.map((name) => `app/assets/${name}`),
     bundle: true,
-    minify: true,
-    outfile: `public/${name}`,
+    minify: isProduction,
+    outdir: "public/assets",
+    entryNames: isProduction ? '[name]-[hash]' : '[name]',
+    plugins: isProduction ? [
+      manifestPlugin({ shortNames: true })
+    ] : [],
   }
 }
 
 async function build() {
   try {
     if (isWatchMode) {
-      entrypoints.forEach(async (entrypoint) => {
-        const jsCtx = await esbuild.context(configFor(entrypoint));
-        await jsCtx.watch();
-      })
-      console.log(`Watching for css and js changes in '${entrypoints.join(', ')}'...`);
+      const ctx = await esbuild.context(config());
+      await ctx.watch();
+
+      console.log(`Watching for css and js changes in '${assetsEntryPoints.join(', ')}'...`);
     } else {
-      entrypoints.forEach(async () => {
-        await esbuild.build(configFor(entrypoint));
-      })
+      await esbuild.build(config());
+
       console.log(`Build complete.`);
     }
   } catch (error) {

data/lib/roda/templates/front-end/package.json

@@ -15,6 +15,7 @@
   },
   "devDependencies": {
     "esbuild": "^0.19.0",
+    "esbuild-plugin-manifest": "^1.0.5",
     "path": "^0.12.7"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Henrique F. Teixeira
@@ -95,10 +95,10 @@ files:
 - lib/roda/templates/base/scaffold/app/routes/foo.rb.erb
 - lib/roda/templates/base/scaffold/boot.rb.erb
 - lib/roda/templates/base/scaffold/config.ru.erb
-- lib/roda/templates/base/scaffold/public/css/app.css
+- lib/roda/templates/base/scaffold/public/assets/app.css
+- lib/roda/templates/base/scaffold/public/assets/app.js
 - lib/roda/templates/base/scaffold/public/exception_page.css
 - lib/roda/templates/base/scaffold/public/images/roda-project.png
-- lib/roda/templates/base/scaffold/public/js/app.js
 - lib/roda/templates/database/app/config/providers/db/conn.rb
 - lib/roda/templates/database/db/seeds.rb
 - lib/roda/templates/front-end/app/assets/css/app.css