roda-project 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3156e8ffc1fbf7c48c30c1224bfccd2bf66c775b90cb802ada325c2ef2a5607e
-  data.tar.gz: 02e04e9cb18a32f82cad2fceb59f1d567d33fe61330f1f0a26bb6e38ebf3b618
+  metadata.gz: 5c22151c8712cbc374521e061d5c91e5b4dae3b55ab5d55fc3227fbf57ef49c6
+  data.tar.gz: 31f190125960494423689e00f70fe16fb32c05da6ea5a5c356fa33b99792d8f3
 SHA512:
-  metadata.gz: b2a91d0af7f801951d65f288a3fcbc0012b3779e6736dfdd94d7703377834cad15d8a8680293b1800a8293e90cfb59d8d3f971e1e67abedf682b32a432e9920a
-  data.tar.gz: b80916d58cdd4a167f8be8a9e5e43f4c56730457818b6cfee081ac4946d1e353284c7b6d087f9d030a03d7a705426e78fe871610dd5438dfe3c1c9bb1d426563
+  metadata.gz: 5533eef1235cbbf17bdee8305595a2eee7b32f298960a2b70b080f3ef633f329115d96ae8dcad13490cdfcbc03e092b1ed4559df1fb696604b482e3283ac0ef1
+  data.tar.gz: 74c4da7361e380d5eb8af1c16f61f06c7540e5fd5464b9df12c184aa4bea4b171f9903e8800bba8c99fcca5f792b67b1b914c1a9a65a86a360fb49c7ec6e586f

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

@@ -96,12 +96,10 @@ class Roda
           end
 
           def parse_args
-            @parse_args ||= begin
-              if %w[module class].include?(@args[0].to_s.downcase)
-                { type: @args[0].to_s.downcase, name: @args[1].to_s }
-              else
-                { type: "class", name: @args[0].to_s }
-              end
+            @parse_args ||= if %w[module class].include?(@args[0].to_s.downcase)
+              {type: @args[0].to_s.downcase, name: @args[1].to_s}
+            else
+              {type: "class", name: @args[0].to_s}
             end
           end
 

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/minimal/boot.rb

@@ -21,8 +21,8 @@ loader.collapse("#{__dir__}/services")
 # end
 loader.setup
 
-require "debug" if NOT_PRODUCTION
-
 Oj.mimic_JSON
 
+require "debug" if NOT_PRODUCTION
+
 require_relative "app"

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/base/scaffold/boot.rb.erb

@@ -22,7 +22,6 @@ loader.collapse("#{__dir__}/app/models")<% end %>
 # loader.push_dir("#{__dir__}/app/#{path}")
 # end
 loader.setup
-require "debug" if Config.not_production?
 
 Oj.mimic_JSON
 
@@ -34,8 +33,9 @@ Providers::Logger.boot
 # Consts<% if context.database %>
 DB = Providers::DB::Conn.get
 
-# Automatic models annotations in dev environment
 if Config.not_production?
+  require "debug"
+  # Automatic models annotations in dev environment
   require 'sequel/annotate'
   Sequel::Annotate.annotate(Dir['app/models/*.rb'], position: :before, border: true) rescue nil
 end<% end %>

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

@@ -2,12 +2,13 @@ require_relative "../spec_helper"
 
 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 %>
+    get "/"
+    _(last_response.status).must_equal 200<% if context.fullstack? %>
+    _(last_response.body).must_include "Hello world"<% end %>
   end
   <% if context.rodauth? %>
   it "test models" do
+    # run "RACK_ENV=test bin/roda db migrate" to make this spec pass
     Account.create(email: "foo@bar.com")
 
     _(Account.count).must_equal 1

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

@@ -0,0 +1,9 @@
+require_relative "../../spec_helper"
+
+describe "Routes for foo" do
+  it "responds to GET /foo/bar" do
+    get "/foo/bar"<% if context.rodauth? %>
+    _(last_response.status).must_equal 302<% else %>
+    _(last_response.status).must_equal 200<% end %>
+  end
+end

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

@@ -11,7 +11,7 @@ class Minitest::HooksSpec
   include Rack::Test::Methods
 
   def app
-    <%= context.const_project_name %>.freeze.app
+    <%= context.const_project_name %>.app
   end
 end
 

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

@@ -2,11 +2,12 @@ require_relative "../spec_helper"
 
 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 %>
+    get "/"
+    expect(last_response.status).to eq(200)<% if context.fullstack? %>
+    expect(last_response.body).to include("Hello world")<% end %>
   end
   <% if context.rodauth? %>
+  # run "RACK_ENV=test bin/roda db migrate" to make this spec pass
   it "test models" do
     Account.create(email: "foo@bar.com")
 

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

@@ -0,0 +1,9 @@
+require_relative "../../spec_helper"
+
+describe "Routes for foo" do
+  it "responds to GET /foo/bar" do
+    get "/foo/bar"<% if context.rodauth? %>
+    expect(last_response.status).to eq(302)<% else %>
+    expect(last_response.status).to eq(200)<% end %>
+  end
+end

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

@@ -14,6 +14,6 @@ RSpec.configure do |config|
   end
   <% end %>
   def app
-    <%= context.const_project_name %>.freeze.app
+    <%= context.const_project_name %>.app
   end
 end

data/lib/roda/project/version.rb

@@ -2,6 +2,6 @@
 
 class Roda
   module Project
-    VERSION = "0.1.13"
+    VERSION = "0.1.15"
   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.15
 platform: ruby
 authors:
 - Henrique F. Teixeira
@@ -142,12 +142,12 @@ files:
 - lib/roda/project/templates/tests/minimal/rspec/spec/app_spec.rb
 - lib/roda/project/templates/tests/minimal/rspec/spec/spec_helper.rb
 - lib/roda/project/templates/tests/minitest/spec/app/app_spec.rb.erb
-- lib/roda/project/templates/tests/minitest/spec/app/routes/foo_spec.rb
+- lib/roda/project/templates/tests/minitest/spec/app/routes/foo_spec.rb.erb
 - lib/roda/project/templates/tests/minitest/spec/app/routes/test_branch_spec.rb
 - lib/roda/project/templates/tests/minitest/spec/app/views/html_spec.rb
 - lib/roda/project/templates/tests/minitest/spec/spec_helper.rb.erb
 - lib/roda/project/templates/tests/rspec/spec/app/app_spec.rb.erb
-- lib/roda/project/templates/tests/rspec/spec/app/routes/foo_spec.rb
+- lib/roda/project/templates/tests/rspec/spec/app/routes/foo_spec.rb.erb
 - lib/roda/project/templates/tests/rspec/spec/app/routes/test_branch_spec.rb
 - lib/roda/project/templates/tests/rspec/spec/app/views/html_spec.rb
 - lib/roda/project/templates/tests/rspec/spec/spec_helper.rb.erb

data/lib/roda/project/templates/tests/minitest/spec/app/routes/foo_spec.rb

@@ -1,8 +0,0 @@
-require_relative "../../spec_helper"
-
-describe "Routes for foo" do
-  it "responds to GET /foo/bar" do
-    get "/foo/bar"
-    _(last_response.status).must_equal 200
-  end
-end

data/lib/roda/project/templates/tests/rspec/spec/app/routes/foo_spec.rb

@@ -1,8 +0,0 @@
-require_relative "../../spec_helper"
-
-describe "Routes for foo" do
-  it "responds to GET /foo/bar" do
-    get "/foo/bar"
-    expect(last_response.status).to eq(200)
-  end
-end