inertia_rails 1.5.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca1386958c2d3e3c0b0dfbab50c7e59f5a21144c1fc879e62493dcd54bc11ef5
-  data.tar.gz: de0fc529f805b096ea8c567c2f9c78b9d30cd730aa2a8439f03b976d6e4e9a82
+  metadata.gz: 4a3b7e29654788cf3c7ac7307d83fd258d47c7ee5daa36745998c944ae31b472
+  data.tar.gz: 4070f2fb9ae9d253a94c98d7f8705f713248788b63611bfa30f36edaaa15a73e
 SHA512:
-  metadata.gz: bb44ba24fb2f5ef1e020824a31b806840be221da969d73b19404db03c537ff1cb38cb8500b15dbe456ede6e0aec451fa06652b1b7bfa387f5ab6f0f007972f18
-  data.tar.gz: 1db014d57a1a78a505e26b70b18f67e365b40829e7c8a847de29cd428ccb2882d6fb87a664758f6e77918cd7570132c05aecd102d5ed97eed5a72d73e68913cd
+  metadata.gz: 2aa986d0e69a1db45d94ca921771e7ff82ec61c53008dbf756b9eed3728837d314ee773e12acd27a98fcb1372d67f44653fa749ef24b2959759849b2be925ae9
+  data.tar.gz: ab880524135f77d437aeb4c8dfa1e3e23ddc69db5d99a5adea6139d17331db7981f691921ae10b84d41122d06fc1a01a456af902ed3fcde704fb9d4bf1b9f08a

data/.github/workflows/push.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [2.6, 2.7]
-        rails: ['5.0', '5.1', '5.2', '6.0']
+        rails: ['5.0', '5.1', '5.2', '6.0', '6.1']
 
     runs-on: ubuntu-latest
     name: Test against Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}

data/Appraisals

@@ -1,3 +1,7 @@
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.0"
+end
+
 appraise "rails-6.0" do
   gem "rails", "~> 6.0.3", '>= 6.0.3.2'
 end

data/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.9.0] - 2021-01-17
+
+* Added the same inertia awareness that redirect_to has to redirect_back
+
+## [1.8.0] - 2020-12-08
+
+* Add `inertia` route helper feature
+
+## [1.7.1] - 2020-11-24
+
+* Fix the definition for InertiaRails::Lazy to avoid an uninitialized constant error when booting an application. 
+
+## [1.7.0] - 2020-11-24
+
+* Add support for "lazy" props while rendering. These are props that never compute on the initial page load. The only render during a partial update that calls for them explicitly.
+
+## [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/app/controllers/inertia_rails/static_controller.rb

@@ -0,0 +1,7 @@
+module InertiaRails
+  class StaticController < ::ApplicationController
+    def static
+      render inertia: params[:component]
+    end
+  end
+end

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/inertia_rails.rb

@@ -4,6 +4,7 @@ require 'inertia_rails/engine'
 require 'patches/debug_exceptions'
 require 'patches/better_errors'
 require 'patches/request'
+require 'patches/mapper'
 
 ActionController::Renderers.add :inertia do |component, options|
   InertiaRails::Renderer.new(

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
@@ -13,9 +20,31 @@ module InertiaRails
       end
     end
 
+    private
+
     def inertia_location(url)
       headers['X-Inertia-Location'] = url
       head :conflict
     end
+
+    def redirect_to(options = {}, response_options = {})
+      capture_inertia_errors(response_options)
+      super(options, response_options)
+    end
+
+    def redirect_back(fallback_location:, allow_other_host: true, **options)
+      capture_inertia_errors(options)
+      super(
+        fallback_location: fallback_location,
+        allow_other_host: allow_other_host,
+        **options,
+      )
+    end
+
+    def capture_inertia_errors(options)
+      if (inertia_errors = options.dig(:inertia, :errors))
+        session[:inertia_errors] = inertia_errors
+      end
+    end
   end
 end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,5 +1,6 @@
 # Needed for `thread_mattr_accessor`
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
+require 'inertia_rails/lazy'
 
 module InertiaRails
   thread_mattr_accessor :threadsafe_shared_plain_data
@@ -36,6 +37,10 @@ module InertiaRails
     self.shared_blocks = []
   end
 
+  def self.lazy(value = nil, &block)
+    InertiaRails::Lazy.new(value, &block)
+  end
+
   private
 
   module Configuration

data/lib/inertia_rails/lazy.rb

@@ -0,0 +1,28 @@
+module InertiaRails
+  class Lazy
+    def initialize(value = nil, &block)
+      @value = value
+      @block = block
+    end
+
+    def call
+      to_proc.call
+    end
+
+    def to_proc
+      # This is called by controller.instance_exec, which changes self to the
+      # controller instance. That makes the instance variables unavailable to the
+      # proc via closure. Copying the instance variables to local variables before
+      # the proc is returned keeps them in scope for the returned proc.
+      value = @value
+      block = @block
+      if value.respond_to?(:call)
+        value
+      elsif value
+        Proc.new { value }
+      else
+        block
+      end
+    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
@@ -27,13 +27,13 @@ module InertiaRails
     private
 
     def props
-      only = (@request.headers['X-Inertia-Partial-Data'] || '').split(',').compact.map(&:to_sym)
-
-      _props = ::InertiaRails.shared_data(@controller).merge(@props)
-
-      _props = (only.any? && @request.headers['X-Inertia-Partial-Component'] == component) ?
-        _props.select {|key| key.in? only} :
-        _props
+      _props = ::InertiaRails.shared_data(@controller).merge(@props).select do |key, prop|
+        if rendering_partial_component?
+          key.in? partial_keys
+        else
+          !prop.is_a?(InertiaRails::Lazy)
+        end
+      end
 
       deep_transform_values(_props, lambda {|prop| prop.respond_to?(:call) ? @controller.instance_exec(&prop) : prop })
     end
@@ -52,5 +52,13 @@ module InertiaRails
 
       hash.transform_values {|value| deep_transform_values(value, proc)}
     end
+
+    def partial_keys
+      (@request.headers['X-Inertia-Partial-Data'] || '').split(',').compact.map(&:to_sym)
+    end
+
+    def rendering_partial_component?
+      @request.inertia_partial? && @request.headers['X-Inertia-Partial-Component'] == component
+    end
   end
 end

data/lib/inertia_rails/version.rb

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

data/lib/patches/mapper.rb

@@ -0,0 +1,8 @@
+ActionDispatch::Routing::Mapper.class_eval do
+  def inertia(args, &block)
+    route = args.keys.first
+    component = args.values.first
+
+    get(route => 'inertia_rails/static#static', defaults: {component: component})
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.9.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: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/inertia_rails/static_controller.rb
 - app/views/inertia.html.erb
 - bin/console
 - bin/setup
@@ -136,11 +137,13 @@ files:
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - inertia_rails.gemspec
 - lib/inertia_rails.rb
 - lib/inertia_rails/controller.rb
 - lib/inertia_rails/engine.rb
 - lib/inertia_rails/inertia_rails.rb
+- lib/inertia_rails/lazy.rb
 - lib/inertia_rails/middleware.rb
 - lib/inertia_rails/renderer.rb
 - lib/inertia_rails/rspec.rb
@@ -149,6 +152,7 @@ files:
 - lib/patches/debug_exceptions.rb
 - lib/patches/debug_exceptions/patch-5-0.rb
 - lib/patches/debug_exceptions/patch-5-1.rb
+- lib/patches/mapper.rb
 - lib/patches/request.rb
 homepage: https://github.com/inertiajs/inertia-rails
 licenses:
@@ -172,7 +176,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