roda-project 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235c82e6d3bae7eebc1b331a1d74272222f3e5a6a0957536a68b4d766f82a34c
-  data.tar.gz: e8ee5c63d19ad043c2f0c55647b6534b6bc0186d2a92e67335ec9319e9a7c93a
+  metadata.gz: bca56b06faeb347730f67dce564950b0f3fb9a2e0271820551f96752678121e1
+  data.tar.gz: 1233a11fa1418c2492e956e79ea8d2f74db2689ce902e3fad04159245fc8a451
 SHA512:
-  metadata.gz: d371e15403ffec2a67ff2577a2044d671334380af4188b3b2cd828ef61f181a48ba30e30d2640042c6d534d41e4fba9acaa5aa553e27d1e50de7946f054c2762
-  data.tar.gz: 9413055aab700d47ecf17442ab7e2fff22d6db8d0fb7a3a94e9237b16a2b718763a14453f1b1eb36230561068e9c66c10c556478ee3f46e909d8177241028034
+  metadata.gz: 0f42c3f7152377f79986fbba0fb2c2cfa7cb6c583c68ca05c9f78463c44e8445ad9c76a87e506302718f8d07c1ea97b195359878b21357b89b005e329de45e35
+  data.tar.gz: 23ce0cb9af858542d5a213e5e934a97619ea3b4be93b3379b06a04b63dabaa2019d18cc5e4fcf847581bad81a1c9de4eed81efa660367827b6627cbee57a6158

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

@@ -1,3 +1,4 @@
+# rubocop:disable Layout/HeredocIndentation
 class Roda
   module Project
     module Bin
@@ -47,3 +48,4 @@ class Roda
     end
   end
 end
+# rubocop:enable Layout/HeredocIndentation

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

@@ -1,3 +1,4 @@
+# rubocop:disable Layout/HeredocIndentation
 class Roda
   module Project
     module Bin
@@ -12,6 +13,7 @@ class Roda
             generate_routes
             generate_views
             generate_tests
+            print_nested_branch_reminder
           end
 
           private
@@ -24,9 +26,19 @@ class Roda
               "    r.#{method} \"#{name}\" do#{view_line}\n    end"
             end.join("\n\n")
 
+            hash_branch_header = if branch_name.include?("/")
+              parts = branch_name.split("/")
+              sub_path = parts[0..-2].join("/")
+              namespace = sub_path.include?("/") ? ":\"#{sub_path}\"" : ":#{sub_path}"
+              branch_segment = parts.last
+              "hash_branch #{namespace}, \"#{branch_segment}\" do |r|"
+            else
+              "hash_branch \"#{branch_name}\" do |r|"
+            end
+
             content = <<~RUBY
       class #{@context.const_project_name}
-        hash_branch "#{branch_name}" do |r|
+        #{hash_branch_header}
       #{route_definitions}
         end
       end
@@ -92,14 +104,29 @@ class Roda
           end
 
           def routes_list
-            @routes_list ||= @args[1..-1]
+            @routes_list ||= @args[1..]
           end
 
           def branch_name
             @branch_name ||= @args[0]
           end
+
+          def print_nested_branch_reminder
+            return unless branch_name.include?("/")
+
+            parts = branch_name.split("/")
+            sub_path = parts[0..-2].join("/")
+            namespace = sub_path.include?("/") ? ":\"#{sub_path}\"" : ":#{sub_path}"
+
+            puts "\ndont forget to add:\n\n" \
+                 "autoload_hash_branch_dir(#{namespace}, \"./app/routes/#{sub_path}\")\n\n" \
+                 "route do |r|\n" \
+                 " r.on(\"#{sub_path}\") { r.hash_branches(#{namespace}) }\n" \
+                 "end\n"
+          end
         end
       end
     end
   end
 end
+# rubocop:enable Layout/HeredocIndentation

data/lib/roda/project/cli.rb

@@ -22,8 +22,9 @@ class Roda
         puts "$ cd #{@context.project_name} && bundle"
         if @context.database?
           unless @context.sqlite?
-            puts "\n* create your database\n"
             puts "\n* put your dev database credentials in app/config/config.rb\n"
+            puts "\n* create your database\n"
+            puts "$ bin/roda db create"
           end
           puts "\nmigrate the database (use RACK_ENV to migrate 'test' or 'production' environments):\n\n"
           puts "$ bin/roda db migrate"

data/lib/roda/project/main_context.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Layout/HeredocIndentation
 class Roda
   module Project
     class MainContext
@@ -155,3 +156,4 @@ class Roda
     end
   end
 end
+# rubocop:enable Layout/HeredocIndentation

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

@@ -1,6 +1,6 @@
 class <%= context.const_project_name %> < Roda
   # Routing<% if context.fullstack? %>
-  plugin :hash_branch_view_subdir<% end %>
+  plugin :hash_branch_view_namespace<% end %>
   plugin :autoload_hash_branches
   autoload_hash_branch_dir("./app/routes")
   plugin :all_verbs

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

@@ -23,6 +23,7 @@ gem "puma"
 
 # Views
 gem 'roda-assets_manifest'
+gem 'roda-hash_branch_view_namespace'
 <% end %>
 # Performance
 gem "oj"

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

@@ -6,9 +6,8 @@ class Db < Thor
   desc "migrate", "Migrate the database. Optional: provide target version, e.g., 'roda db:migrate 1'"
   option :target, type: :numeric, aliases: "-t", desc: "provide target version"
   def migrate
+    require_db_deps
     require_relative "../boot"
-    require "sequel"
-    require "sequel/extensions/migration"
 
     Sequel.extension :migration
     db = Providers::DB::Conn.get
@@ -19,6 +18,72 @@ class Db < Thor
     end
     puts "* database migration complete."
   end
+  <% if context.sqlite? %>
+  desc "create", "Create the database"
+  def create
+    require_db_deps
+    path = parse_sqlite_path(Config.get[:db][:url])
+    FileUtils.mkdir_p(File.dirname(path))
+    Sequel.connect("sqlite://#{path}") rescue nil
+    puts "* create database #{path} ✓"
+  end
+
+  desc "drop", "Drop the database"
+  def drop
+    require_db_deps
+    path = parse_sqlite_path(Config.get[:db][:url])
+    File.delete(path) if File.exist?(path)
+    puts "* drop database #{path} ✓"
+  end
+  <% else %>
+  [: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? %>
+      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
+      }
+      sql = action == :create ?
+      "CREATE DATABASE IF NOT EXISTS `#{db_config[:dbname]}`;" :
+      "DROP DATABASE IF EXISTS `#{db_config[: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
+      ok = system(env, "mysql", *flags, "-e", sql)<% end %>
+      puts "* #{action} database #{db_config[:dbname]} ✓" if ok
+    end
+  end
+  <% end %>
+  private
+  <% if context.sqlite? %>
+  def parse_sqlite_path(url)
+    uri = URI.parse(url)
+    File.expand_path(uri.host ? File.join(uri.host, uri.path) : uri.path, Dir.pwd)
+  end
+  <% end %>
+  def require_db_deps
+    require_relative "../boot"
+    require "sequel"
+    require "sequel/extensions/migration"
+    require "<%= context.db_gem %>"<% if context.mysql? %>
+    require "uri"<% end %>
+  end
 end
 <% end %>
 class CLI < Thor

data/lib/roda/project/version.rb

@@ -2,6 +2,6 @@
 
 class Roda
   module Project
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
   end
 end

data/lib/roda/project.rb

@@ -61,8 +61,8 @@ require_relative "project/generator"
 require_relative "project/cli"
 # Generators
 require_relative "project/bin/generator"
-require_relative 'project/bin/generators/migration'
-require_relative 'project/bin/generators/routes'
+require_relative "project/bin/generators/migration"
+require_relative "project/bin/generators/routes"
 require_relative "project/bin/generators"
 # Version
 require_relative "project/version"

metadata

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