glue_gun_dsl 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa5ea204121b89b5eb7006dfcabd9816a9fa73523e31fcd92c714f2812ab562
-  data.tar.gz: a995bb16c873adaf819ad459e937930dce7d1addadfe337044833f5810232f14
+  metadata.gz: 37182bf278dad7cd5f5db699cb9e190acba48709d53a18bad7102a02acb1987b
+  data.tar.gz: 4d86c00dc096b5eb90f81c3e6fe7adf0a6ed3e91e4053f0ce88ac898c9e79158
 SHA512:
-  metadata.gz: 2f6aa771fc215e8cf9c09f62dfa605684f4677722be474da08309221a0a2da55c3db7fc6b6518ab7d6cd8dd6befb06f4ea3b1d9a973d54aa5375db663848482c
-  data.tar.gz: 2527ad788ef9dc415664e70723233f13b999256c2e5a19e73092e33e1edef10d1fc04c7627650421df7734c2160a21aa579b88639225158930ca82e3243be0c6
+  metadata.gz: c5c7416cc73db27881361039fc90d42e9931d8786bfa0364d41e7752b75cc56e0a7fc283a93777a7dfa83b08f71fd3e5fb3714e1223fb7a252a2d9821e95bfae
+  data.tar.gz: 9bf40cceec7fc4da924b5ae6f44a9ad1994e4d88adc0cf985145896bba847fd2e541e5af9f288c2adf8184b430d51e9237a400fac8724f5413467758aad3f098

data/lib/glue_gun/dsl.rb

@@ -166,20 +166,29 @@ module GlueGun
 
     def build_dependency_attributes(option_config, dep_attributes)
       option_config.attributes.each do |attr_name, attr_config|
-        next if dep_attributes.key?(attr_name)
+        # If the attribute is already provided, use it
+        if dep_attributes.key?(attr_name)
+          value = dep_attributes[attr_name]
+        else
+          value = if attr_config.source && respond_to?(attr_config.source)
+                    send(attr_config.source)
+                  elsif respond_to?(attr_name)
+                    send(attr_name)
+                  else
+                    attr_config.default
+                  end
 
-        value = if attr_config.source && respond_to?(attr_config.source)
-                  send(attr_config.source)
-                elsif respond_to?(attr_name)
-                  send(attr_name)
-                else
-                  attr_config.default
-                end
+          value = attr_config.process_value(value, self) if attr_config.respond_to?(:process_value)
 
-        value = attr_config.process_value(value, self) if attr_config.respond_to?(:process_value)
+          dep_attributes[attr_name] = value
+        end
 
-        dep_attributes[attr_name] = value
+        # After getting the value, check if it's required and nil
+        if value.nil? && attr_config.required
+          raise ArgumentError, "Missing required attribute '#{attr_name}' for #{option_config.class_name}"
+        end
       end
+
       dep_attributes
     end
 
@@ -209,7 +218,6 @@ module GlueGun
           unless default_option.attributes.keys.include?(init_args.keys.first)
             raise ArgumentError, "#{default_option.class_name} does not respond to #{init_args.keys.first}"
           end
-
         end
       end
 
@@ -255,11 +263,12 @@ module GlueGun
     end
 
     class ConfigAttr
-      attr_reader :name, :default, :source, :block
+      attr_reader :name, :default, :required, :source, :block
 
-      def initialize(name, default: nil, source: nil, &block)
+      def initialize(name, default: nil, required: false, source: nil, &block)
         @name = name.to_sym
         @default = default
+        @required = required
         @source = source
         @block = block
       end
@@ -289,14 +298,14 @@ module GlueGun
         @is_only = false
       end
 
-      # Support set_class and define_attr for single-option dependencies
+      # Support set_class and attribute for single-option dependencies
       def set_class(class_name)
         single_option.set_class(class_name)
         set_default_option_name(:default)
       end
 
-      def attribute(name, default: nil, source: nil, &block)
-        single_option.attribute(name, default: default, source: source, &block)
+      def attribute(name, default: nil, required: false, source: nil, &block)
+        single_option.attribute(name, default: default, required: required, source: source, &block)
       end
 
       def get_option(name)
@@ -363,8 +372,8 @@ module GlueGun
         end
       end
 
-      def attribute(name, default: nil, source: nil, &block)
-        attr = ConfigAttr.new(name, default: default, source: source, &block)
+      def attribute(name, default: nil, required: false, source: nil, &block)
+        attr = ConfigAttr.new(name, default: default, required: required, source: source, &block)
         @attributes[name.to_sym] = attr
       end
 

data/lib/glue_gun/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brett Shollenberger
@@ -50,6 +50,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement