glue_gun_dsl 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a663641fdcec4866446e9d72583c2e3be4e038604cb22466ee094e81fc17bb79
-  data.tar.gz: 7cc36ed0ad6903f243a129fddee1426995364f703505dad2812322e890a14322
+  metadata.gz: 204effd0afcc5b7a8b1ac6f80ec1ddde4f99039817b0fe84e1a6747c76c13e27
+  data.tar.gz: 227f7029e97ef1639ffbbebf5b0d8273ff0c7a084b5950aa8040c9f91e3be26c
 SHA512:
-  metadata.gz: 10571a6ef7a315f566f5d49140aa0e4743433707ab5c8363d862f7fd318d775e32b6d636fb6698900c0d39706a0da2e77fb35bb3812f919aca4bd1d350df383e
-  data.tar.gz: 8e0754d69e1ae48e7d0c8ca396d8afd747967c51bbaced995af0b82f203b431a2eeaf8c47784a08273ce8b6596acb330964063a31f8cdaf414b8b1a1f35a4e66
+  metadata.gz: 3ee786e7b526c47e62de741a0fd0eb686e890d8e176e4424157d7bd4488f81e0750b7efb2d1d27ee0092e415d92b342ae7d4f6575e1c82ce932aaebcaf56cc26
+  data.tar.gz: 67434b47dc06d5b258d5a1f1286859879c414b4131d17e66a8651378586312ff0b157825e45e2a939625b3a355a0dcbcff7691f0220d5f61cf6fbe8ba2933746

data/lib/glue_gun/dsl.rb

@@ -28,7 +28,7 @@ module GlueGun
         prepend ClassMethods
       end
 
-      # Overriding ActiveModel.assign_attributes to ensure change propagation to dependenices
+      # Overriding ActiveModel.assign_attributes to ensure change propagation to dependencies
       def assign_attributes(new_attributes)
         super(new_attributes)
         propagate_changes if initialized?
@@ -79,6 +79,7 @@ module GlueGun
                      elsif ActiveModel.version >= Gem::Version.new("5")
                        ActiveModel::Type::Value.new
                      end
+
       # Override the attribute method to define custom setters
       def attribute(name, type = DEFAULT_TYPE, **options)
         super(name, type, **options)
@@ -97,10 +98,14 @@ module GlueGun
         end
       end
 
-      def dependency(component_type, &block)
-        dependency_builder = DependencyBuilder.new(component_type)
-        dependency_builder.instance_eval(&block)
-        dependency_definitions[component_type] = dependency_builder
+      def dependency(component_type, factory_class = nil, &block)
+        if factory_class
+          dependency_definitions[component_type] = factory_class
+        else
+          dependency_builder = DependencyBuilder.new(component_type)
+          dependency_builder.instance_eval(&block)
+          dependency_definitions[component_type] = dependency_builder
+        end
 
         # Define singleton method to allow hardcoding dependencies in subclasses
         define_singleton_method component_type do |option = nil, options = {}|
@@ -157,16 +162,24 @@ module GlueGun
     end
 
     def initialize_dependencies(attributes)
-      self.class.dependency_definitions.each do |component_type, _|
+      self.class.dependency_definitions.each do |component_type, definition|
         value = attributes[component_type] || self.class.hardcoded_dependencies[component_type]
-        instance_variable_set("@#{component_type}", initialize_dependency(component_type, value))
+        instance_variable_set("@#{component_type}", initialize_dependency(component_type, value, definition))
       end
     end
 
-    def initialize_dependency(component_type, init_args = {})
+    def initialize_dependency(component_type, init_args = {}, definition = nil)
+      definition ||= self.class.dependency_definitions[component_type]
+
+      if definition.is_a?(Class) && definition.include?(GlueGun::DSL)
+        # If the definition is a factory class, use it to create the dependency
+        factory_instance = definition.new
+        return factory_instance.send(:initialize_dependency, component_type, init_args)
+      end
+
       return init_args if dependency_injected?(component_type, init_args)
 
-      dependency_builder = self.class.dependency_definitions[component_type]
+      dependency_builder = definition
 
       if init_args && init_args.is_a?(Hash) && init_args.key?(:option_name)
         option_name = init_args[:option_name]

data/lib/glue_gun/version.rb

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

data/lib/glue_gun.rb

@@ -1,4 +1,5 @@
 require "active_model"
+require "active_record"
 require "active_support/concern"
 
 module GlueGun

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel