inertia_rails 3.1.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b3768cf7f6b1a5551c999666848f0df4357d13ccb7a961025c390aac4c67756
-  data.tar.gz: 4f01d96c927dc9f81bcd519954681d9192ec9606fa3884d26e4860c8ea3999cd
+  metadata.gz: 617a4b404988a934d8bfb0ce176965bec8f09d99dcb167322579152597c75261
+  data.tar.gz: 739e59619439d641ef16dd0816eaab093beb28990624397509a4f1c3b0fc40c6
 SHA512:
-  metadata.gz: 74b32a38b4e9f4bd10f6619467b60dd0b176226f5b83f5ed924ed095523bdbb61cdd6eb2679320f44b087fc286c32e594c49ffb9cf48506236127ea887e0db93
-  data.tar.gz: c92169d183122b11dac0d4ea6b66b22072d0c586080f424d172561c18db2c3d1a6f2939c4a22cbadab33a23346d9c4c246de67b663929ba1bd8df76177572796
+  metadata.gz: cc2dcfbdc024ea9a3e83bbd7f0d5afb1be1d14e753d776417f4dbfd7f6bd6e3cdc50e307b73d5495a67b8419ed29b4d2863f467bbf858383504bc7e62920e1ea
+  data.tar.gz: 825b82f4daf26c050c7fe703da03834143a866b2db9728cbb56dface555f4453e984b82038d61bef5e5ce40aa80ef295ef1def1b29794cdc0ef93f6f53a48267

data/.gitignore

@@ -20,3 +20,6 @@
 
 # Appraisal
 gemfiles/*.gemfile.lock
+
+# Local files, such as .env.development.local
+*.local

data/CHANGELOG.md

@@ -4,6 +4,19 @@ 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).
 
+## [3.3.0] - 2024-10-27
+
+* Refactor Inertia configuration into a controller class method. Thanks @ElMassimo!
+* Documentation updates. Thanks @osbre and @austenmadden!
+* Further fixes to the `Vary` header. Thanks @skryukov!
+* Add configuration option for the component path in the renderer.
+
+## [3.2.0] - 2024-06-19
+
+* Refactor the internals of shared Inertia data to use controller instance variables instead of module level variables that run a higher risk of being leaked between requests. Big thanks to @ledermann for the initial work many years ago and to @PedroAugustoRamalhoDuarte for finishing it up!
+* Change the Inertia response to set the `Vary` header to `X-Inertia` instead of `Accept`, Thanks @osbre!
+* Always set the `XSRF-TOKEN` in an `after_action` request instead of only on non-Inertia requests. This fixes a bug where logging out (and resetting the session) via Inertia would create a CSRF token mismatch on a subsequent Inertia request (until you manually hard refreshed the page). Thanks @jordanhiltunen!
+
 ## [3.1.4] - 2024-04-28
 
 * Reset Inertia shared data after each RSpec example where `inertia: true` is used. Thanks @coreyaus!

data/README.md

@@ -7,14 +7,26 @@
 
 ### Backend
 
-Just add the inertia rails gem to your Gemfile
+Add the `inertia_rails` gem to your Gemfile.
+
 ```ruby
 gem 'inertia_rails'
 ```
 
+For more instructions, see [Server-side setup](https://inertia-rails.netlify.app/guide/server-side-setup.html).
+
 ### Frontend
 
-Rails 7 specific frontend docs coming soon. For now, check out the official Inertia docs at https://inertiajs.com/ or see an example using React/Vite [here](https://github.com/BrandonShar/inertia-rails-template)
+We are discussing on bringing official docs for Inertia Rails to this repo, as
+the [official docs](https://inertiajs.com/client-side-setup) are specific to Laravel.
+
+In the meantime, you can refer to the community-maintained [Client-side setup](https://inertia-rails.netlify.app/guide/client-side-setup.html).
+
+Examples:
+
+- [React/Vite](https://github.com/BrandonShar/inertia-rails-template)
+- [React/Vite + SSR](https://github.com/ElMassimo/inertia-rails-ssr-template)
+- [PingCRM with Vue and Vite](https://github.com/ledermann/pingcrm)
 
 ## Usage
 
@@ -63,12 +75,24 @@ end
 In order to use instance props, you must call `use_inertia_instance_props` on the controller (or a base controller it inherits from). If any props are provided manually, instance props
 are automatically disabled for that response. Instance props are only included if they are defined after the before filter is set from `use_inertia_instance_props`.
 
-Automatic component name is also opt in, you must set the `default_render` config value to `true`. Otherwise, you can simply `render inertia: true` for the same behavior explicitly. 
+Automatic component name is also opt in, you must set the [`default_render`](#default_render) config value to `true`. Otherwise, you can simply `render inertia: true` for the same behavior explicitly.
+
+If the default component path doesn't match your convention, you can define a method to resolve it however you like via the `component_path_resolver` config value. The value of this should be callable and will receive the path and action and should return a string component path.
+
+```ruby
+inertia_config(
+  component_path_resolver: ->(path:, action:) do
+    "Storefront/#{path.camelize}/#{action.camelize}"
+  end
+)
+
+```
+
+
 
 ### Layout 
 
-Inertia layouts use the rails layout convention and can be set or changed in the same way. The original `layout` config option is still functional, but will likely be deprecated in the future in favor
-of using rails layouts.
+Inertia layouts use the rails layout convention and can be set or changed in the same way.
 
 ```ruby
 class EventsController < ApplicationController
@@ -133,20 +157,14 @@ end
 }
 ```
 
-Deep merging can be set as the project wide default via the InertiaRails configuration:
+Deep merging can be configured using the [`deep_merge_shared_data`](#deep_merge_shared_data) configuration option.
 
-```ruby
-# config/initializers/some_initializer.rb
-InertiaRails.configure do |config|
-  config.deep_merge_shared_data = true
-end
-
-```
-
-If deep merging is enabled by default, it's possible to opt out within the action:
+If deep merging is enabled, you can still opt-out within the action:
 
 ```ruby
 class CrazyScorersController < ApplicationController
+  inertia_config(deep_merge_shared_data: true)
+
   inertia_share do
     {
       basketball_data: {
@@ -163,7 +181,7 @@ class CrazyScorersController < ApplicationController
   end
 end
 
-# Even if deep merging is set by default, since the renderer has `deep_merge: false`, it will send a shallow merge to the frontend:
+# `deep_merge: false` overrides the default:
 {
   basketball_data: {
     points: 100,
@@ -177,6 +195,9 @@ On the front end, Inertia supports the concept of "partial reloads" where only t
 
 ```ruby
   inertia_share some_data: InertiaRails.lazy(lambda { some_very_slow_method })
+
+  # Using a Ruby block syntax
+  inertia_share some_data: InertiaRails.lazy { some_very_slow_method }
 ```
 
 ### Routing
@@ -187,34 +208,85 @@ If you don't need a controller to handle a static component, you can route direc
 inertia 'about' => 'AboutComponent'
 ```
 
-### SSR
+### SSR _(experimental)_
+
+Enable SSR via the configuration options for [`ssr_enabled`](#ssr_enabled-experimental) and [`ssr_url`](#ssr_url-experimental).
+
+When using SSR, don't forget to add `<%= inertia_ssr_head %>` to the `<head>` of your layout (i.e. `application.html.erb`).
 
-Enable SSR via the config settings for `ssr_enabled` and `ssr_url`.
+## Configuration ⚙️
 
-When using SSR, don't forget to add `<%= inertia_headers %>` to the `<head>` of your `application.html.erb`.
+Inertia Rails can be configured globally or in a specific controller (and subclasses).
 
-## Configuration
+### Global Configuration
 
-Inertia Rails has a few different configuration options that can be set anywhere, but the most common location is from within an initializer.
+If using global configuration, we recommend you place the code inside an initializer:
 
-The default config is shown below
 ```ruby
+# config/initializers/inertia.rb
+
 InertiaRails.configure do |config|
-  
-  # set the current version for automatic asset refreshing. A string value should be used if any.
-  config.version = nil
-  # enable default inertia rendering (warning! this will override rails default rendering behavior)
-  config.default_render = true
-  
-  # ssr specific options
-  config.ssr_enabled = false
-  config.ssr_url = 'http://localhost:13714'
+  # Example: force a full-reload if the deployed assets change.
+  config.version = ViteRuby.digest
+end
+```
 
-  config.deep_merge_shared_data = false
-  
+The default configuration can be found [here](https://github.com/inertiajs/inertia-rails/blob/master/lib/inertia_rails/configuration.rb#L5-L22).
+
+### Local Configuration
+
+Use `inertia_config` in your controllers to override global settings:
+
+```ruby
+class EventsController < ApplicationController
+  inertia_config(
+    version: "events-#{InertiaRails.configuration.version}",
+    ssr_enabled: -> { action_name == "index" },
+  )
 end
 ```
 
+### Configuration Options
+
+#### `version` _(recommended)_
+
+  This allows Inertia to detect if the app running in the client is oudated,
+  forcing a full page visit instead of an XHR visit on the next request.
+
+  See [assets versioning](https://inertiajs.com/asset-versioning).
+
+  __Default__: `nil`
+
+#### `deep_merge_shared_data`
+
+  When enabled, props will be deep merged with shared data, combining hashes
+  with the same keys instead of replacing them.
+
+  __Default__: `false`
+
+#### `default_render`
+
+  Overrides Rails default rendering behavior to render using Inertia by default.
+
+  __Default__: `false`
+
+#### `ssr_enabled` _(experimental)_
+
+  Whether to use a JavaScript server to pre-render your JavaScript pages,
+  allowing your visitors to receive fully rendered HTML when they first visit
+  your application.
+
+  Requires a JS server to be available at `ssr_url`. [_Example_](https://github.com/ElMassimo/inertia-rails-ssr-template)
+
+  __Default__: `false`
+
+#### `ssr_url` _(experimental)_
+
+  The URL of the JS server that will pre-render the app using the specified
+  component and props.
+
+  __Default__: `"http://localhost:13714"`
+
 ## Testing
 
 If you're using Rspec, Inertia Rails comes with some nice test helpers to make things simple. 

data/bin/console

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "inertia_rails/rails"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "rubygems"
+require "bundler/setup"
+require "rails/all"
+require "inertia_rails"
 
 require "irb"
 IRB.start(__FILE__)

data/inertia_rails.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = "inertia_rails"
   spec.version       = InertiaRails::VERSION
   spec.authors       = ["Brian Knoles", "Brandon Shar", "Eugene Granovsky"]
-  spec.email         = ["brain@bellawatt.com", "brandon@bellawatt.com", "eugene@bellawatt.com"]
+  spec.email         = ["brian@bellawatt.com", "brandon@bellawatt.com", "eugene@bellawatt.com"]
 
   spec.summary       = %q{Inertia adapter for Rails}
   spec.homepage      = "https://github.com/inertiajs/inertia-rails"

data/lib/inertia_rails/configuration.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  class Configuration
+    DEFAULTS = {
+      # Whether to combine hashes with the same keys instead of replacing them.
+      deep_merge_shared_data: false,
+
+      # Overrides Rails default rendering behavior to render using Inertia by default.
+      default_render: false,
+
+      # Allows the user to hook into the default rendering behavior and change it to fit their needs
+      component_path_resolver: ->(path:, action:) { "#{path}/#{action}" },
+
+      # DEPRECATED: Let Rails decide which layout should be used based on the
+      # controller configuration.
+      layout: true,
+
+      # SSR options.
+      ssr_enabled: false,
+      ssr_url: 'http://localhost:13714',
+
+      # Used to detect version drift between server and client.
+      version: nil,
+    }.freeze
+
+    OPTION_NAMES = DEFAULTS.keys.freeze
+
+    protected attr_reader :controller
+    protected attr_reader :options
+
+    def initialize(controller: nil, **attrs)
+      @controller = controller
+      @options = attrs.extract!(*OPTION_NAMES)
+
+      unless attrs.empty?
+        raise ArgumentError, "Unknown options for #{self.class}: #{attrs.keys}"
+      end
+    end
+
+    def bind_controller(controller)
+      Configuration.new(**@options, controller: controller)
+    end
+
+    def freeze
+      @options.freeze
+      super
+    end
+
+    def merge!(config)
+      @options.merge!(config.options)
+      self
+    end
+
+    def merge(config)
+      Configuration.new(**@options.merge(config.options))
+    end
+
+    # Internal: Finalizes the configuration for a specific controller.
+    def with_defaults(config)
+      @options = config.options.merge(@options)
+      freeze
+    end
+
+    def component_path_resolver(path:, action:)
+      @options[:component_path_resolver].call(path:, action:)
+    end
+
+    OPTION_NAMES.each do |option|
+      define_method(option) {
+        evaluate_option @options[option]
+      } unless method_defined?(option)
+      define_method("#{option}=") { |value|
+        @options[option] = value
+      }
+    end
+
+    def self.default
+      new(**DEFAULTS)
+    end
+
+  private
+
+    def evaluate_option(value)
+      return value unless value.respond_to?(:call)
+      return value.call unless controller
+      controller.instance_exec(&value)
+    end
+  end
+end

data/lib/inertia_rails/controller.rb

@@ -6,22 +6,27 @@ module InertiaRails
     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
       helper ::InertiaRails::Helper
 
       after_action do
-        cookies['XSRF-TOKEN'] = form_authenticity_token unless request.inertia? || !protect_against_forgery?
+        cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
       end
     end
 
     module ClassMethods
-      def inertia_share(**args, &block)
-        before_action do
-          InertiaRails.share(**args) if args
-          InertiaRails.share_block(block) if block
+      def inertia_share(attrs = {}, &block)
+        @inertia_share ||= []
+        @inertia_share << attrs.freeze unless attrs.empty?
+        @inertia_share << block if block
+      end
+
+      def inertia_config(**attrs)
+        config = InertiaRails::Configuration.new(**attrs)
+
+        if @inertia_config
+          @inertia_config.merge!(config)
+        else
+          @inertia_config = config
         end
       end
 
@@ -31,10 +36,29 @@ module InertiaRails
           @_inertia_skip_props = view_assigns.keys + ['_inertia_skip_props']
         end
       end
+
+      def _inertia_configuration
+        @_inertia_configuration ||= begin
+          config = superclass.try(:_inertia_configuration) || ::InertiaRails.configuration
+          @inertia_config&.with_defaults(config) || config
+        end
+      end
+
+      def _inertia_shared_data
+        @_inertia_shared_data ||= begin
+          shared_data = superclass.try(:_inertia_shared_data)
+
+          if @inertia_share && shared_data.present?
+            shared_data + @inertia_share.freeze
+          else
+            @inertia_share || shared_data || []
+          end.freeze
+        end
+      end
     end
 
     def default_render
-      if InertiaRails.default_render?
+      if inertia_configuration.default_render
         render(inertia: true)
       else
         super
@@ -55,19 +79,27 @@ module InertiaRails
       )
     end
 
+    private
+
     def inertia_view_assigns
       return {} unless @_inertia_instance_props
       view_assigns.except(*@_inertia_skip_props)
     end
 
-    private
+    def inertia_configuration
+      self.class._inertia_configuration.bind_controller(self)
+    end
 
-    def inertia_layout
-      layout = ::InertiaRails.layout
+    def inertia_shared_data
+      initial_data = session[:inertia_errors].present? ? {errors: session[:inertia_errors]} : {}
 
-      # When the global configuration is not set, let Rails decide which layout
-      # should be used based on the controller configuration.
-      layout.nil? ? true : layout
+      self.class._inertia_shared_data.filter_map { |shared_data|
+        if shared_data.respond_to?(:call)
+          instance_exec(&shared_data)
+        else
+          shared_data
+        end
+      }.reduce(initial_data, &:merge)
     end
 
     def inertia_location(url)

data/lib/inertia_rails/helper.rb

@@ -1,7 +1,14 @@
 require_relative 'inertia_rails'
 
 module InertiaRails::Helper
+  def inertia_ssr_head
+    controller.instance_variable_get("@_inertia_ssr_head")
+  end
+
   def inertia_headers
-    ::InertiaRails.html_headers.join.html_safe
+    InertiaRails.deprecator.warn(
+      "`inertia_headers` is deprecated and will be removed in InertiaRails 4.0, use `inertia_ssr_head` instead."
+    )
+    inertia_ssr_head
   end
 end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,106 +1,20 @@
 # Needed for `thread_mattr_accessor`
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
 require 'inertia_rails/lazy'
+require 'inertia_rails/configuration'
 
 module InertiaRails
-  thread_mattr_accessor :threadsafe_shared_plain_data
-  thread_mattr_accessor :threadsafe_shared_blocks
-  thread_mattr_accessor :threadsafe_html_headers
+  CONFIGURATION = Configuration.default
 
   def self.configure
-    yield(Configuration)
+    yield(CONFIGURATION)
   end
 
-  # "Getters"
-  def self.shared_data(controller)
-    shared_plain_data.
-      merge!(evaluated_blocks(controller, shared_blocks))
-  end
-
-  def self.version
-    Configuration.evaluated_version
-  end
-
-  def self.layout
-    Configuration.layout
-  end
-
-  def self.ssr_enabled?
-    Configuration.ssr_enabled
-  end
-
-  def self.ssr_url
-    Configuration.ssr_url
-  end
-
-  def self.default_render?
-    Configuration.default_render
-  end 
-
-  def self.html_headers
-    self.threadsafe_html_headers || []
-  end
-
-  def self.deep_merge_shared_data?
-    Configuration.deep_merge_shared_data
-  end
-
-  # "Setters"
-  def self.share(**args)
-    self.shared_plain_data = self.shared_plain_data.merge(args)
-  end
-
-  def self.share_block(block)
-    self.shared_blocks = self.shared_blocks + [block]
-  end
-
-  def self.html_headers=(headers)
-    self.threadsafe_html_headers = headers
-  end
-
-  def self.reset!
-    self.shared_plain_data = {}
-    self.shared_blocks = []
-    self.html_headers = []
+  def self.configuration
+    CONFIGURATION
   end
 
   def self.lazy(value = nil, &block)
     InertiaRails::Lazy.new(value, &block)
   end
-
-  private
-
-  module Configuration
-    mattr_accessor(:layout) { nil }
-    mattr_accessor(:version) { nil }
-    mattr_accessor(:ssr_enabled) { false }
-    mattr_accessor(:ssr_url) { 'http://localhost:13714' }
-    mattr_accessor(:default_render) { false }
-    mattr_accessor(:deep_merge_shared_data) { false }
-
-    def self.evaluated_version
-      self.version.respond_to?(:call) ? self.version.call : self.version
-    end
-  end
-
-  # Getters and setters to provide default values for the threadsafe attributes
-  def self.shared_plain_data
-    self.threadsafe_shared_plain_data || {}
-  end
-
-  def self.shared_plain_data=(val)
-    self.threadsafe_shared_plain_data = val
-  end
-
-  def self.shared_blocks
-    self.threadsafe_shared_blocks || []
-  end
-
-  def self.shared_blocks=(val)
-    self.threadsafe_shared_blocks = val
-  end
-
-  def self.evaluated_blocks(controller,  blocks)
-    blocks.flat_map { |block| controller.instance_exec(&block) }.reduce(&:merge) || {}
-  end
 end

data/lib/inertia_rails/middleware.rb

@@ -5,10 +5,7 @@ module InertiaRails
     end
 
     def call(env)
-      InertiaRailsRequest.new(@app, env)
-                         .response
-    ensure
-      ::InertiaRails.reset!
+      InertiaRailsRequest.new(@app, env).response
     end
 
     class InertiaRailsRequest
@@ -22,7 +19,7 @@ module InertiaRails
         status, headers, body = @app.call(@env)
         request = ActionDispatch::Request.new(@env)
 
-        # Inertia errors are added to the session via redirect_to 
+        # 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)
@@ -60,11 +57,15 @@ module InertiaRails
         request_method == 'GET'
       end
 
+      def controller
+        @env["action_controller.instance"]
+      end
+
       def request_method
         @env['REQUEST_METHOD']
       end
 
-      def inertia_version
+      def client_version
         @env['HTTP_X_INERTIA_VERSION']
       end
 
@@ -73,17 +74,15 @@ module InertiaRails
       end
 
       def version_stale?
-        sent_version != saved_version
+        coerce_version(client_version) != coerce_version(server_version)
       end
 
-      def sent_version
-        return nil if inertia_version.nil?
-
-        InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
+      def server_version
+        controller&.send(:inertia_configuration)&.version
       end
 
-      def saved_version
-        InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
+      def coerce_version(version)
+        server_version.is_a?(Numeric) ? version.to_f : version
       end
 
       def force_refresh(request)
@@ -97,4 +96,3 @@ module InertiaRails
     end
   end
 end
-

data/lib/inertia_rails/renderer.rb

@@ -4,51 +4,71 @@ require_relative "inertia_rails"
 
 module InertiaRails
   class Renderer
-    attr_reader :component, :view_data
+    attr_reader(
+      :component,
+      :configuration,
+      :controller,
+      :props,
+      :view_data,
+    )
 
     def initialize(component, controller, request, response, render_method, props: nil, view_data: nil, deep_merge: nil)
-      @component = component.is_a?(TrueClass) ? "#{controller.controller_path}/#{controller.action_name}" : component
       @controller = controller
+      @configuration = controller.__send__(:inertia_configuration)
+      @component = resolve_component(component)
       @request = request
       @response = response
       @render_method = render_method
-      @props = props ? props : controller.inertia_view_assigns
+      @props = props || controller.__send__(:inertia_view_assigns)
       @view_data = view_data || {}
-      @deep_merge = !deep_merge.nil? ? deep_merge : InertiaRails.deep_merge_shared_data?
+      @deep_merge = !deep_merge.nil? ? deep_merge : configuration.deep_merge_shared_data
     end
 
     def render
+      if @response.headers["Vary"].blank?
+        @response.headers["Vary"] = 'X-Inertia'
+      else
+        @response.headers["Vary"] = "#{@response.headers["Vary"]}, X-Inertia"
+      end
       if @request.headers['X-Inertia']
-        @response.set_header('Vary', 'Accept')
         @response.set_header('X-Inertia', 'true')
         @render_method.call json: page, status: @response.status, content_type: Mime[:json]
       else
-        return render_ssr if ::InertiaRails.ssr_enabled? rescue nil
-        @render_method.call template: 'inertia', layout: layout, locals: (view_data).merge({page: page})
+        return render_ssr if configuration.ssr_enabled rescue nil
+        @render_method.call template: 'inertia', layout: layout, locals: view_data.merge(page: page)
       end
     end
 
     private
 
     def render_ssr
-      uri = URI("#{::InertiaRails.ssr_url}/render")
+      uri = URI("#{configuration.ssr_url}/render")
       res = JSON.parse(Net::HTTP.post(uri, page.to_json, 'Content-Type' => 'application/json').body)
-      
-      ::InertiaRails.html_headers = res['head']
-      @render_method.call html: res['body'].html_safe, layout: layout, locals: (view_data).merge({page: page})
+
+      controller.instance_variable_set("@_inertia_ssr_head", res['head'].join.html_safe)
+      @render_method.call html: res['body'].html_safe, layout: layout, locals: view_data.merge(page: page)
     end
 
     def layout
-      @controller.send(:inertia_layout)
+      layout = configuration.layout
+      layout.nil? ? true : layout
+    end
+
+    def shared_data
+      controller.__send__(:inertia_shared_data)
+    end
+
+    # Cast props to symbol keyed hash before merging so that we have a consistent data structure and
+    # avoid duplicate keys after merging.
+    #
+    # Functionally, this permits using either string or symbol keys in the controller. Since the results
+    # is cast to json, we should treat string/symbol keys as identical.
+    def merge_props(shared_data, props)
+      shared_data.deep_symbolize_keys.send(@deep_merge ? :deep_merge : :merge, props.deep_symbolize_keys)
     end
 
     def computed_props
-      # Cast props to symbol keyed hash before merging so that we have a consistent data structure and
-      # avoid duplicate keys after merging.
-      #
-      # Functionally, this permits using either string or symbol keys in the controller. Since the results
-      # is cast to json, we should treat string/symbol keys as identical.
-      _props = ::InertiaRails.shared_data(@controller).deep_symbolize_keys.send(prop_merge_method, @props.deep_symbolize_keys).select do |key, prop|
+      _props = merge_props(shared_data, props).select do |key, prop|
         if rendering_partial_component?
           key.in? partial_keys
         else
@@ -59,7 +79,7 @@ module InertiaRails
       deep_transform_values(
         _props,
         lambda do |prop|
-          prop.respond_to?(:call) ? @controller.instance_exec(&prop) : prop
+          prop.respond_to?(:call) ? controller.instance_exec(&prop) : prop
         end
       )
     end
@@ -69,7 +89,7 @@ module InertiaRails
         component: component,
         props: computed_props,
         url: @request.original_fullpath,
-        version: ::InertiaRails.version,
+        version: configuration.version,
       }
     end
 
@@ -87,8 +107,10 @@ module InertiaRails
       @request.inertia_partial? && @request.headers['X-Inertia-Partial-Component'] == component
     end
 
-    def prop_merge_method
-      @deep_merge ? :deep_merge : :merge
+    def resolve_component(component)
+      return component unless component.is_a? TrueClass
+
+      configuration.component_path_resolver(path: controller.controller_path, action: controller.action_name)
     end
   end
 end

data/lib/inertia_rails/rspec.rb

@@ -25,9 +25,16 @@ module InertiaRails
       protected
     
       def set_values(params)
-        @view_data = params[:locals].except(:page)
-        @props = params[:locals][:page][:props]
-        @component = params[:locals][:page][:component]
+        if params[:locals].present?
+          @view_data = params[:locals].except(:page)
+          @props = params[:locals][:page][:props]
+          @component = params[:locals][:page][:component]
+        else
+          # Sequential Inertia request
+          @view_data = {}
+          @props = params[:json][:props]
+          @component = params[:json][:component]
+        end
       end
     end
 
@@ -65,7 +72,6 @@ RSpec.configure do |config|
   }
 
   config.before(:each, inertia: true) do
-    ::InertiaRails.reset!
     new_renderer = InertiaRails::Renderer.method(:new)
     allow(InertiaRails::Renderer).to receive(:new) do |component, controller, request, response, render, named_args|
       new_renderer.call(component, controller, request, response, inertia_wrap_render(render), **named_args)

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "3.1.4"
+  VERSION = "3.3.0"
 end

data/lib/inertia_rails.rb

@@ -21,4 +21,8 @@ end
 
 module InertiaRails
   class Error < StandardError; end
+
+  def self.deprecator # :nodoc:
+    @deprecator ||= ActiveSupport::Deprecation.new
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.3.0
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -126,7 +126,7 @@ dependencies:
         version: '0'
 description:
 email:
-- brain@bellawatt.com
+- brian@bellawatt.com
 - brandon@bellawatt.com
 - eugene@bellawatt.com
 executables: []
@@ -156,6 +156,7 @@ files:
 - lib/generators/inertia_rails/install/vue/inertia.js
 - lib/generators/inertia_rails/install_generator.rb
 - lib/inertia_rails.rb
+- lib/inertia_rails/configuration.rb
 - lib/inertia_rails/controller.rb
 - lib/inertia_rails/engine.rb
 - lib/inertia_rails/helper.rb
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Inertia adapter for Rails