roda-project 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3156e8ffc1fbf7c48c30c1224bfccd2bf66c775b90cb802ada325c2ef2a5607e
-  data.tar.gz: 02e04e9cb18a32f82cad2fceb59f1d567d33fe61330f1f0a26bb6e38ebf3b618
+  metadata.gz: e03b5fbcad7831986b704d75c798fc85ea1874b5e63a8970ef876db89841978f
+  data.tar.gz: 1cb64c7f6c9b14c8fdcc31e0e841813c5eb92bb707899187053f4af534327136
 SHA512:
-  metadata.gz: b2a91d0af7f801951d65f288a3fcbc0012b3779e6736dfdd94d7703377834cad15d8a8680293b1800a8293e90cfb59d8d3f971e1e67abedf682b32a432e9920a
-  data.tar.gz: b80916d58cdd4a167f8be8a9e5e43f4c56730457818b6cfee081ac4946d1e353284c7b6d087f9d030a03d7a705426e78fe871610dd5438dfe3c1c9bb1d426563
+  metadata.gz: 9abfe5001b17316fb5ddd00d0f568b96b7b028c96e41a49d6696523d6397965ebd46acd980c3e4d918ff69c5d9aaf6032a155b0fb7736970ed64f78342a6a709
+  data.tar.gz: ad3464a71e558d327e0492b0c4e56f06bf82c7ae524d8767a99b03a7ca0408aaf9f814cb71a8b17c5e0077b9d06499980fe296f8302aec96bfbcc7ffc19ce362

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

@@ -63,10 +63,9 @@ class <%= context.const_project_name %> < Roda
 <% end %>
   def config = @config ||= Config.get
 
-  route do |r|
-    r.hash_branches<% if context.fullstack? %>
-    # session[:locale] = 'pt-br'
-    # r.i18n_set_locale_from(:session)<% end %>
+  route do |r|<% if context.fullstack? %>
+    r.i18n_set_locale_from(:http)<% end %>
+    r.hash_branches
     <% if context.rodauth? %>
     r.rodauth
     <% end  %>

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

@@ -5,14 +5,14 @@ module Config
         secret: ENV["SESSION_SECRET"] || 'DEV-ONLY-8<FQF8HiF)>l0hbPk£vBQ#IrYsoO}14k\l+-/gIU[j}l0hbPk£vBQ#IrY',
         environment:,<% if context.rodauth? %>
         hmac_secret: ENV["RODAUTH_HMAC_SECRET"] || 'DEV-ONLY',
-        jwt_secret: ENV["JWT_SECRET"] || 'DEV-ONLY'<% end %><% if context.fullstack? %>,
+        jwt_secret: ENV["JWT_SECRET"] || 'DEV-ONLY',<% end %><% if context.fullstack? %>
         i18n: {
-          translations: ["app/config/locales", "app/config/locales/foo"],
+          translations: [File.expand_path("locales", __dir__)],
           locale: ["en", "pt-br"]
-        }<% end %><% if context.database? %>,
+        },<% end %><% if context.database? %>
         db: {
           url: not_production? ? <%= context.default_db_url %> : ENV["DATABASE_URL"]
-        }<% end %><% if context.fullstack? %>,
+        },<% end %><% if context.fullstack? %>
         render: {
           layout: "./layout",
           assume_fixed_locals: true,    # Optimize plugin by assuming all templates use fixed locals

data/lib/roda/project/templates/base/scaffold/bin/roda.erb

@@ -39,34 +39,29 @@ class Db < Thor
   [:drop, :create].each do |action|
     desc action.to_s, "#{action.capitalize} the database"
     define_method(action) do
-      require_db_deps
-      require_relative "../app/config/config"<% if context.postgresql? %>
-      db_config =
-        PG::Connection
-        .conninfo_parse(Config.get[:db][:url])
-        .each_with_object({}) { |h, o|
-          o[h[:keyword].to_sym] = h[:val] if h[:val]
-        }
-      ok = system("PGPASSWORD='#{db_config[:password]}' #{action}db -h #{db_config[:host]} -p #{db_config[:port]} -U #{db_confi
-      g[:user]} #{db_config[:dbname]}")<% end %><% if context.mysql? %>
+      require "<%= context.db_gem %>"
+      require "uri"
+      require_relative "../app/config/config"
       uri = URI.parse(Config.get[:db][:url])
-      db_config = {
-        host: uri.host,
-        port: uri.port,
-        user: uri.user,
-        password: uri.password,
-        dbname: uri.path.tr('/', '') # removes leading slash
-      }
+      dbname = uri.path.to_s.delete_prefix("/")<% if context.postgresql? %>
+      env = {}
+      env["PGPASSWORD"] = uri.password if uri.password
+      args = ["#{action}db"]
+      args.push("-h", uri.host) if uri.host
+      args.push("-p", uri.port.to_s) if uri.port
+      args.push("-U", uri.user) if uri.user
+      args << dbname
+      ok = system(env, *args)<% end %><% if context.mysql? %>
       sql = action == :create ?
-      "CREATE DATABASE IF NOT EXISTS `#{db_config[:dbname]}`;" :
-      "DROP DATABASE IF EXISTS `#{db_config[:dbname]}`;"
+        "CREATE DATABASE IF NOT EXISTS `#{dbname}`;" :
+        "DROP DATABASE IF EXISTS `#{dbname}`;"
       flags = []
-      flags << "-h#{db_config[:host]}" if db_config[:host]
-      flags << "-P#{db_config[:port]}" if db_config[:port]
-      flags << "-u#{db_config[:user]}" if db_config[:user]
-      env = { "MYSQL_PWD" => db_config[:password] }.compact
+      flags << "-h#{uri.host}" if uri.host
+      flags << "-P#{uri.port}" if uri.port
+      flags << "-u#{uri.user}" if uri.user
+      env = { "MYSQL_PWD" => uri.password }.compact
       ok = system(env, "mysql", *flags, "-e", sql)<% end %>
-      puts "* #{action} database #{db_config[:dbname]} ✓" if ok
+      puts "* #{action} database #{dbname} ✓" if ok
     end
   end
   <% end %>

data/lib/roda/project/templates/tests/minitest/spec/app/app_spec.rb.erb

@@ -4,7 +4,8 @@ describe "hello" do
   it "test requests" do
     get "/"<% if context.rodauth? %>
     _(last_response.status).must_equal 302<% else %>
-    _(last_response.status).must_equal 200<% end %>
+    _(last_response.status).must_equal 200<% if context.fullstack? %>
+    _(last_response.body).must_include "Hello world"<% end %><% end %>
   end
   <% if context.rodauth? %>
   it "test models" do

data/lib/roda/project/templates/tests/rspec/spec/app/app_spec.rb.erb

@@ -4,7 +4,8 @@ describe "hello" do
   it "test requests" do
     get "/"<% if context.rodauth? %>
     expect(last_response.status).to eq(302)<% else %>
-    expect(last_response.status).to eq(200)<% end %>
+    expect(last_response.status).to eq(200)<% if context.fullstack? %>
+    expect(last_response.body).to include("Hello world")<% end %><% end %>
   end
   <% if context.rodauth? %>
   it "test models" do

data/lib/roda/project/version.rb

@@ -2,6 +2,6 @@
 
 class Roda
   module Project
-    VERSION = "0.1.13"
+    VERSION = "0.1.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Henrique F. Teixeira