Remove attr_reader for internal renderer instance variable reference to improve consistency and avoid variable collision

Author: bknoles

lib/inertia_rails/renderer.rb

@@ -6,16 +6,6 @@
 
 module InertiaRails
   class Renderer
-    attr_reader(
-      :component,
-      :configuration,
-      :controller,
-      :props,
-      :view_data,
-      :encrypt_history,
-      :clear_history
-    )
-
     def initialize(component, controller, request, response, render_method, **options)
       if component.is_a?(Hash) && options.key?(:props)
         raise ArgumentError,
@@ -28,10 +18,10 @@ def initialize(component, controller, request, response, render_method, **option
       @response = response
       @render_method = render_method
       @view_data = options.fetch(:view_data, {})
-      @encrypt_history = options.fetch(:encrypt_history, configuration.encrypt_history)
+      @encrypt_history = options.fetch(:encrypt_history, @configuration.encrypt_history)
       @clear_history = options.fetch(:clear_history, controller.session[:inertia_clear_history] || false)
 
-      deep_merge = options.fetch(:deep_merge, configuration.deep_merge_shared_data)
+      deep_merge = options.fetch(:deep_merge, @configuration.deep_merge_shared_data)
       passed_props = options.fetch(:props, component.is_a?(Hash) ? component : @controller.__send__(:inertia_view_assigns))
       @props = merge_props(shared_data, passed_props, deep_merge)
 
@@ -52,32 +42,32 @@ def render
         @render_method.call json: page.to_json, status: @response.status, content_type: Mime[:json]
       else
         begin
-          return render_ssr if configuration.ssr_enabled
+          return render_ssr if @configuration.ssr_enabled
         rescue StandardError
           nil
         end
-        controller.instance_variable_set('@_inertia_page', page)
-        @render_method.call template: 'inertia', layout: layout, locals: view_data.merge(page: page)
+        @controller.instance_variable_set('@_inertia_page', page)
+        @render_method.call template: 'inertia', layout: layout, locals: @view_data.merge(page: page)
       end
     end
 
     private
 
     def render_ssr
-      uri = URI("#{configuration.ssr_url}/render")
+      uri = URI("#{@configuration.ssr_url}/render")
       res = JSON.parse(Net::HTTP.post(uri, page.to_json, 'Content-Type' => 'application/json').body)
 
-      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)
+      @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
-      layout = configuration.layout
+      layout = @configuration.layout
       layout.nil? || layout
     end
 
     def shared_data
-      controller.__send__(:inertia_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
@@ -103,7 +93,7 @@ def computed_props
           end
         end
         .then { |props| deep_transform_props(props) } # Internal hydration/filtering
-        .then { |props| configuration.prop_transformer(props: props) } # Apply user-defined prop transformer
+        .then { |props| @configuration.prop_transformer(props: props) } # Apply user-defined prop transformer
         .tap do |props| # Add meta tags last (never transformed)
         props[:_inertia_meta] = meta_tags if meta_tags.present?
       end
@@ -114,12 +104,12 @@ def page
       return @page if defined?(@page)
 
       @page = {
-        component: component,
+        component: @component,
         props: computed_props,
         url: @request.original_fullpath,
-        version: configuration.version,
-        encryptHistory: encrypt_history,
-        clearHistory: clear_history,
+        version: @configuration.version,
+        encryptHistory: @encrypt_history,
+        clearHistory: @clear_history,
       }
 
       deferred_props = deferred_props_keys
@@ -141,9 +131,9 @@ def deep_transform_props(props, parent_path = [])
           transformed_props[key] =
             case prop
             when BaseProp
-              prop.call(controller)
+              prop.call(@controller)
             when Proc
-              controller.instance_exec(&prop)
+              @controller.instance_exec(&prop)
             else
               prop
             end
@@ -251,12 +241,12 @@ def partial_except_keys
     end
 
     def rendering_partial_component?
-      @request.headers['X-Inertia-Partial-Component'] == component
+      @request.headers['X-Inertia-Partial-Component'] == @component
     end
 
     def resolve_component(component)
       if component == true || component.is_a?(Hash)
-        configuration.component_path_resolver(path: controller.controller_path, action: controller.action_name)
+        @configuration.component_path_resolver(path: @controller.controller_path, action: @controller.action_name)
       else
         component
       end
@@ -292,7 +282,7 @@ def excluded_by_except_partial_keys?(path_with_prefixes)
     end
 
     def meta_tags
-      controller.inertia_meta.meta_tags
+      @controller.inertia_meta.meta_tags
     end
   end
 end