glue_gun_dsl 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7b46d98a9c33d613f4a0c6aa3cd0b7b43f73f2117eadbed6a3ed3146536880
-  data.tar.gz: 7ec3d164ae20f7ecd12aa85d826bffc0adeed0de2faf1b0e8e52c403bb8a032e
+  metadata.gz: edbf3090421208672fdc17def682401b63dab26703932337106fc21e54e3a589
+  data.tar.gz: 5f7948854600c6472a35119724d5bcdff04e0ae333bc11278559e05432cac849
 SHA512:
-  metadata.gz: 4ea5e725ad6f9367807b69f7f82a5c5fef8ad3578f1394f9bf9407135e599e7ffa797efa80d76842ce7fc4ff5c114b81d090c831d3d90966d34e087c390deb99
-  data.tar.gz: 219174af57c3c3fc4a1b9ab242ead40375c11fe9ee58a3dc084db6bc6615b6d2c908237f1b21eec55059382eac6421f4a649549a657194b6ef3e1293a14298a7
+  metadata.gz: 5d20c2554f8908224286358e4f16f36ce52839db20103ccc3368554088c63fc6af82ae7de6a6d2ebbdf4a3974d7db66502cc7b809f70a9c3cca6f3cb495e0a0f
+  data.tar.gz: c01c8d848e36cd7632daddbac3b0f6e3d3f552a59649ce25fafc9aa1437d0d21fcbaa886e72cae1962bc1a3a8bc95ea8c839b00944793ea4f2e7193361ff4981

data/lib/glue_gun/dsl.rb

@@ -3,11 +3,14 @@ module GlueGun
     extend ActiveSupport::Concern
 
     included do
-      include ActiveModel::Model
-      include ActiveModel::Attributes
-      include ActiveModel::Validations
-      include ActiveModel::AttributeAssignment
-      include ActiveModel::Dirty
+      unless ancestors.include?(ActiveRecord::Base)
+        include ActiveModel::Model
+        include ActiveModel::Attributes
+        include ActiveModel::Validations
+        include ActiveModel::AttributeAssignment
+        include ActiveModel::Dirty
+        include ActiveRecord::Callbacks
+      end
 
       class_attribute :attribute_definitions, instance_writer: false, default: {}
       class_attribute :dependency_definitions, instance_writer: false, default: {}
@@ -18,7 +21,6 @@ module GlueGun
       const_set(:AttributeMethods, attribute_methods_module)
       prepend attribute_methods_module
 
-      # Prepend Initialization module to override initialize
       prepend Initialization
 
       # Prepend ClassMethods into the singleton class of the including class
@@ -31,10 +33,21 @@ module GlueGun
         super(new_attributes)
         propagate_changes if initialized?
       end
+
+      if ancestors.include?(ActiveRecord::Base)
+        columns.each do |column|
+          # Skip if already defined via GlueGun::DSL's attribute method
+          next if attribute_definitions.key?(column.name.to_sym)
+
+          # Define a ConfigAttr for each ActiveRecord column
+          attribute(column.name.to_sym, column.type)
+        end
+      end
     end
 
     module Initialization
       def initialize(attrs = {})
+        attrs ||= {}
         attrs = attrs.symbolize_keys
         # Separate dependency configurations from normal attributes
         dependency_attributes = {}
@@ -56,9 +69,6 @@ module GlueGun
         # Initialize dependencies after attributes have been set
         initialize_dependencies(dependency_attributes)
 
-        # Validate the main object's attributes
-        validate!
-
         @initialized = true
       end
     end
@@ -75,7 +85,7 @@ module GlueGun
         attribute_definitions[name.to_sym] = { type: type, options: options }
 
         # Define dirty tracking for the attribute
-        define_attribute_methods name
+        define_attribute_methods name unless ancestors.include?(ActiveRecord::Base)
 
         attribute_methods_module = const_get(:AttributeMethods)
 
@@ -106,6 +116,14 @@ module GlueGun
           instance_variable_get("@#{component_type}") ||
             instance_variable_set("@#{component_type}", initialize_dependency(component_type))
         end
+
+        attribute_methods_module = const_get(:AttributeMethods)
+        attribute_methods_module.class_eval do
+          define_method "#{component_type}=" do |init_args|
+            instance_variable_set("@#{component_type}", initialize_dependency(component_type, init_args))
+            # propagate_attribute_change(component_type, value) if initialized?
+          end
+        end
       end
 
       def inherited(subclass)
@@ -181,23 +199,18 @@ module GlueGun
     def build_dependency_attributes(option_config, dep_attributes)
       option_config.attributes.each do |attr_name, attr_config|
         # If the attribute is already provided, use it
-        value = if dep_attributes.key?(attr_name)
-                  dep_attributes[attr_name]
-                elsif 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)
-
-        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}"
+        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 = attr_config.process_value(value, self) if attr_config.respond_to?(:process_value)
+          dep_attributes[attr_name] = value
         end
       end
 
@@ -242,7 +255,7 @@ module GlueGun
     def instantiate_dependency(option_config, dep_attributes)
       dependency_class = option_config.class_name
       dependency_instance = dependency_class.new(dep_attributes)
-      dependency_instance.validate! if dependency_instance.respond_to?(:validate!)
+      dependency_instance.validate! if false # dependency_instance.respond_to?(:validate!)
       dependency_instance
     end
 
@@ -288,6 +301,25 @@ module GlueGun
       @dependencies ||= {}
     end
 
+    def validate_dependencies
+      errors.clear
+      self.class.dependency_definitions.keys.each do |component_type|
+        dependency = send(component_type)
+
+        # Only validate if the dependency responds to `valid?`
+        next unless dependency.respond_to?(:valid?) && !dependency.valid?
+
+        dependency.errors.each do |error|
+          if error.is_a?(ActiveModel::Error)
+            attribute = error.attribute
+            message = error.message
+          end
+          errors.add("#{component_type}.#{attribute}", message)
+        end
+      end
+      errors.none?
+    end
+
     class ConfigAttr
       attr_reader :name, :default, :required, :source, :block
 

data/lib/glue_gun/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +84,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +168,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: GlueGun makes dependency injection and hydration a first-order concern
 email:
 - brett.shollenberger@gmail.com