dry-configurable 0.11.6 → 1.0.1

data/lib/dry/configurable/settings.rb

@@ -1,71 +1,64 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-
-require 'dry/equalizer'
-require 'dry/configurable/constants'
-
 module Dry
   module Configurable
-    # A settings map
+    # A collection of defined settings on a given class.
     #
     # @api private
     class Settings
-      include Dry::Equalizer(:elements)
+      include Dry::Equalizer(:settings)
 
       include Enumerable
 
       # @api private
-      attr_reader :elements
+      attr_reader :settings
+
+      # @api private
+      def initialize(settings = EMPTY_ARRAY)
+        @settings = settings.each_with_object({}) { |s, m| m[s.name] = s }
+      end
 
       # @api private
-      def initialize(elements = EMPTY_ARRAY)
-        initialize_elements(elements)
+      private def initialize_copy(source)
+        @settings = source.settings.dup
       end
 
       # @api private
       def <<(setting)
-        elements[setting.name] = setting
+        settings[setting.name] = setting
         self
       end
 
-      # @api private
+      # Returns the setting for the given name, if found.
+      #
+      # @return [Setting, nil] the setting, or nil if not found
+      #
+      # @api public
       def [](name)
-        elements[name]
+        settings[name]
       end
 
-      # @api private
+      # Returns true if a setting for the given name is defined.
+      #
+      # @return [Boolean]
+      #
+      # @api public
       def key?(name)
         keys.include?(name)
       end
 
-      # @api private
+      # Returns the list of defined setting names.
+      #
+      # @return [Array<Symbol>]
+      #
+      # @api public
       def keys
-        elements.keys
+        settings.keys
       end
 
-      # @api private
+      # @api public
       def each(&block)
-        elements.values.each(&block)
-      end
-
-      # @api private
-      def pristine
-        self.class.new(map(&:pristine))
-      end
-
-      private
-
-      # @api private
-      def initialize_copy(source)
-        initialize_elements(source.map(&:dup))
-      end
-
-      # @api private
-      def initialize_elements(elements)
-        @elements = elements.each_with_object(Concurrent::Map.new) { |s, m|
-          m[s.name] = s
-        }
+        settings.each_value(&block)
       end
     end
   end

data/lib/dry/configurable/test_interface.rb

@@ -10,7 +10,7 @@ module Dry
       #
       # @api public
       def reset_config
-        @config = config.pristine
+        @__config__ = config.pristine
       end
     end
 

data/lib/dry/configurable/version.rb

@@ -3,6 +3,6 @@
 module Dry
   module Configurable
     # @api public
-    VERSION = '0.11.6'
+    VERSION = "1.0.1"
   end
 end

data/lib/dry/configurable.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require 'concurrent/array'
+require "zeitwerk"
 
-require 'dry/configurable/constants'
-require 'dry/configurable/class_methods'
-require 'dry/configurable/instance_methods'
-require 'dry/configurable/config'
-require 'dry/configurable/setting'
-require 'dry/configurable/errors'
+require "dry/core"
+require "dry/configurable/constants"
+require "dry/configurable/errors"
 
 module Dry
+  # @api public
+  def self.Configurable(**options)
+    Configurable::Extension.new(**options)
+  end
+
   # A simple configuration mixin
   #
   # @example class-level configuration
@@ -44,26 +46,32 @@ module Dry
   #
   # @api public
   module Configurable
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-configurable"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-configurable.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-configurable.rb",
+          "#{root}/dry/configurable/{constants,errors,version}.rb"
+        )
+        loader.inflector.inflect("dsl" => "DSL")
+      end
+    end
+
     # @api private
     def self.extended(klass)
       super
-      klass.extend(ClassMethods)
+      klass.extend(Extension.new)
     end
 
     # @api private
     def self.included(klass)
-      raise AlreadyIncluded if klass.include?(InstanceMethods)
-
       super
-      klass.class_eval do
-        extend(ClassMethods)
-        include(InstanceMethods)
-
-        class << self
-          undef :config
-          undef :configure
-        end
-      end
+      klass.include(Extension.new)
     end
+
+    loader.setup
   end
 end

data/lib/dry-configurable.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'dry/configurable'
+require "dry/configurable"

metadata

@@ -1,63 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: dry-configurable
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 1.0.1
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,8 +104,8 @@ files:
 - lib/dry/configurable/config.rb
 - lib/dry/configurable/constants.rb
 - lib/dry/configurable/dsl.rb
-- lib/dry/configurable/dsl/args.rb
 - lib/dry/configurable/errors.rb
+- lib/dry/configurable/extension.rb
 - lib/dry/configurable/instance_methods.rb
 - lib/dry/configurable/methods.rb
 - lib/dry/configurable/setting.rb
@@ -131,7 +117,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-configurable/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-configurable/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-configurable
   bug_tracker_uri: https://github.com/dry-rb/dry-configurable/issues
 post_install_message: 
@@ -142,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A mixin to add configuration functionality to your classes

data/lib/dry/configurable/dsl/args.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/configurable/constants'
-require 'dry/configurable/setting'
-
-module Dry
-  module Configurable
-    class DSL
-      # @api private
-      class Args
-        # @api private
-        attr_reader :args
-
-        # @api private
-        attr_reader :size
-
-        # @api private
-        attr_reader :opts
-
-        # @api private
-        def initialize(args)
-          @args = args
-          @size = args.size
-          @opts = Setting::OPTIONS
-        end
-
-        # @api private
-        def ensure_valid_options
-          return unless options
-
-          keys = options.keys - opts
-          raise ArgumentError, "Invalid options: #{keys.inspect}" unless keys.empty?
-        end
-
-        # @api private
-        def to_ary
-          [default, options || EMPTY_HASH]
-        end
-
-        # @api private
-        def default
-          if size.equal?(1) && options.nil?
-            args[0]
-          elsif size > 1 && options
-            args[0]
-          else
-            Undefined
-          end
-        end
-
-        # @api private
-        def options
-          args.detect { |arg| arg.is_a?(Hash) && (opts & arg.keys).any? }
-        end
-      end
-    end
-  end
-end