Merge pull request #70 from caifara/master

Make middleware thread safe

Author: bknoles

lib/inertia_rails/middleware.rb

@@ -5,79 +5,91 @@ def initialize(app)
     end
 
     def call(env)
-      @env = env
+      InertiaRailsRequest.new(@app, env)
+                         .response
+    end
 
-      status, headers, body = @app.call(env)
-      request = ActionDispatch::Request.new(env)
+    class InertiaRailsRequest
+      def initialize(app, env)
+        @app = app
+        @env = env
+      end
 
-      ::InertiaRails.reset!
+      def response
+        status, headers, body = @app.call(@env)
+        request = ActionDispatch::Request.new(@env)
 
-      # Inertia errors are added to the session via redirect_to 
-      request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
+        ::InertiaRails.reset!
 
-      status = 303 if inertia_non_post_redirect?(status)
+        # Inertia errors are added to the session via redirect_to 
+        request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
 
-      return stale_inertia_get? ? force_refresh(request) : [status, headers, body]
-    end
+        status = 303 if inertia_non_post_redirect?(status)
 
-    private
+        stale_inertia_get? ? force_refresh(request) : [status, headers, body]
+      end
 
-    def keep_inertia_errors?(status)
-      redirect_status?(status) || stale_inertia_request?
-    end
+      private
 
-    def stale_inertia_request?
-      inertia_request? && version_stale?
-    end
+      def keep_inertia_errors?(status)
+        redirect_status?(status) || stale_inertia_request?
+      end
 
-    def redirect_status?(status)
-      [301, 302].include? status
-    end
+      def stale_inertia_request?
+        inertia_request? && version_stale?
+      end
 
-    def non_get_redirectable_method?
-      ['PUT', 'PATCH', 'DELETE'].include? request_method
-    end
+      def redirect_status?(status)
+        [301, 302].include? status
+      end
 
-    def inertia_non_post_redirect?(status)
-      inertia_request? && redirect_status?(status) && non_get_redirectable_method?
-    end
+      def non_get_redirectable_method?
+        ['PUT', 'PATCH', 'DELETE'].include? request_method
+      end
 
-    def stale_inertia_get?
-      get? && stale_inertia_request?
-    end
+      def inertia_non_post_redirect?(status)
+        inertia_request? && redirect_status?(status) && non_get_redirectable_method?
+      end
 
-    def get?
-      request_method == 'GET'
-    end
+      def stale_inertia_get?
+        get? && stale_inertia_request?
+      end
 
-    def request_method
-      @env['REQUEST_METHOD']
-    end
+      def get?
+        request_method == 'GET'
+      end
 
-    def inertia_version
-      @env['HTTP_X_INERTIA_VERSION']
-    end
+      def request_method
+        @env['REQUEST_METHOD']
+      end
 
-    def inertia_request?
-      @env['HTTP_X_INERTIA'].present?
-    end
+      def inertia_version
+        @env['HTTP_X_INERTIA_VERSION']
+      end
 
-    def version_stale?
-      sent_version != saved_version
-    end
+      def inertia_request?
+        @env['HTTP_X_INERTIA'].present?
+      end
 
-    def sent_version
-      return nil if inertia_version.nil?
-      InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
-    end
+      def version_stale?
+        sent_version != saved_version
+      end
 
-    def saved_version
-      InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
-    end
+      def sent_version
+        return nil if inertia_version.nil?
+
+        InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
+      end
 
-    def force_refresh(request)
-      request.flash.keep
-      Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+      def saved_version
+        InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
+      end
+
+      def force_refresh(request)
+        request.flash.keep
+        Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+      end
     end
   end
 end
+

spec/inertia/middleware_spec.rb

@@ -28,6 +28,24 @@
 
       it { is_expected.to eq 303 }
     end
+
+    it 'is thread safe' do
+      delete_request_proc = -> { delete redirect_test_path, headers: { 'X-Inertia' => true } }
+      get_request_proc = -> { get empty_test_path }
+
+      statusses = []
+
+      threads = []
+
+      100.times do
+        threads << Thread.new { statusses << delete_request_proc.call }
+        threads << Thread.new { get_request_proc.call }
+      end
+
+      threads.each(&:join)
+
+      expect(statusses.uniq).to eq([303])
+    end
   end
 
   context 'a request not originating from inertia' do