Return 404 when action doesn't exist

Author: skryukov

lib/inertia_rails/middleware.rb

@@ -47,7 +47,7 @@ def redirect_status?(status)
       end
 
       def non_get_redirectable_method?
-        ['PUT', 'PATCH', 'DELETE'].include? request_method
+        %w[PUT PATCH DELETE].include? request_method
       end
 
       def inertia_non_post_redirect?(status)
@@ -63,7 +63,7 @@ def get?
       end
 
       def controller
-        @env["action_controller.instance"]
+        @env['action_controller.instance']
       end
 
       def request_method
@@ -83,7 +83,7 @@ def version_stale?
       end
 
       def server_version
-        controller&.send(:inertia_configuration)&.version
+        (controller&.send(:inertia_configuration) || InertiaRails.configuration).version
       end
 
       def coerce_version(version)
@@ -92,7 +92,7 @@ def coerce_version(version)
 
       def force_refresh(request)
         request.flash.keep
-        Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+        Rack::Response.new('', 409, { 'X-Inertia-Location' => request.original_url }).finish
       end
 
       def copy_xsrf_to_csrf!

spec/inertia/middleware_spec.rb

@@ -1,30 +1,52 @@
+# frozen_string_literal: true
+
 RSpec.describe InertiaRails::Middleware, type: :request do
-  context 'the version is stale' do
-    it 'tells the client to refresh' do
-      get empty_test_path, headers: {'X-Inertia' => true, 'X-Inertia-Version' => 'blkajdf'}
+  context 'the version is set' do
+    with_inertia_config version: '1.0'
+
+    it 'tells the client with stale version to refresh' do
+      get empty_test_path, headers: { 'X-Inertia' => true, 'X-Inertia-Version' => 'stale' }
 
       expect(response.status).to eq 409
       expect(response.headers['X-Inertia-Location']).to eq request.original_url
     end
+
+    it 'returns page when version is up to date' do
+      get empty_test_path, headers: { 'X-Inertia' => true, 'X-Inertia-Version' => '1.0' }
+
+      expect(response.status).to eq 200
+    end
+
+    it 'returns response for non-inertia requests' do
+      get empty_test_path, headers: { 'X-Inertia-Version' => 'stale' }
+
+      expect(response.status).to eq 200
+    end
+
+    it 'returns 404 on unknown route' do
+      expect do
+        get '/unknown_route', headers: { 'X-Inertia' => true, 'X-Inertia-Version' => '1.0' }
+      end.to raise_error(ActionController::RoutingError)
+    end
   end
 
   context 'a redirect status was passed with an http method that preserves itself on 302 redirect' do
     subject { response.status }
 
     context 'PUT' do
-      before { put redirect_test_path, headers: {'X-Inertia' => true} }
+      before { put redirect_test_path, headers: { 'X-Inertia' => true } }
 
       it { is_expected.to eq 303 }
     end
 
     context 'PATCH' do
-      before { patch redirect_test_path, headers: {'X-Inertia' => true} }
+      before { patch redirect_test_path, headers: { 'X-Inertia' => true } }
 
       it { is_expected.to eq 303 }
     end
 
     context 'DELETE' do
-      before { delete redirect_test_path, headers: {'X-Inertia' => true} }
+      before { delete redirect_test_path, headers: { 'X-Inertia' => true } }
 
       it { is_expected.to eq 303 }
     end
@@ -47,12 +69,4 @@
       expect(statusses.uniq).to eq([303])
     end
   end
-
-  context 'a request not originating from inertia' do
-    it 'is ignored' do
-      get empty_test_path, headers: {'X-Inertia-Version' => 'blkajdf'}
-
-      expect(response.status).to eq 200
-    end
-  end
 end