Refactor routing

Author: hunchr

app/controllers/hotsheet/sheets_controller.rb

@@ -22,6 +22,8 @@ def update
 
   def set_sheet
     @sheet = Hotsheet.sheets[params[:sheet_name]]
+
+    render "hotsheet/home/error", status: :not_found if @sheet.nil?
   end
 
   def set_column

app/helpers/hotsheet/application_helper.rb

@@ -6,7 +6,7 @@
     <% Hotsheet.sheets.each_with_index do |entry, index| %>
       <li>
         <% sheet_name, sheet = entry %>
-        <%= link_to sheet.model.model_name.human(count: 2), sheet_path_for(sheet_name),
+        <%= link_to sheet.model.model_name.human(count: 2), sheets_path(sheet_name),
                     class: ("active" if params[:sheet_name] == sheet_name), data: { x: index } %>
       </li>
     <% end %>

app/views/hotsheet/shared/_nav.html.erb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 Hotsheet::Engine.routes.draw do
-  next unless defined? Rails::Server
-
   root "home#show"
 
-  Hotsheet.sheets.each_key do |sheet_name|
-    resources sheet_name, sheet_name:, controller: :sheets, only: %i[index update]
+  scope ":sheet_name" do
+    resources controller: :sheets, only: %i[index update], as: :sheets
   end
 
   match "*path", to: "home#error", via: :all

config/routes.rb

@@ -12,14 +12,14 @@
 
   describe "#index" do
     it "shows a table with all values" do
-      get hotsheet.users_path
+      get hotsheet.sheets_path :users
       expect(response).to be_successful
       expect(response.body).to include user.name
     end
   end
 
   describe "#update" do
-    let(:path) { hotsheet.user_path(user.id) }
+    let(:path) { hotsheet.sheet_path :users, user }
 
     it "updates the resource" do
       expect { put path, params: { column_name: :name, value: "Bob" } }
@@ -43,7 +43,7 @@
     end
 
     context "with nonexistent id" do
-      let(:path) { hotsheet.user_path(0) }
+      let(:path) { hotsheet.sheet_path :users, 0 }
 
       it "does not update the resource" do
         expect { put path, params: { column_name: :name, value: "Bob" } }.not_to change(user, :reload)

spec/requests/hotsheet/sheets_controller_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 def prepare(&)
-  stub_const "Rails::Server", true
   Hotsheet.instance_variable_set :@sheets, nil # reset memoized sheets
   yield
-  Rails.application.reload_routes!
 end

spec/support/utils.rb

@@ -10,7 +10,7 @@
   before { prepare { Hotsheet.configure { sheet :User } } }
 
   it "updates the cell value" do
-    visit hotsheet.users_path
+    visit hotsheet.sheets_path :users
     find(".cell", text: user.name).click.send_keys(:enter).fill_in(with: "Admin").send_keys :enter
 
     expect { find(".cell", text: user.email).click }