directive 0.23.7 → 0.23.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 116a2f1626ef1e755aad317f2cfa5e7cdfdb62526727139bd9680446c347e0e3
-  data.tar.gz: 0c40e6b40d3c033ae2b0a12f3e9e3cd609b046fda93f421c7979a709f419f415
+  metadata.gz: c7a24200fed2e3dd8a31ee9e6fa33cdedd30f5f2bc5947d648938fcbf7bf859f
+  data.tar.gz: 88678c7c7ce6ec1f373191d746a0dfa190b7681199dace0d66c94b0df234a8a6
 SHA512:
-  metadata.gz: a68f5db1269aa351931b4a5997e782ad15f0fe391d34b65b86612f9f4b5f48e7db0e25d0c87b4d29ed011195ef4e485f9034865d4f1e132ee2ba782a16993a75
-  data.tar.gz: 99b673ccd811832ead60da604faabc01967ae696f1812416f31957685e62f0b49a109931199581bf3ed84281c900b464185b3d2369ba5fac533cfa18f1f2eaee
+  metadata.gz: 6699f0fc9d6cf2a8ac56e88e76017fedb2114c61c962d343736794a7db7c57198148ef634d778586773c2126796e5da5fefb444a566d9a515c892fafc2af7790
+  data.tar.gz: 9fdcb7606afe882e18d90f5d6434044c45de9a2cb62dce213dd716614e5ac2766d252bec60764246a6aa60b647ce89b527a9ea17aa09b7b8e3be66a23e1508ce

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

@@ -21,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.7"
+  VERSION = "0.23.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directive
 version: !ruby/object:Gem::Version
-  version: 0.23.7
+  version: 0.23.8
 platform: ruby
 authors:
 - Allen Rettberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-06-09 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.7
+        version: 0.23.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.7
+        version: 0.23.8
 - !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