inertia_rails 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca1386958c2d3e3c0b0dfbab50c7e59f5a21144c1fc879e62493dcd54bc11ef5
-  data.tar.gz: de0fc529f805b096ea8c567c2f9c78b9d30cd730aa2a8439f03b976d6e4e9a82
+  metadata.gz: b889c5a06cf6c9310b1d64c1e19a5e979aea7ba874c3014867a462386dd28937
+  data.tar.gz: c5e1bf21eb3ff8dc1e14ebadedf43bb82f8b1af6aa46680610ad4b0054d90b3b
 SHA512:
-  metadata.gz: bb44ba24fb2f5ef1e020824a31b806840be221da969d73b19404db03c537ff1cb38cb8500b15dbe456ede6e0aec451fa06652b1b7bfa387f5ab6f0f007972f18
-  data.tar.gz: 1db014d57a1a78a505e26b70b18f67e365b40829e7c8a847de29cd428ccb2882d6fb87a664758f6e77918cd7570132c05aecd102d5ed97eed5a72d73e68913cd
+  metadata.gz: 65a66ab26b16808a9b88467a6b579074f68ba68877c055b8d2e333422454041f3461ff4ab0a947f2a52572edd8bf1c88d62d6d32ec7a1c8bd6ca776158f756c0
+  data.tar.gz: 724961702c0bd5ffb53e427d8791f1064dcc080c4cbc253297f30207c0017065b0f2c12b4822c5969401582972810c8960fbc494884bebb32fe1df907e6a7d79

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.6.0] - 2020-11-20
+
+* Built in error sharing across redirects! adding `{ inertia: { errors: 'errors go here' } }` as an option in `redirect_to` will automatically feed an `errors` prop to whatever is rendered after the redirect.
+* Set content type to json for Inertia responses
+* Return the original response status with Inertia responses
+
 ## [1.5.0] - 2020-10-07
 
 * Test against multiple Rails versions in Github Actions

data/lib/inertia_rails/controller.rb

@@ -4,6 +4,13 @@ module InertiaRails
   module Controller
     extend ActiveSupport::Concern
 
+    included do
+      before_action do
+        # :inertia_errors are deleted from the session by the middleware
+        InertiaRails.share(errors: session[:inertia_errors]) if session[:inertia_errors].present?
+      end
+    end
+
     module ClassMethods
       def inertia_share(**args, &block)
         before_action do
@@ -17,5 +24,13 @@ module InertiaRails
       headers['X-Inertia-Location'] = url
       head :conflict
     end
+
+    def redirect_to(options = {}, response_options = {})
+      if (inertia_errors = response_options.fetch(:inertia, {}).fetch(:errors, nil))
+        session[:inertia_errors] = inertia_errors
+      end
+
+      super(options, response_options)
+    end
   end
 end

data/lib/inertia_rails/middleware.rb

@@ -3,41 +3,78 @@ module InertiaRails
     def initialize(app)
       @app = app
     end
-  
+
     def call(env)
+      @env = env
+
       status, headers, body = @app.call(env)
       request = ActionDispatch::Request.new(env)
 
       ::InertiaRails.reset!
-  
-      return [status, headers, body] unless env['HTTP_X_INERTIA'].present?
-  
-      return force_refresh(request) if stale?(env['REQUEST_METHOD'], env['HTTP_X_INERTIA_VERSION'])
-  
-      if is_redirect_status?(status) &&
-          is_non_get_redirectable_method?(env['REQUEST_METHOD'])
-        status = 303
-      end
-  
-      [status, headers, body]
-    end
-  
+
+      # Inertia errors are added to the session via redirect_to 
+      request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
+
+      status = 303 if inertia_non_post_redirect?(status)
+
+      return stale_inertia_get? ? force_refresh(request) : [status, headers, body]
+    end
+
     private
-  
-    def is_redirect_status?(status)
+
+    def keep_inertia_errors?(status)
+      redirect_status?(status) || stale_inertia_request?
+    end
+
+    def stale_inertia_request?
+      inertia_request? && version_stale?
+    end
+
+    def redirect_status?(status)
       [301, 302].include? status
     end
-  
-    def is_non_get_redirectable_method?(request_method)
+
+    def non_get_redirectable_method?
       ['PUT', 'PATCH', 'DELETE'].include? request_method
     end
-  
-    def stale?(request_method, inertia_version)
-      sent_version = InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
-      saved_version = InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
-      request_method == 'GET' && sent_version != saved_version
+
+    def inertia_non_post_redirect?(status)
+      inertia_request? && redirect_status?(status) && non_get_redirectable_method?
+    end
+
+    def stale_inertia_get?
+      get? && stale_inertia_request?
     end
-  
+
+    def get?
+      request_method == 'GET'
+    end
+
+    def request_method
+      @env['REQUEST_METHOD']
+    end
+
+    def inertia_version
+      @env['HTTP_X_INERTIA_VERSION']
+    end
+
+    def inertia_request?
+      @env['HTTP_X_INERTIA'].present?
+    end
+
+    def version_stale?
+      sent_version != saved_version
+    end
+
+    def sent_version
+      return nil if inertia_version.nil?
+      InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
+    end
+
+    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

data/lib/inertia_rails/renderer.rb

@@ -18,7 +18,7 @@ module InertiaRails
       if @request.headers['X-Inertia']
         @response.set_header('Vary', 'Accept')
         @response.set_header('X-Inertia', 'true')
-        @render_method.call json: page, status: 200
+        @render_method.call json: page, status: @response.status, content_type: Mime[:json]
       else
         @render_method.call template: 'inertia', layout: ::InertiaRails.layout, locals: (view_data).merge({page: page})
       end

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Inertia adapter for Rails