inertia_rails 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782c220b920be30740f826d2dbf34f61de80219947bda32a6e01b94991be2952
-  data.tar.gz: fd5e8f3dbf11347a14074132fbf8035f03b87bb23981ce4de80f88ba4c5bdbf6
+  metadata.gz: 8c07b523480214ac3e0bcc753b9fabff16e483cceb631a50626dace061664aa0
+  data.tar.gz: 9c03ea8d1195414ea9aad62f82893694466167361bc59c104f4cdf0e223a9853
 SHA512:
-  metadata.gz: 05eacfc4a2cd7b84e49759765285ba33925851709d7ce4f7fc1322346b7c98b9978e63c9cf43f9e8eb1147272ef8a718c6c3d7919caafe94cf56ba4521f46bbb
-  data.tar.gz: ed94a885cfa3acb5133b81b30037c2e5f1a9fdc01ad4ebc6ac2457dfd1f5802bda2cef190825e184b5056b10794deae6da175c76fd44c69e21dd3d8134d36418
+  metadata.gz: af6a5413757d9808ecb55652ebba33555a8cade0655f9d701578c3dcce766f7b009b4ac65b4f0e7e0ecec7b6c6d071302e427d1bd3708c7991c2cb3b000a29c7
+  data.tar.gz: 607dde5d1e9b5ca02bda232b6bae305f23861e0d61636097f998554a4e1064cb0e8c6faa467adcb12e5209fba83ad6a19770bd37b9a5e87b21f1b777227f3f99

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.1.2] - 2023-09-26
+
+* Fix `have_exact_props` RSpec matcher in the situation where shared props are defined in a lambda that outputs a hash with symbolized keys
+
 ## [3.1.1] - 2023-08-21
 
 * Fix broken partial reloads caused by comparing a list of symbolized keys with string keys from HashWithIndifferentAccess

data/lib/inertia_rails/inertia_rails.rb

@@ -14,8 +14,7 @@ module InertiaRails
   # "Getters"
   def self.shared_data(controller)
     shared_plain_data.
-      merge!(evaluated_blocks(controller, shared_blocks)).
-      with_indifferent_access
+      merge!(evaluated_blocks(controller, shared_blocks))
   end
 
   def self.version

data/lib/inertia_rails/renderer.rb

@@ -12,7 +12,7 @@ module InertiaRails
       @request = request
       @response = response
       @render_method = render_method
-      @props = props ? props.with_indifferent_access : controller.inertia_view_assigns.with_indifferent_access
+      @props = props ? props : controller.inertia_view_assigns
       @view_data = view_data || {}
       @deep_merge = !deep_merge.nil? ? deep_merge : InertiaRails.deep_merge_shared_data?
     end
@@ -43,15 +43,25 @@ module InertiaRails
     end
 
     def computed_props
-      _props = ::InertiaRails.shared_data(@controller).send(prop_merge_method, @props).select do |key, prop|
+      # 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|
         if rendering_partial_component?
-          key.to_sym.in? partial_keys
+          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 }).with_indifferent_access
+      deep_transform_values(
+        _props,
+        lambda do |prop|
+          prop.respond_to?(:call) ? @controller.instance_exec(&prop) : prop
+        end
+      )
     end
 
     def page

data/lib/inertia_rails/rspec.rb

@@ -74,7 +74,8 @@ end
 
 RSpec::Matchers.define :have_exact_props do |expected_props|
   match do |inertia|
-    expect(inertia.props).to eq expected_props.with_indifferent_access
+  # Computed props have symbolized keys. 
+    expect(inertia.props).to eq expected_props.deep_symbolize_keys
   end
 
   failure_message do |inertia|
@@ -84,7 +85,8 @@ end
 
 RSpec::Matchers.define :include_props do |expected_props|
   match do |inertia|
-    expect(inertia.props).to include expected_props.with_indifferent_access
+  # Computed props have symbolized keys. 
+    expect(inertia.props).to include expected_props.deep_symbolize_keys
   end
 
   failure_message do |inertia|

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails