inertia_rails 1.6.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b889c5a06cf6c9310b1d64c1e19a5e979aea7ba874c3014867a462386dd28937
-  data.tar.gz: c5e1bf21eb3ff8dc1e14ebadedf43bb82f8b1af6aa46680610ad4b0054d90b3b
+  metadata.gz: 8b998cadfc3e3285f53cee917e812536b2d735099b738cde2c6aa215480d0a78
+  data.tar.gz: e4bbfbdfafbb994db348d3ef7d6c6082227b54a92f2f5588e0eaa72b833b7491
 SHA512:
-  metadata.gz: 65a66ab26b16808a9b88467a6b579074f68ba68877c055b8d2e333422454041f3461ff4ab0a947f2a52572edd8bf1c88d62d6d32ec7a1c8bd6ca776158f756c0
-  data.tar.gz: 724961702c0bd5ffb53e427d8791f1064dcc080c4cbc253297f30207c0017065b0f2c12b4822c5969401582972810c8960fbc494884bebb32fe1df907e6a7d79
+  metadata.gz: 3afe130f99ae9d4c22976c4aca5ab5309aa407da431551432c2d150066c8f8914a8f6a30995f36bf70326f6880cdaafe9727183dcd7b63dc77c130039ecfc06c
+  data.tar.gz: 7d68480b6f781ae9533d40a891f470dbb0478b9db6b037abe267c5b32ac661152790a4ae6c7b904356dd597e1aed6804ef0609c9f96064275b91a9cde89835af

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,26 @@ 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.1] - 2021-02-10
+
+* Define `redirect_to` and `redirect_back` as public methods for compatibility with other code using them
+
+## [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.

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/inertia_rails.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "responders"
 end

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

@@ -20,17 +20,31 @@ module InertiaRails
       end
     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
+
+    private
+
     def inertia_location(url)
       headers['X-Inertia-Location'] = url
       head :conflict
     end
 
-    def redirect_to(options = {}, response_options = {})
-      if (inertia_errors = response_options.fetch(:inertia, {}).fetch(:errors, nil))
+    def capture_inertia_errors(options)
+      if (inertia_errors = options.dig(:inertia, :errors))
         session[:inertia_errors] = inertia_errors
       end
-
-      super(options, response_options)
     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/renderer.rb

@@ -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.6.0"
+  VERSION = "1.9.1"
 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.6.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,6 +110,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - brain@bellawatt.com
@@ -129,6 +143,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 +151,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 +166,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: