inertia_rails 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23cbc78f6ae041fed8c26c46f5da887291f40d96bb755386ad888fdfe545343c
-  data.tar.gz: 26839f99bcdc7bc96cf6a82d5aa4730688c6c019089b82041020b4e0896b7549
+  metadata.gz: 9c17e6224188fa7a4299b694eb6747091f20259c78a05d26604cac21ed52d8eb
+  data.tar.gz: cf0fc91563c2f5ec178fcf815132354c245eb7ceb6ce0dda7f7f4d29339a57fe
 SHA512:
-  metadata.gz: 134e4664360f7a72f6d38e47153c49348b38eae52b765f0c9da5b7b62e4f48d1d9ed9986bfac6d729739a3954c5860f4348798ac6caca6256e692a13ce74d798
-  data.tar.gz: fafd03acd45c4be9c9cf01159fe2a54e0bdf174a4fb02fbd80d9cfc93b026b1693bbf68a0ad53c15db4894514655dab70408c8551422c16c43305ade43984058
+  metadata.gz: 677bc4c32845494734ef8b453ce2a0d9096803bdc9037701ccb09288ac0f815de1a4b9406687c7387aad6c82de329e5cd8eb2d5aa6275a539129849bd01a4c22
+  data.tar.gz: b8ae423e24556d08d4bd51413a0ebf84793f1f41e19c28784dbfc58aab2a8a7330767e5b60a22c3011e38366ace5db70ab62a4e932b1e379799d1c69da0ddd36

data/CHANGELOG.md

@@ -4,6 +4,15 @@ 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.8.0] - 2025-04-12
+
+* Docs updates
+* Fix template detection for scaffolds using Tailwind 4 (#202)
+* Improved inertia route helper (#201)
+* RSpec tweaks
+* Add inertia_rendering? helper method (#209)
+* Add support for new client-side deep merging option (#213)
+
 ## [3.7.1] - 2025-04-01
 
 * Docs updates

data/lib/inertia_rails/defer_prop.rb

@@ -6,16 +6,22 @@ module InertiaRails
 
     attr_reader :group
 
-    def initialize(group: nil, merge: nil, &block)
+    def initialize(group: nil, merge: nil, deep_merge: nil, &block)
+      raise ArgumentError, 'Cannot set both `deep_merge` and `merge` to true' if deep_merge && merge
+
       super(&block)
 
       @group = group || DEFAULT_GROUP
-      @merge = merge
-      @block = block
+      @merge = merge || deep_merge
+      @deep_merge = deep_merge
     end
 
     def merge?
       @merge
     end
+
+    def deep_merge?
+      @deep_merge
+    end
   end
 end

data/lib/inertia_rails/helper.rb

@@ -11,4 +11,8 @@ module InertiaRails::Helper
     )
     inertia_ssr_head
   end
+
+  def inertia_rendering?
+    controller.instance_variable_get("@_inertia_rendering")
+  end
 end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'inertia_rails/base_prop'
 require 'inertia_rails/ignore_on_first_load_prop'
 require 'inertia_rails/always_prop'
@@ -35,8 +37,12 @@ module InertiaRails
       MergeProp.new(&block)
     end
 
-    def defer(group: nil, merge: nil, &block)
-      DeferProp.new(group: group, merge: merge, &block)
+    def deep_merge(&block)
+      MergeProp.new(deep_merge: true, &block)
+    end
+
+    def defer(group: nil, merge: nil, deep_merge: nil, &block)
+      DeferProp.new(group: group, merge: merge, deep_merge: deep_merge, &block)
     end
   end
 end

data/lib/inertia_rails/merge_prop.rb

@@ -2,13 +2,17 @@
 
 module InertiaRails
   class MergeProp < BaseProp
-    def initialize(*)
-      super
-      @merge = true
+    def initialize(deep_merge: false, &block)
+      super(&block)
+      @deep_merge = deep_merge
     end
 
     def merge?
-      @merge
+      true
+    end
+
+    def deep_merge?
+      @deep_merge
     end
   end
 end

data/lib/inertia_rails/middleware.rb

@@ -47,7 +47,7 @@ module InertiaRails
       end
 
       def non_get_redirectable_method?
-        ['PUT', 'PATCH', 'DELETE'].include? request_method
+        %w[PUT PATCH DELETE].include? request_method
       end
 
       def inertia_non_post_redirect?(status)
@@ -63,7 +63,7 @@ module InertiaRails
       end
 
       def controller
-        @env["action_controller.instance"]
+        @env['action_controller.instance']
       end
 
       def request_method
@@ -83,7 +83,7 @@ module InertiaRails
       end
 
       def server_version
-        controller&.send(:inertia_configuration)&.version
+        (controller&.send(:inertia_configuration) || InertiaRails.configuration).version
       end
 
       def coerce_version(version)
@@ -92,7 +92,7 @@ module InertiaRails
 
       def force_refresh(request)
         request.flash.keep
-        Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+        Rack::Response.new('', 409, { 'X-Inertia-Location' => request.original_url }).finish
       end
 
       def copy_xsrf_to_csrf!

data/lib/inertia_rails/renderer.rb

@@ -6,9 +6,6 @@ require_relative 'inertia_rails'
 
 module InertiaRails
   class Renderer
-    KEEP_PROP = :keep
-    DONT_KEEP_PROP = :dont_keep
-
     attr_reader(
       :component,
       :configuration,
@@ -37,6 +34,7 @@ module InertiaRails
       @deep_merge = deep_merge.nil? ? configuration.deep_merge_shared_data : deep_merge
       @encrypt_history = encrypt_history.nil? ? configuration.encrypt_history : encrypt_history
       @clear_history = clear_history || controller.session[:inertia_clear_history] || false
+      @controller.instance_variable_set('@_inertia_rendering', true)
     end
 
     def render
@@ -82,31 +80,17 @@ module InertiaRails
     #
     # 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)
+    def merge_props(shared_props, props)
       if @deep_merge
-        shared_data.deep_symbolize_keys.deep_merge!(props.deep_symbolize_keys)
+        shared_props.deep_symbolize_keys.deep_merge!(props.deep_symbolize_keys)
       else
-        shared_data.symbolize_keys.merge(props.symbolize_keys)
+        shared_props.symbolize_keys.merge(props.symbolize_keys)
       end
     end
 
     def computed_props
       merged_props = merge_props(shared_data, props)
-
-      deep_transform_props merged_props do |prop, path|
-        next [DONT_KEEP_PROP] unless keep_prop?(prop, path)
-
-        transformed_prop = case prop
-                           when BaseProp
-                             prop.call(controller)
-                           when Proc
-                             controller.instance_exec(&prop)
-                           else
-                             prop
-                           end
-
-        [KEEP_PROP, transformed_prop]
-      end
+      deep_transform_props(merged_props)
     end
 
     def page
@@ -122,22 +106,35 @@ module InertiaRails
       deferred_props = deferred_props_keys
       default_page[:deferredProps] = deferred_props if deferred_props.present?
 
-      merge_props = merge_props_keys
+      all_merge_props = merge_props_keys
+
+      deep_merge_props, merge_props = all_merge_props.partition do |key|
+        @props[key].deep_merge?
+      end
+
       default_page[:mergeProps] = merge_props if merge_props.present?
+      default_page[:deepMergeProps] = deep_merge_props if deep_merge_props.present?
 
       default_page
     end
 
-    def deep_transform_props(props, parent_path = [], &block)
+    def deep_transform_props(props, parent_path = [])
       props.each_with_object({}) do |(key, prop), transformed_props|
         current_path = parent_path + [key]
 
         if prop.is_a?(Hash) && prop.any?
-          nested = deep_transform_props(prop, current_path, &block)
-          transformed_props.merge!(key => nested) unless nested.empty?
-        else
-          action, transformed_prop = block.call(prop, current_path)
-          transformed_props.merge!(key => transformed_prop) if action == KEEP_PROP
+          nested = deep_transform_props(prop, current_path)
+          transformed_props[key] = nested unless nested.empty?
+        elsif keep_prop?(prop, current_path)
+          transformed_props[key] =
+            case prop
+            when BaseProp
+              prop.call(controller)
+            when Proc
+              controller.instance_exec(&prop)
+            else
+              prop
+            end
         end
       end
     end

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "3.7.1"
+  VERSION = "3.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - Brian Knoles
@@ -9,7 +9,7 @@ authors:
 - Eugene Granovsky
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties