hanami 2.0.0.alpha2 → 2.0.0.alpha3

data/lib/hanami/application/settings/loader.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami
-  class Application
-    module Settings
-      # Default application settings loader. Uses dotenv (if available) to load
-      # .env files and then loads settings from ENV.
-      #
-      # @since 2.0.0
-      # @api private
-      class Loader
-        InvalidSettingsError = Class.new(StandardError) do
-          def initialize(errors)
-            @errors = errors
-          end
-
-          def to_s
-            <<~STR.strip
-              Could not initialize settings. The following settings were invalid:
-
-              #{@errors.map { |setting, message| "#{setting}: #{message}" }.join("\n")}
-            STR
-          end
-        end
-
-        UnsupportedSettingArgumentError = Class.new(StandardError) do
-          def initialize(setting_name, arguments)
-            @setting_name = setting_name
-            @arguments = arguments
-          end
-
-          def to_s
-            <<~STR.strip
-              Unsupported arguments #{@arguments.inspect} for setting +#{@setting_name}+
-            STR
-          end
-        end
-
-        def initialize(*)
-        end
-
-        def call(defined_settings)
-          load_dotenv
-
-          settings, errors = load_settings(defined_settings)
-
-          raise InvalidSettingsError, errors if errors.any?
-
-          settings
-        end
-
-        private
-
-        def load_dotenv
-          require "dotenv"
-          Dotenv.load(*dotenv_files) if defined?(Dotenv)
-        rescue LoadError # rubocop:disable Lint/SuppressedException
-        end
-
-        def dotenv_files
-          [
-            ".env.#{Hanami.env}.local",
-            (".env.local" unless Hanami.env?(:test)),
-            ".env.#{Hanami.env}",
-            ".env"
-          ].compact
-        end
-
-        def load_settings(defined_settings) # rubocop:disable Metrics/MethodLength
-          defined_settings.each_with_object([{}, {}]) { |(name, args), (settings, errors)|
-            begin
-              settings[name] = resolve_setting(name, args)
-            rescue => exception # rubocop:disable Style/RescueStandardError
-              if exception.is_a?(UnsupportedSettingArgumentError) # rubocop: disable Style/GuardClause
-                raise exception
-              else
-                errors[name] = exception
-              end
-            end
-          }
-        end
-
-        def resolve_setting(name, args)
-          value = ENV.fetch(name.to_s.upcase) { Undefined }
-
-          if args.none?
-            value
-          elsif args[0]&.respond_to?(:call)
-            args[0].call(value)
-          else
-            raise UnsupportedSettingArgumentError.new(name, args)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hanami/application/settings/struct.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami
-  class Application
-    module Settings
-      # Application settings struct
-      #
-      # When the application loads settings, a struct subclass is created for
-      # the settings defined specifically for the application, then initialized
-      # with those settings and their values
-      #
-      # @since 2.0.0
-      # @api public
-      class Struct
-        class << self
-          def [](names)
-            Class.new(self) do
-              @setting_names = names
-
-              define_singleton_method(:setting_names) do
-                @setting_names
-              end
-
-              define_readers
-            end
-          end
-
-          def reserved?(name)
-            instance_methods.include?(name)
-          end
-
-          private
-
-          def define_readers
-            setting_names.each do |name|
-              next if reserved?(name)
-
-              define_method(name) do
-                @settings[name]
-              end
-            end
-          end
-        end
-
-        def initialize(settings)
-          @settings = settings.freeze
-        end
-
-        def [](name)
-          raise ArgumentError, "Unknown setting +#{name}+" unless self.class.setting_names.include?(name)
-
-          if self.class.reserved?(name)
-            @settings[name]
-          else
-            public_send(name)
-          end
-        end
-
-        def to_h
-          @settings.to_h
-        end
-      end
-    end
-  end
-end