refactor: configuration is now a reusable class instead of a singleton

Author: ElMassimo

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__)

lib/inertia_rails/configuration.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  class Configuration
+    DEFAULTS = {
+      default_render: false,
+      layout: nil,
+      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,
+    }.freeze
+
+    OPTION_NAMES = DEFAULTS.keys.freeze
+
+    protected attr_reader :options
+
+    def initialize(**attrs)
+      @options = attrs.extract!(*OPTION_NAMES)
+
+      unless attrs.empty?
+        raise ArgumentError, "Unknown options for #{self.class}: #{attrs.keys}"
+      end
+    end
+
+    def to_h
+      @options.to_h
+    end
+
+    def merge(config)
+      Configuration.new(**@options.merge(config.options))
+    end
+
+    OPTION_NAMES.each do |option|
+      define_method(option) {
+        value = @options[option]
+        value.respond_to?(:call) ? value.call : value
+      }
+      define_method("#{option}=") { |value|
+        @options[option] = value
+      }
+    end
+
+    def self.default
+      new(**DEFAULTS)
+    end
+  end
+end

lib/inertia_rails/inertia_rails.rb

@@ -1,14 +1,21 @@
 # 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
+
+  def self.configuration
+    CONFIGURATION
   end
 
   # "Getters"
@@ -18,31 +25,31 @@ def self.shared_data(controller)
   end
 
   def self.version
-    Configuration.evaluated_version
+    configuration.version
   end
 
   def self.layout
-    Configuration.layout
+    configuration.layout
   end
 
   def self.ssr_enabled?
-    Configuration.ssr_enabled
+    configuration.ssr_enabled
   end
 
   def self.ssr_url
-    Configuration.ssr_url
+    configuration.ssr_url
   end
 
   def self.default_render?
-    Configuration.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
+    configuration.deep_merge_shared_data
   end
 
   # "Setters"
@@ -70,19 +77,6 @@ def self.lazy(value = nil, &block)
 
   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 || {}