roda-project 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e03b5fbcad7831986b704d75c798fc85ea1874b5e63a8970ef876db89841978f
-  data.tar.gz: 1cb64c7f6c9b14c8fdcc31e0e841813c5eb92bb707899187053f4af534327136
+  metadata.gz: beb637fce10cb01a9d71fbcceca4b10ccc6e04aa05bac094fc6327ed1854643e
+  data.tar.gz: 1ac1a13838ba8a5f5e6c65409e192ab9b15fe3f5ad9ee14dbc9d5b648a195434
 SHA512:
-  metadata.gz: 9abfe5001b17316fb5ddd00d0f568b96b7b028c96e41a49d6696523d6397965ebd46acd980c3e4d918ff69c5d9aaf6032a155b0fb7736970ed64f78342a6a709
-  data.tar.gz: ad3464a71e558d327e0492b0c4e56f06bf82c7ae524d8767a99b03a7ca0408aaf9f814cb71a8b17c5e0077b9d06499980fe296f8302aec96bfbcc7ffc19ce362
+  metadata.gz: 471336f81ca6fd96226a001e599debeeb22302a284a78e8911a5bf0be02dd78c8010272b061f868d185ed82f3c943f84f6f90e2b35f44c807b2778027a24c019
+  data.tar.gz: 4ced8204c150d5208961c2315256151cd0eca3f2bd48905979684490450decc760f8d1b3828ac075fa1539d8e542ff4821cebfe0f70aa4df281efc0cc874e63a

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

@@ -12,9 +12,9 @@ class Roda
 
             puts "* creating routes"
             generate_routes
+            generate_nested_branch_files
             generate_views
             generate_tests
-            print_nested_branch_reminder
           end
 
           private
@@ -37,9 +37,8 @@ class Roda
             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|"
+              "hash_branch #{namespace_for(sub_path)}, \"#{branch_segment}\" do |r|"
             else
               "hash_branch \"#{branch_name}\" do |r|"
             end
@@ -85,8 +84,8 @@ class Roda
                   "    expect(last_response.status).to eq(200)\n" \
                   "  end"
               else
-                "  it \"responds to #{method.upcase} /#{branch_name} do\n" \
-                  "    #{method} \"/#{branch_name}\n" \
+                "  it \"responds to #{method.upcase} /#{branch_name}\" do\n" \
+                  "    #{method} \"/#{branch_name}\"\n" \
                   "    expect(last_response.status).to eq(200)\n" \
                   "  end"
               end
@@ -103,6 +102,57 @@ class Roda
             action_success_message(test_filename)
           end
 
+          def generate_nested_branch_files
+            return unless branch_name.include?("/")
+
+            parts = branch_name.split("/")
+            parts[0..-2].each_with_index do |_segment, index|
+              prefix = parts[0..index].join("/")
+              filename = File.join("app/routes", "#{prefix}.rb")
+
+              if File.exist?(filename)
+                ensure_hash_branches_line(filename, namespace_for(prefix))
+                next
+              end
+
+              dir = File.dirname(filename)
+              FileUtils.mkdir_p(dir) unless File.directory?(dir)
+              File.write(filename, nested_branch_file_content(prefix, index))
+              action_success_message(filename)
+            end
+          end
+
+          def nested_branch_file_content(prefix, index)
+            parts = prefix.split("/")
+            segment = parts.last
+            header = if index.zero?
+              "hash_branch \"#{segment}\" do |r|"
+            else
+              parent_path = parts[0..-2].join("/")
+              "hash_branch #{namespace_for(parent_path)}, \"#{segment}\" do |r|"
+            end
+
+            <<~RUBY
+              class #{@context.const_project_name}
+                #{header} # #{prefix} branch
+                  r.hash_branches(#{namespace_for(prefix)}) # #{prefix}/ +1 routes
+                end
+              end
+            RUBY
+          end
+
+          def ensure_hash_branches_line(filename, namespace)
+            expected_line = "r.hash_branches(#{namespace})"
+            return if File.read(filename).include?(expected_line)
+
+            puts "  warning: #{filename} already exists — please add:"
+            puts "    #{expected_line}"
+          end
+
+          def namespace_for(sub_path)
+            sub_path.include?("/") ? ":\"#{sub_path}\"" : ":#{sub_path}"
+          end
+
           def must_generate_views?
             @options[:views] && Dir.exist?("app/views")
           end
@@ -120,20 +170,6 @@ class Roda
           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

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

@@ -1,8 +1,9 @@
 class <%= context.const_project_name %> < Roda
   # Routing<% if context.fullstack? %>
-  plugin :hash_branch_view_namespace<% end %>
+  plugin :hash_branch_view_subdir<% end %>
   plugin :autoload_hash_branches
-  autoload_hash_branch_dir("./app/routes")
+  HASH_BRANCHES.each { |args| autoload_hash_branch_dir(*args) }
+
   plugin :all_verbs
   plugin :not_found
   <% if context.fullstack? %>

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/Gemfile.erb

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

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
 
@@ -32,10 +31,23 @@ Providers::Mailer.boot
 Providers::Logger.boot
 
 # Consts<% if context.database %>
-DB = Providers::DB::Conn.get
+DB = Providers::DB::Conn.get<% end %>
+ROUTES_DIR = "./app/routes"
+base_path = Pathname.new(ROUTES_DIR)
+HASH_BRANCHES = []
+HASH_BRANCHES << [base_path]
+Dir.glob(File.join(ROUTES_DIR, "**/*")).each do |dir_path|
+  next unless File.directory?(dir_path)
+
+  path = Pathname.new(dir_path)
+  relative_path = path.relative_path_from(base_path).to_s
+
+  HASH_BRANCHES << [relative_path.to_sym, path.to_s]
+end
 
-# Automatic models annotations in dev environment
 if Config.not_production?
+  require "debug"<% if context.database %>
+  # Automatic models annotations in dev environment
   require 'sequel/annotate'
-  Sequel::Annotate.annotate(Dir['app/models/*.rb'], position: :before, border: true) rescue nil
-end<% end %>
+  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,13 +2,13 @@ require_relative "../spec_helper"
 
 describe "hello" do
   it "test requests" do
-    get "/"<% if context.rodauth? %>
-    _(last_response.status).must_equal 302<% else %>
+    get "/"
     _(last_response.status).must_equal 200<% if context.fullstack? %>
-    _(last_response.body).must_include "Hello world"<% end %><% end %>
+    _(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,12 +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 %>
+    get "/"
     expect(last_response.status).to eq(200)<% if context.fullstack? %>
-    expect(last_response.body).to include("Hello world")<% end %><% end %>
+    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.14"
+    VERSION = "0.1.16"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 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