glue_gun_dsl 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f609405b59c865b180e5e07a5a74ebbf4867cea468444983820202b17fbcb7
-  data.tar.gz: b71c914a42fe7175f41b7faa674c30c58d03fcc2c1f54c281bcbf0b8876b1800
+  metadata.gz: e2fd5acfe5156d1581b51d68d5598ef181faea52ec3c46d730fef428f7faba15
+  data.tar.gz: c6185af99fd906dd841582b283b4559d8f1fbc4e3046086d7cf4a15ac5e1b1d3
 SHA512:
-  metadata.gz: 425a1e574b7a54826b2d2881a38d5efc190d14c46e7f5c85cd9b779c17182ad01a1427a746a1dce10780d4243bf575e9ac8e3a467497c41cd1a1e74ac8466be7
-  data.tar.gz: e819aacabb11e0c6174f167cd9fee3eaf2fdd882797631b0c383abbbf9c0bb69431c28cde2bfc024cd391d6c4e526fb8e5c1fa1862396d28d3d3fc889ae737f4
+  metadata.gz: 587486d0afa4a7cde26ffc1a6d6a766123db4c09111b4f2e9d3b4f9f17651856a6a587b81832cb78fe93fa6d0f9f23cae88c145a61ac9905968508ffb6f8b7fc
+  data.tar.gz: 14d80f872b13ada859d605068799e8331136c36db88e9dd5ba81eadd93b34b7362918e08eb3e1a48848e8b42ea4477f597d43cc1b3633205dfdc2d2e84d66b5d

data/lib/glue_gun/core_ext/hash_extensions.rb

@@ -12,7 +12,7 @@ module GlueGun
                       value
                     end
 
-        result[key] = compacted unless compacted.blank?
+        result[key] = compacted unless compacted.is_a?(String) && compacted.blank?
       end
     end
   end

data/lib/glue_gun/dsl.rb

@@ -1,8 +1,11 @@
+require_relative "shared"
 module GlueGun
   module DSL
     extend ActiveSupport::Concern
 
     included do
+      include GlueGun::Shared
+
       unless ancestors.include?(ActiveRecord::Base)
         include ActiveModel::Model
         include ActiveModel::Attributes
@@ -77,6 +80,8 @@ module GlueGun
     end
 
     module ClassMethods
+      extend GlueGun::Shared
+
       DEFAULT_TYPE = if ActiveModel.version >= Gem::Version.new("7")
                        nil
                      elsif ActiveModel.version >= Gem::Version.new("5")
@@ -156,7 +161,7 @@ module GlueGun
       end
 
       def detect_root_dir
-        base_path = Module.const_source_location(name)&.first || ""
+        base_path = Module.const_source_location(self.class.name)&.first || ""
         File.dirname(base_path)
       end
     end
@@ -165,11 +170,6 @@ module GlueGun
       @initialized == true
     end
 
-    def detect_root_dir
-      base_path = Module.const_source_location(self.class.name)&.first || ""
-      File.dirname(base_path)
-    end
-
     def initialize_dependencies(attributes)
       self.class.dependency_definitions.each do |component_type, definition|
         value = attributes[component_type] || self.class.hardcoded_dependencies[component_type]

data/lib/glue_gun/model.rb

@@ -1,8 +1,11 @@
+require_relative "shared"
 module GlueGun
   module Model
     extend ActiveSupport::Concern
 
     included do
+      include GlueGun::Shared
+
       before_save :serialize_service_object
       after_find :deserialize_service_object
 
@@ -12,6 +15,19 @@ module GlueGun
 
       # Set default service attribute name based on the class name
       self.service_attribute_name = "#{name.demodulize.underscore}_service".to_sym
+
+      def assign_attributes(attributes)
+        return if attributes.blank?
+
+        attributes = attributes.deep_symbolize_keys
+        db_attributes = self.class.extract_db_attributes(attributes)
+
+        # Assign database attributes
+        super(db_attributes)
+
+        assign_service_attributes(attributes)
+      end
+      alias_method :attributes=, :assign_attributes
     end
 
     class_methods do
@@ -33,6 +49,7 @@ module GlueGun
         record = where(db_attributes).first_or_initialize(attributes)
 
         record.save! if record.new_record?
+        yield record if block_given?
 
         record
       end
@@ -45,6 +62,7 @@ module GlueGun
         record = where(db_attributes).first_or_initialize(attributes)
 
         record.save if record.new_record?
+        yield record if block_given?
 
         record
       end
@@ -59,19 +77,45 @@ module GlueGun
     end
 
     def initialize(attributes = {})
+      attributes[:root_dir] = detect_root_dir
       attributes = attributes.deep_symbolize_keys
       db_attributes = self.class.extract_db_attributes(attributes)
       super(db_attributes)
-      self.class.send(:attr_reader, service_attribute_name)
       build_service_object(attributes)
     end
 
+    def assign_service_attributes(attributes)
+      return if attributes.blank?
+
+      service_object = instance_variable_get("@#{service_attribute_name}")
+      return unless service_object.present?
+
+      extract_service_attributes(attributes, service_object.class).each do |attr_name, value|
+        unless service_object.respond_to?("#{attr_name}=")
+          raise NoMethodError, "Undefined attribute #{attr_name} for #{service_object.class.name}"
+        end
+
+        service_object.send("#{attr_name}=", value)
+        attribute_will_change!(attr_name.to_s)
+      end
+    end
+
     private
 
     def build_service_object(attributes)
+      self.class.send(:attr_reader, service_attribute_name)
       service_class = resolve_service_class(attributes)
+      raise "Unable to find service class for #{self.class} given #{attributes}" unless service_class.present?
+
       service_attributes = extract_service_attributes(attributes, service_class)
-      service_instance = service_class.new(service_attributes)
+      begin
+        service_instance = service_class.new(service_attributes)
+      rescue StandardError => e
+        ap %(Error building service object #{service_class}:)
+        ap e.message
+        ap e.backtrace
+        raise e
+      end
       instance_variable_set("@#{service_attribute_name}", service_instance)
     end
 

data/lib/glue_gun/shared.rb

@@ -0,0 +1,8 @@
+module GlueGun
+  module Shared
+    def detect_root_dir
+      base_path = Module.const_source_location(self.class.name)&.first || ""
+      File.dirname(base_path)
+    end
+  end
+end

data/lib/glue_gun/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -70,6 +70,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +208,7 @@ files:
 - lib/glue_gun/core_ext/hash_extensions.rb
 - lib/glue_gun/dsl.rb
 - lib/glue_gun/model.rb
-- lib/glue_gun/my_model.rb
+- lib/glue_gun/shared.rb
 - lib/glue_gun/types.rb
 - lib/glue_gun/types/array_type.rb
 - lib/glue_gun/types/date_time_type.rb

data/lib/glue_gun/my_model.rb

@@ -1,73 +0,0 @@
-module EasyML
-  class Dataset < ActiveRecord::Base
-    before_save :serialize
-    after_find :deserialize
-
-    validates :name, presence: true
-    belongs_to :datasource,
-               foreign_key: :datasource_id,
-               class_name: "EasyML::Datasource"
-
-    def initialize(options = {})
-      super(EasyML::DbOptions.parse(options, self))
-      build_dataset_service(options)
-    end
-
-    attr_accessor :dataset_service
-
-    private
-
-    def build_dataset_service(options)
-      options.deep_symbolize_keys!
-      service_klass = EasyML::Data::Dataset
-
-      allowed_attr_names = service_klass.dependency_definitions.keys.concat(
-        service_klass.attribute_definitions.keys
-      )
-
-      allowed_attrs = options.slice(*allowed_attr_names)
-      @dataset_service = service_klass.new(allowed_attrs)
-      define_dataset_service_delegators(allowed_attr_names)
-    end
-
-    def define_dataset_service_delegators(attr_names)
-      allowed_names(attr_names).each do |attr_name|
-        define_singleton_method(attr_name) do
-          dataset_service.send(attr_name)
-        end
-      end
-    end
-
-    def allowed_names(names)
-      assoc_names = self.class.reflect_on_all_associations.map(&:name)
-      [names.map(&:to_sym) - assoc_names.map(&:to_sym)].flatten
-    end
-
-    def serialize
-      attrs = dataset_service.attributes
-      deps = allowed_names(dataset_service.dependency_definitions.keys).inject({}) do |hash, dep|
-        hash.tap do
-          this_dep = dataset_service.send(dep)
-          next unless this_dep.present?
-
-          opts = dataset_service.dependency_definitions[dep].option_configs
-          selected_option = opts.detect do |_k, v|
-            this_dep.class == v.class_name
-          end.first
-          hash[dep] = {
-            selected_option => dataset_service.send(dep).attributes
-          }
-        end
-      end
-      json = attrs.merge(deps).deep_symbolize_keys.deep_compact
-      write_attribute(:configuration, json.to_json)
-    end
-
-    def deserialize
-      options = JSON.parse(read_attribute(:configuration))
-      options.deep_symbolize_keys!
-
-      build_dataset_service(options)
-    end
-  end
-end