Use new Config object instead of classic one

app/models/alchemy/ingredient_validator.rb

@@ -80,8 +80,12 @@ def validate_uniqueness(*)
     end
 
     def validate_format(format)
-      matcher = Alchemy::Config.get("format_matchers")[format] || format
-      if !ingredient.value.to_s.match?(Regexp.new(matcher))
+      matcher = if format.is_a?(String) || format.is_a?(Symbol)
+        Alchemy::Config.get("format_matchers").get(format)
+      else
+        format
+      end
+      if !ingredient.value.to_s.match?(matcher)
         ingredient.errors.add(:value, :invalid)
       end
     end

lib/alchemy.rb

@@ -2,10 +2,12 @@
 
 require "alchemy/admin/preview_url"
 require "importmap-rails"
+require "alchemy/configurations/main"
 
 module Alchemy
   YAML_PERMITTED_CLASSES = %w[Symbol Date Regexp]
 
+  Config = Alchemy::Configurations::Main.new
   # Define page preview sources
   #
   # A preview source is a Ruby class returning an URL

lib/alchemy/admin/preview_url.rb

@@ -41,7 +41,6 @@ def initialize(routes:)
 
       def url_for(page)
         @preview_config = preview_config_for(page)
-
         if @preview_config && uri
           uri_class.build(
             host: uri.host,
@@ -60,10 +59,10 @@ def url_for(page)
       attr_reader :routes
 
       def preview_config_for(page)
-        preview_config = Alchemy::Config.get(:preview)
+        preview_config = Alchemy::Config.preview
         return unless preview_config
 
-        preview_config[page.site.name] || preview_config
+        preview_config.for_site(page.site) || preview_config
       end
 
       def uri
@@ -81,8 +80,8 @@ def uri_class
       end
 
       def userinfo
-        auth = @preview_config["auth"]
-        auth ? "#{auth["username"]}:#{auth["password"]}" : nil
+        auth = @preview_config.auth
+        auth.username ? "#{auth["username"]}:#{auth["password"]}" : nil
       end
     end
   end

lib/alchemy/configuration.rb

@@ -25,18 +25,22 @@ def initialize(configuration_hash = {})
     end
 
     def set(configuration_hash)
-      configuration_hash.transform_keys do |key|
-        transform_key(key)
-      end.each do |key, value|
+      configuration_hash.each do |key, value|
         send(:"#{key}=", value)
       end
     end
 
-    def get(key)
-      send(transform_key(key))
-    end
+    alias_method :get, :send
     alias_method :[], :get
 
+    def fetch(key, default = nil)
+      get(key) || default
+    end
+
+    def show
+      self
+    end
+
     def set_from_yaml(file)
       set(
         YAML.safe_load(
@@ -84,11 +88,5 @@ def option(name, type, default: nil)
         end
       end
     end
-
-    private
-
-    def transform_key(key)
-      key.tr("/", "_")
-    end
   end
 end

lib/alchemy/test_support/config_stubbing.rb

@@ -17,13 +17,7 @@ module ConfigStubbing
       # @param value [Object] The value you want to return instead of the original one
       #
       def stub_alchemy_config(key, value)
-        allow(Alchemy::Config).to receive(:get) do |arg|
-          if arg == key
-            value
-          else
-            Alchemy::Config.show[arg.to_s]
-          end
-        end
+        allow(Alchemy::Config).to receive(key).and_return(value)
       end
     end
   end

lib/alchemy_cms.rb

@@ -25,7 +25,6 @@
 require_relative "alchemy/admin/preview_url"
 require_relative "alchemy/auth_accessors"
 require_relative "alchemy/cache_digests/template_tracker"
-require_relative "alchemy/config"
 require_relative "alchemy/configuration_methods"
 require_relative "alchemy/controller_actions"
 require_relative "alchemy/deprecation"

spec/controllers/alchemy/base_controller_spec.rb

@@ -29,7 +29,7 @@ module Alchemy
 
     describe "#configuration" do
       it "returns certain configuration options" do
-        allow(Config).to receive(:show).and_return({"some_option" => true})
+        allow(Config).to receive(:some_option).and_return(true)
         expect(controller.configuration(:some_option)).to eq(true)
       end
     end

spec/libraries/admin/preview_url_spec.rb

@@ -21,9 +21,9 @@
     context "with preview configured" do
       context "without protocol" do
         before do
-          stub_alchemy_config(:preview, {
+          stub_alchemy_config(:preview, Alchemy::Configurations::Preview.new({
             "host" => "www.example.com"
-          })
+          }))
         end
 
         it "raises error" do
@@ -33,9 +33,9 @@
 
       context "as http url" do
         before do
-          stub_alchemy_config(:preview, {
+          stub_alchemy_config(:preview, Alchemy::Configurations::Preview.new({
             "host" => "http://www.example.com"
-          })
+          }))
         end
 
         it "returns the configured preview url" do
@@ -45,9 +45,9 @@
 
       context "as https url" do
         before do
-          stub_alchemy_config(:preview, {
+          stub_alchemy_config(:preview, Alchemy::Configurations::Preview.new({
             "host" => "https://www.example.com"
-          })
+          }))
         end
 
         it "returns the configured preview url with https" do
@@ -57,13 +57,13 @@
 
       context "and with basic auth configured" do
         before do
-          stub_alchemy_config(:preview, {
+          stub_alchemy_config(:preview, Alchemy::Configurations::Preview.new({
             "host" => "https://www.example.com",
             "auth" => {
               "username" => "foo",
               "password" => "baz"
             }
-          })
+          }))
         end
 
         it "returns the configured preview url with userinfo" do
@@ -73,9 +73,9 @@
 
       context "with a port configured" do
         before do
-          stub_alchemy_config(:preview, {
+          stub_alchemy_config(:preview, Alchemy::Configurations::Preview.new({
             "host" => "https://www.example.com:8080"
-          })
+          }))
         end
 
         it "returns the configured preview url with userinfo" do
@@ -90,11 +90,11 @@
 
         context "that matches the pages site name" do
           let(:config) do
-            {
+            Alchemy::Configurations::Preview.new({
               page.site.name => {
                 "host" => "http://new.example.com"
               }
-            }
+            })
           end
 
           it "returns the configured preview url for that site" do
@@ -105,12 +105,12 @@
         context "that does not match the pages site name" do
           context "with a default configured" do
             let(:config) do
-              {
+              Alchemy::Configurations::Preview.new({
                 "Not matching site name" => {
                   "host" => "http://new.example.com"
                 },
                 "host" => "http://www.example.com"
-              }
+              })
             end
 
             it "returns the default configured preview url" do
@@ -120,11 +120,11 @@
 
           context "without a default configured" do
             let(:config) do
-              {
+              Alchemy::Configurations::Preview.new({
                 "Not matching site name" => {
                   "host" => "http://new.example.com"
                 }
-              }
+              })
             end
 
             it "returns the internal preview url" do
@@ -138,9 +138,9 @@
         let(:page) { create(:alchemy_page, :language_root) }
 
         before do
-          stub_alchemy_config(:preview, {
+          stub_alchemy_config(:preview, Alchemy::Configurations::Preview.new({
             "host" => "https://www.example.com"
-          })
+          }))
         end
 
         it "returns the preview url without urlname" do