glue_gun_dsl 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e4ef257ecdb7017d0c554a6df1e4c24fcee152a0888973cd52fab9d9b4b21a
-  data.tar.gz: bd019c542b46e12188b759d8c7322bea99bcb016c0940ac2a67124a33fca31d8
+  metadata.gz: a663641fdcec4866446e9d72583c2e3be4e038604cb22466ee094e81fc17bb79
+  data.tar.gz: 7cc36ed0ad6903f243a129fddee1426995364f703505dad2812322e890a14322
 SHA512:
-  metadata.gz: 3f3522c171606ed23822d792e5ebc1895ac03280a9fa4bde7c9bf79daed22496c14b5d0b9a03d5063105d1611b2f11161c3c5ed74919b9c134e2f32d35b03a9a
-  data.tar.gz: a170db2ee61ba4c208148bcc8fb46e428bf1b04b8142ffa110f857418d7a762e759b6d13fe51333fcd829c3876d98128b0ad86d48dd9db4cf24ed027a47ba2bf
+  metadata.gz: 10571a6ef7a315f566f5d49140aa0e4743433707ab5c8363d862f7fd318d775e32b6d636fb6698900c0d39706a0da2e77fb35bb3812f919aca4bd1d350df383e
+  data.tar.gz: 8e0754d69e1ae48e7d0c8ca396d8afd747967c51bbaced995af0b82f203b431a2eeaf8c47784a08273ce8b6596acb330964063a31f8cdaf414b8b1a1f35a4e66

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,13 @@ 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))
+          end
+        end
       end
 
       def inherited(subclass)
@@ -167,6 +184,11 @@ module GlueGun
       # Build dependency attributes, including sourcing from parent
       dep_attributes = build_dependency_attributes(option_config, dep_attributes)
 
+      if dep_attributes.key?(:id)
+        raise ArgumentError,
+              "cannot bind attribute 'id' between #{self.class.name} and #{option_config.class_name}. ID is reserved for primary keys in Ruby on Rails"
+      end
+
       dependency_instance = instantiate_dependency(option_config, dep_attributes)
 
       # Keep track of dependencies for attribute binding
@@ -194,11 +216,6 @@ module GlueGun
           value = attr_config.process_value(value, self) if attr_config.respond_to?(:process_value)
           dep_attributes[attr_name] = value
         end
-
-        # 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
@@ -242,7 +259,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 +305,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
 
@@ -330,8 +366,8 @@ module GlueGun
         set_default_option_name(:default)
       end
 
-      def attribute(name, default: nil, required: false, source: nil, &block)
-        single_option.attribute(name, default: default, required: required, source: source, &block)
+      def bind_attribute(name, default: nil, required: false, source: nil, &block)
+        single_option.bind_attribute(name, default: default, required: required, source: source, &block)
       end
 
       def get_option(name)
@@ -398,7 +434,7 @@ module GlueGun
         end
       end
 
-      def attribute(name, default: nil, required: false, source: nil, &block)
+      def bind_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.10"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 2024-10-08 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