glue_gun_dsl 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf96906f1af3fd62ba4c0e7aa061d9d109aee45ced7284e7776cb74d7dca313
-  data.tar.gz: 47f2454a802ce7a9bd335e7413fd2851551eae2437d4de9bebb0f1f31ad82b53
+  metadata.gz: 68fc0793c49beee7168734f15f10ef57334c0fbbb0f4373c74cfdad16b416a2f
+  data.tar.gz: 34ba98c7f1518de7b16ae4c2d1e4cd9f5c8224ad911c3d7bc14ed21dec139fe8
 SHA512:
-  metadata.gz: 8f4be572fe72494ab001d7ea71ec0f35064d1914a7982ab026ffd12f40126dd01051c1594e9baf78ae3a6415b3bfb44d7524f512986af53dcaa0db3ab5924ba3
-  data.tar.gz: fcf9a586af6236a3595b6a215daca49239a5e7407ab4086626dbcc105f755a76a82ae45de536047a7a8464be0035a89b81e8c4ca5bb11dd1c7aca31eae049b97
+  metadata.gz: 72d8a6751b6ed9d9ea22f8dfb8e89386b2217bbdfc17f922716a208ca9fce8a290762ceb43dcb301d32e9733058c1ea7433b8435a8b6f3b9feb96db83ceaeaaa
+  data.tar.gz: 4cece38fc3e06acd4c285a4e8d04e19d69c01b39ac80af8815f967b96df7f863ef225bad172fb4e5231552a107ae092445feee107b3419225db3e6c9d26f59b1

data/lib/glue_gun/dsl.rb

@@ -107,7 +107,7 @@ module GlueGun
           options = {}
         end
 
-        dependency_builder = DependencyBuilder.new(component_type)
+        dependency_builder = DependencyBuilder.new(component_type, options)
 
         if factory_class.present?
           dependency_builder.set_factory_class(factory_class)
@@ -182,7 +182,12 @@ module GlueGun
       is_array = init_args.is_a?(Array)
       is_hash = definition.is_hash?(init_args)
 
-      return nil if init_args.nil? && definition.default_option_name.nil?
+      if init_args.nil? && definition.default_option_name.nil?
+        return nil if definition.lazy?
+        if definition.when_block.nil?
+          raise "No default option or when block present for component_type #{component_type}. Don't know how to build!"
+        end
+      end
 
       if is_array
         dep = []
@@ -312,14 +317,15 @@ module GlueGun
     end
 
     class DependencyBuilder
-      attr_reader :component_type, :option_configs, :when_block, :is_only, :factory_class
+      attr_reader :component_type, :option_configs, :when_block, :is_only, :factory_class, :lazy, :parent
 
-      def initialize(component_type)
+      def initialize(component_type, options)
         @component_type = component_type
         @option_configs = {}
         @default_option_name = nil
         @single_option = nil
         @is_only = false
+        @lazy = options.key?(:lazy) ? options.dig(:lazy) : true
       end
 
       def set_factory_class(factory_class)
@@ -356,6 +362,10 @@ module GlueGun
         !factory?
       end
 
+      def lazy?
+        @lazy == true
+      end
+
       def is_hash?(init_args)
         return false unless init_args.is_a?(Hash)
 
@@ -369,33 +379,33 @@ module GlueGun
         end
       end
 
-      def initialize_factory_dependency(init_args, parent)
-        builder.initialize_single_dependency(init_args, parent)
+      def initialize_factory_dependency(init_args, instance)
+        builder.initialize_single_dependency(init_args, instance)
       end
 
-      def initialize_builder_dependency(init_args, parent)
+      def initialize_builder_dependency(init_args, instance)
         if init_args && init_args.is_a?(Hash) && init_args.key?(:option_name)
           option_name = init_args[:option_name]
           init_args = init_args[:value]
         else
-          option_name, init_args = determine_option_name(init_args)
+          option_name, init_args = determine_option_name(init_args, instance)
         end
 
         option_config = option_configs[option_name]
 
         raise ArgumentError, "Unknown #{component_type} option '#{option_name}'" unless option_config
 
-        [instantiate_dependency(option_config, init_args, parent), option_config]
+        [instantiate_dependency(option_config, init_args, instance), option_config]
       end
 
-      def initialize_single_dependency(init_args, parent)
+      def initialize_single_dependency(init_args, instance)
         if dependency_injected?(init_args)
           dep = init_args
           option_config = injected_dependency(init_args)
         elsif factory?
-          dep, option_config = initialize_factory_dependency(init_args, parent)
+          dep, option_config = initialize_factory_dependency(init_args, instance)
         else
-          dep, option_config = initialize_builder_dependency(init_args, parent)
+          dep, option_config = initialize_builder_dependency(init_args, instance)
         end
 
         [dep, option_config]
@@ -421,12 +431,12 @@ module GlueGun
         dep_attributes
       end
 
-      def determine_option_name(init_args)
+      def determine_option_name(init_args, instance)
         option_name = nil
 
         # Use when block if defined
         if when_block
-          result = instance_exec(init_args, &when_block)
+          result = instance.instance_exec(init_args, &when_block)
           if result.is_a?(Hash) && result[:option]
             option_name = result[:option]
             as_attr = result[:as]

data/lib/glue_gun/version.rb

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

metadata

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