directive 0.23.5 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad9f8a2ff875fd6ab466dd7b1c4dafc467ecdfc537cff5c4af7eb665ec6a729f
-  data.tar.gz: 0e721be64bb205f9c92ca8885865fc9b7aa104101bdc68a7bd8c40df56942da9
+  metadata.gz: 8fb1887845733661d84f08fcd89db5b492093088d1a276cf52f6ed0fb6e9230d
+  data.tar.gz: dd235b4279ae0ef12c1509dde772002f1f481470a0e7d3cae9eebb996818f2c6
 SHA512:
-  metadata.gz: 0bf703b9367297acca316a288dd9152c14af6673111beff75f8944f1715f0351c6e20d38ee934e45e0050ef54f1623bf1a2e93da96d96d3ff15dd219dbfac962
-  data.tar.gz: ce7696b67ab2f8b2b82abd0e32dcae8772c034bc43f94dd1c0512a66a5aa32c651d6c9e7d232d70ce59e951250e9f98887d8ccfbf0ac716d046e042ea621c14c
+  metadata.gz: e6c67adc0e092d71c3e29ea0c00c444b7836317dc076df36f6eef8d01cf59e728c80e8f6a3a98efa036795c725b72a3ad08ac561a145ffbd9e3001e5853d8fd8
+  data.tar.gz: 6eed2dd660a688ce1bd97629d87caffb3d0a7d4c4f9ebc4f49ce0be9660946df5924800436aa3e29866022fb0473a439d6199f61b9e46ec592694a95325c7da1

data/lib/directive/config_builder.rb

@@ -27,12 +27,12 @@ module Directive
     end
 
     # NOTE: options must be set up before {#configure} is called
-    def option(*args, &block)
-      config_class.__send__(:option, *args, &block)
+    def option(*args, **kwargs, &block)
+      config_class.__send__(:option, *args, **kwargs, &block)
     end
 
-    def nested(*args, &block)
-      config_class.__send__(:nested, *args, &block)
+    def nested(namespace, &block)
+      config_class.__send__(:nested, namespace, &block)
     end
 
     private

data/lib/directive/config_object.rb

@@ -17,19 +17,23 @@ module Directive
     class << self
       private
 
-      def option(name, *)
+      def option(name, *args, **kwargs)
+        name = name.to_sym
+
         _ensure_safe_option_name(name)
 
-        super
+        super(name, *args, **kwargs)
       end
 
       def nested(namespace, &block)
+        namespace = namespace.to_sym
+
         _ensure_safe_option_name(namespace)
 
         nested_config_builder_for(namespace).tap do |builder|
           builder.instance_exec(&block)
 
-          _nested_options << namespace.to_sym
+          _nested_options << namespace
           define_method(namespace) do |&nested_configure_block|
             builder.__send__(:configuration).tap do |nested_config|
               nested_configure_block.call(nested_config) if nested_configure_block.respond_to?(:call)
@@ -43,10 +47,10 @@ module Directive
       end
 
       def _ensure_safe_option_name(name)
-        raise ArgumentError, "#{name.inspect} is reserved and cannot be used at a config option" if name.to_sym.in? RESERVED_WORDS
-        raise ArgumentError, "#{name.inspect} is already in use" if _nested_options.include?(name.to_sym)
+        raise ArgumentError, "#{name.inspect} is reserved and cannot be used at a config option" if name.in? RESERVED_WORDS
+        raise ArgumentError, "#{name.inspect} is defined twice" if _nested_options.include?(name)
 
-        puts "Warning: the config option #{name} is already defined" if _options.include?(name.to_sym) # rubocop:disable Rails/Output
+        puts "Warning: the config option #{name} is already defined" if _options.include?(name) # rubocop:disable Rails/Output
       end
 
       def inherited(base)

data/lib/directive/reader.rb

@@ -17,19 +17,15 @@ module Directive
     attr_reader :config
 
     def method_missing(method_name, *)
-      name = method_name.to_sym
-
-      return mutex.synchronize { config.public_send(name) } if config._options.map(&:to_sym).include?(name)
-      return config._nested_builders[name].reader if config._nested_builders.key?(name)
+      return mutex.synchronize { config.public_send(method_name) } if config._options.include?(method_name)
+      return config._nested_builders[method_name].reader if config._nested_builders.key?(method_name)
 
       super
     end
 
     def respond_to_missing?(method_name, *)
-      name = method_name.to_sym
-
-      config._options.map(&:to_sym).include?(name) ||
-        config._nested_builders.key?(name) ||
+      config._options.include?(method_name) ||
+        config._nested_builders.key?(method_name) ||
         super
     end
 

data/lib/directive/spec_helper/matchers/configuration/define_config_option.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "spicerack/rspec/custom_matchers/define_option"
+
 module Directive
   module SpecHelper
     module Matchers
@@ -19,21 +21,35 @@ module Directive
         #       it { is_expected.to define_config_option :foo }
         #       it { is_expected.to define_config_option :bar, default: :baz }
         #     end
-        define :define_config_option do |option, default: nil|
-          description { "define config option #{option.inspect}" }
-          failure_message { "expected #{@obj} to define config option #{option.inspect} with default #{default.inspect}" }
+        define :define_config_option do |option, **config_options|
+          attr_reader :obj, :option, :default, :default_expected
+
+          description { "define config option #{option.inspect}#{with_default_message}" }
+          failure_message { "expected #{obj} to define config option #{option.inspect}#{with_default_message}" }
 
           match do |obj|
+            config_options.assert_valid_keys(:default)
+
             @obj = obj
+            @options = option
+
+            @default_expected = config_options.key?(:default)
+            @default = config_options[:default]
 
             if obj.is_a? Directive::ConfigObject
-              expect(obj).to define_option option, default: default
+              expect(obj).to define_option option.to_sym, default: default
             else
               expect(obj).to respond_to :config
               expect(obj.config.instance_variable_get(:@config)).to be_present
-              expect(obj.config.instance_variable_get(:@config)).to define_option option, default: default
+              expect(obj.config.instance_variable_get(:@config)).to define_option option.to_sym, default: default
             end
           end
+
+          def with_default_message
+            return unless default_expected
+
+            " with default #{default.inspect}"
+          end
         end
       end
     end

data/lib/directive/version.rb

@@ -2,5 +2,5 @@
 
 module Directive
   # This constant is managed by spicerack
-  VERSION = "0.23.5"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directive
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.25.0
 platform: ruby
 authors:
 - Allen Rettberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +104,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -186,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Gem configuration made simple