glue_gun_dsl 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc6aaef2a48bc81e0383a4b88f0afc691a3f99097e12877579c7d579953cfea7
-  data.tar.gz: ceb228b7381a0fbc7e2b3c07fe650cc05d89524dcec7199490fafb8813117bcc
+  metadata.gz: '0962a5666114730f40d7b78a9e70e2762480f318cf4790641c47e8406d6af3aa'
+  data.tar.gz: 161576a11d2ff360e5c4fc34327c9db3ecf3201fe9f81fd864e84c34ce223c12
 SHA512:
-  metadata.gz: 7624649374c85a5822bb6a74096e50c69947db98bd1097ec020e3e82edde37c35a9057905534271da63385ef1c37d43b479712d0442247837151c0ab23ef9cbc
-  data.tar.gz: 1f18555d5938dc3fb16bed600e3216502601e0b97c8a7c0998b22dd636cea40263f5ec7225767232e873778690c5ca0d752786c4e5017b371c35b17d191277aa
+  metadata.gz: 3231f0758ae02faea304068b16bd9da17b6910a2f2f3ccd3ddec5c08ee6c9af651b36fc376e9e9a80d330d24448c4d18389cab87a76ade9fbd5db52eeaabb1d6
+  data.tar.gz: 1f5f68fd1879dc28a708214a794d0d2f39410b912e0659d63a67c2244dffb82b89dea4084bfa4db028c0e0aef46a501a4b017a000c64c7fc8027798a669c303e

data/lib/glue_gun/dsl.rb

@@ -106,15 +106,13 @@ module GlueGun
           factory_class = options
           options = {}
         end
-        is_array = options[:array] || false
-        is_hash = options[:hash] || false
 
         if factory_class.present?
-          dependency_definitions[component_type] = { factory_class: factory_class, array: is_array, hash: is_hash }
+          dependency_definitions[component_type] = { factory_class: factory_class }
         else
           dependency_builder = DependencyBuilder.new(component_type)
           dependency_builder.instance_eval(&block)
-          dependency_definitions[component_type] = { builder: dependency_builder, array: is_array, hash: is_hash }
+          dependency_definitions[component_type] = { builder: dependency_builder }
         end
 
         # Define singleton method to allow hardcoding dependencies in subclasses
@@ -178,10 +176,51 @@ module GlueGun
       end
     end
 
+    def allowed_configurations(init_args, definition)
+      if definition[:factory_class]
+        factory_instance = definition[:factory_class].new
+        dep_defs = factory_instance.dependency_definitions
+        definition = dep_defs[dep_defs.keys.first]
+        return allowed_configurations(init_args, definition)
+      elsif definition[:builder]
+        builder = definition[:builder]
+        allowed_configs = builder.option_configs.keys
+      end
+
+      allowed_configs
+    end
+
+    def is_hash?(init_args, definition)
+      return false unless init_args.is_a?(Hash)
+
+      allowed_configs = allowed_configurations(init_args, definition)
+      return false if allowed_configs.count == 1 && allowed_configs == [:default]
+
+      if init_args.key?(:option_name)
+        allowed_configs.exclude?(init_args[:option_name])
+      else
+        init_args.keys.none? { |k| allowed_configs.include?(k) }
+      end
+    end
+
+    def validate_hash_dependencies(init_args, definition, component_type)
+      allowed_configs = allowed_configurations(init_args, definition)
+
+      init_args.each do |_named_key, configuration|
+        next unless configuration.is_a?(Hash)
+
+        key = configuration.keys.first
+        if key.nil? || allowed_configs.exclude?(key)
+          raise ArgumentError,
+                "Unknown #{component_type} option: #{init_args.keys.first}."
+        end
+      end
+    end
+
     def initialize_dependency(component_type, init_args = {}, definition = nil)
       definition ||= self.class.dependency_definitions[component_type]
-      is_array = definition[:array]
-      is_hash = definition[:hash]
+      is_array = init_args.is_a?(Array)
+      is_hash = is_hash?(init_args, definition)
 
       if is_array
         dep = []
@@ -194,6 +233,8 @@ module GlueGun
       elsif is_hash
         dep = {}
         config = {}
+        validate_hash_dependencies(init_args, definition, component_type)
+
         init_args.each do |key, args|
           d, c = initialize_single_dependency(component_type, args, definition)
           dep[key] = d
@@ -390,14 +431,14 @@ module GlueGun
                        else
                          factory.dependency_definitions.values.first.values.first.option_configs
                        end
-      option_configs.values.select do |option|
+      option_configs.values.detect do |option|
         option_class = option.class_name
         value.is_a?(option_class)
       end
     end
 
     def dependency_injected?(component_type, value)
-      injected_dependency(component_type, value).any?
+      injected_dependency(component_type, value).present?
     end
 
     def dependencies

data/lib/glue_gun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GlueGun
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Brett Shollenberger