inertia_rails 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7912624c7ea6f1c71a896b969b704d8ff329ee41a3d1bc7277c28900b35a6516
-  data.tar.gz: 30098f0f5dd3cf41987cd40f139a12259d5501375b85685ab0d427c0e69d230e
+  metadata.gz: 60a2f2a20da36323f792051d3a0c1327b3f085f78e8fed5906064e8892c516d9
+  data.tar.gz: c9a40fd17509def36b88862a671f98a4ed839f158ffd0959a66aba3023ee6084
 SHA512:
-  metadata.gz: a97f62fa00d4489ff8364e6b4f9914161a1394905e5830526ba0baa9ae6888ee933a4e7739e18aeb6969f470989fb4aba9031cb62f57b68ed89065ff433d4e54
-  data.tar.gz: e9d7b942b9e1b7f4cdb98e9941143b0e08501586266aac08390a510126233ffeca8328e75e9b0f63aea49d1d19820d02b97e65af0fb178bb822c8bf63ad9925c
+  metadata.gz: c136e534632a852b4d92ec7303cb5eba67fed88706cf28cc16e8bc541fda5320f9f09aa3e92f481951fe93390e30714813f0950bd67b75389b933634721d8dd5
+  data.tar.gz: b6f8568840f971249c90142afd6b20adf39b4d99a4864d952ddbedcbfdfb49884a6e35f9c419fd180d7abf50590bee70863f3766b94e6883a171b8995cef5f9e

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.11.1] - 2021-06-27
+
+* Fixed thread safety in the middleware. Thanks @caifara!
+
 ## [1.11.0] - 2021-03-23
 
 * Fixed the install generator. `installable?` was always returning false, preventing it from actually running.

data/README.md

@@ -1,14 +1,10 @@
-# Inertia.js Rails Adapter
-
-Visit [inertiajs.com](https://inertiajs.com/) to learn more.
+![image](https://user-images.githubusercontent.com/6599653/114456558-032e2200-9bab-11eb-88bc-a19897f417ba.png)
 
-# Note to pre Rubygems release users
 
-The initial version of the gem was named `inertia`; however, that name was not available on Rubygems. 
+# Inertia.js Rails Adapter
 
-The 1.0.0 version release on Rubygems is `inertia_rails`.
+Visit [inertiajs.com](https://inertiajs.com/) for installation instructions, documentation, and to learn more.
 
-The changes required are:
+*Maintained and sponsored by the team at [bellaWatt](https://bellawatt.com/)*
 
-1. Use `gem 'inertia_rails'` in your Gemfile (or `gem install inertia_rails`)
-2. Change any `Inertia.configure` calls to `InertiaRails.configure`
+[![bellaWatt Logo](https://user-images.githubusercontent.com/6599653/114456832-5607d980-9bab-11eb-99c8-ab39867c384e.png)](https://bellawatt.com/)

data/lib/inertia_rails/middleware.rb

@@ -5,79 +5,91 @@ module InertiaRails
     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
+

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails