glue_gun_dsl 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa5ea204121b89b5eb7006dfcabd9816a9fa73523e31fcd92c714f2812ab562
-  data.tar.gz: a995bb16c873adaf819ad459e937930dce7d1addadfe337044833f5810232f14
+  metadata.gz: e97baa6c4e171ff7016d72e17e6aa8bbaac29f1787334e2adf179286e6e3acab
+  data.tar.gz: bf07da1a28c264674715852b26548c82b91c8a752079ce81ab463dddf33dd54c
 SHA512:
-  metadata.gz: 2f6aa771fc215e8cf9c09f62dfa605684f4677722be474da08309221a0a2da55c3db7fc6b6518ab7d6cd8dd6befb06f4ea3b1d9a973d54aa5375db663848482c
-  data.tar.gz: 2527ad788ef9dc415664e70723233f13b999256c2e5a19e73092e33e1edef10d1fc04c7627650421df7734c2160a21aa579b88639225158930ca82e3243be0c6
+  metadata.gz: 773d89754959c7bcdc8aa211e52ba5f62d51803388bbf0938081efea5acbb0eba69fae543a5ef9b41315018fcaa530a2f709e78afe89615f57c85912848fc2e3
+  data.tar.gz: c85ffa384466da228d4442b303db20bd07ae83262981b24b10675d67eaca168f7bdf6a14f88ee617c780402086b10677fc0302b8d08096851bfbcebb5294a2bf

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/types/array_type.rb

@@ -0,0 +1,28 @@
+module GlueGun
+  module Types
+    class ArrayType < ActiveModel::Type::Value
+      def cast(value)
+        case value
+        when String
+          parse_string(value)
+        when Array
+          value
+        else
+          []
+        end
+      end
+
+      def serialize(value)
+        value.to_json
+      end
+
+      private
+
+      def parse_string(value)
+        JSON.parse(value)
+      rescue JSON::ParserError
+        []
+      end
+    end
+  end
+end

data/lib/glue_gun/types.rb

@@ -0,0 +1,9 @@
+module GlueGun
+  module Types
+    require_relative "glue_gun/types/hash_type"
+    ActiveModel::Type.register(:hash, GlueGun::Types::HashType)
+
+    require_relative "glue_gun/types/array_type"
+    ActiveModel::Type.register(:array, GlueGun::Types::ArrayType)
+  end
+end

data/lib/glue_gun/version.rb

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

data/lib/glue_gun.rb

@@ -2,8 +2,6 @@ require "active_model"
 require "active_support/concern"
 
 module GlueGun
-  require_relative "glue_gun/types/hash_type"
-  ActiveModel::Type.register(:hash, GlueGun::Types::HashType)
-
+  require_relative "glue_gun/types"
   require_relative "glue_gun/dsl"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-03 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -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
@@ -115,6 +129,8 @@ extra_rdoc_files: []
 files:
 - lib/glue_gun.rb
 - lib/glue_gun/dsl.rb
+- lib/glue_gun/types.rb
+- lib/glue_gun/types/array_type.rb
 - lib/glue_gun/types/hash_type.rb
 - lib/glue_gun/version.rb
 homepage: https://github.com/brettshollenberger/glue_gun