refactor: use configuration from controller for ssr

Author: ElMassimo

lib/inertia_rails/configuration.rb

@@ -4,9 +4,11 @@ module InertiaRails
   class Configuration
     DEFAULTS = {
       default_render: false,
-      layout: nil,
+
+      # Let Rails decide which layout should be used based on the controller configuration.
+      layout: true,
+
       deep_merge_shared_data: false,
-      merge_props_with: ->(shared_data, props) { shared_data.merge(props) },
       ssr_enabled: false,
       ssr_url: 'http://localhost:13714',
       version: nil,

lib/inertia_rails/controller.rb

@@ -34,7 +34,7 @@ def use_inertia_instance_props
     end
 
     def default_render
-      if InertiaRails.default_render?
+      if inertia_configuration.default_render
         render(inertia: true)
       else
         super
@@ -66,14 +66,6 @@ def inertia_configuration
       ::InertiaRails.configuration
     end
 
-    def inertia_layout
-      layout = ::InertiaRails.layout
-
-      # When the global configuration is not set, let Rails decide which layout
-      # should be used based on the controller configuration.
-      layout.nil? ? true : layout
-    end
-
     def inertia_location(url)
       headers['X-Inertia-Location'] = url
       head :conflict

lib/inertia_rails/inertia_rails.rb

@@ -24,34 +24,10 @@ def self.shared_data(controller)
       merge!(evaluated_blocks(controller, shared_blocks))
   end
 
-  def self.version
-    configuration.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)

lib/inertia_rails/renderer.rb

@@ -4,17 +4,18 @@
 
 module InertiaRails
   class Renderer
-    attr_reader :component, :view_data
+    attr_reader :component, :view_data, :configuration
 
     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)
       @request = request
       @response = response
       @render_method = render_method
       @props = props ? props : controller.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
@@ -23,23 +24,23 @@ def render
         @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
+        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})
     end
 
     def layout
-      @controller.send(:inertia_layout)
+      configuration.layout
     end
 
     def computed_props
@@ -69,7 +70,7 @@ def page
         component: component,
         props: computed_props,
         url: @request.original_fullpath,
-        version: ::InertiaRails.version,
+        version: configuration.version,
       }
     end
 

spec/inertia/configuration_spec.rb

@@ -101,7 +101,7 @@
 
       context 'opting out of a different layout for Inertia' do
         before do
-          InertiaRails.configure {|c| c.layout = nil }
+          InertiaRails.configure {|c| c.layout = true }
         end
 
         it 'uses default layout for controller' do

spec/inertia/rendering_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'rendering inertia views', type: :request do
   subject { response.body }
 
-  let(:controller) { double('Controller', inertia_view_assigns: {})}
+  let(:controller) { double('Controller', inertia_view_assigns: {}, inertia_configuration: InertiaRails.configuration)}
 
   context 'first load' do
     let(:page) { InertiaRails::Renderer.new('TestComponent', controller, request, response, '').send(:page) }