glue_gun_dsl 0.1.21 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1757d5bf22062e71a309eb62fd4b55aa830d36a7e7cde695f8525b960d5a0a89
-  data.tar.gz: 8f591ab19ba6b88118834b65aa210166408bc127afba0551bb2792505e7abc64
+  metadata.gz: e38dfcee3bde86f31b597d6dccf5138fb7200050a05904a055b7d8f201192ab0
+  data.tar.gz: 9b031f91fd59f57d8a10edef069d0ec656e04b8440d55af1354dda0cbfa124e4
 SHA512:
-  metadata.gz: c25769bebf3f9e450970506b45fa13c82281d223f3da07f1d3e667597678903da636422c24924525456f1063b4d142722729fc9bb240eec9801a6d67a1a5fae9
-  data.tar.gz: 13e57e0b3cc63e2ed15e26d480d0622e6413476dae3fff9ba8bf1686fc6fa4c314baad22452b157982cd10699cbb6f6574c84130168d83874d817aef0dbc98e9
+  metadata.gz: b25d5acc5cc955c9c3b20147c6bbf81c2911860f7e7f32b48b4f21273bf7c1f992f05c6b21ed2e6353b3ace8ac39023f87dcbd100fc9041731bea3a62b5bdf2b
+  data.tar.gz: 69736bb98acb9e1365879c0f68f7c401cc6b675e4c7c21af9fee87c0ea074dc76fc103413a386b5b76b1c8e44534f2c3e2f163ed2242389e14dc80fc7c02e923

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]
@@ -438,8 +438,13 @@ module GlueGun
       def determine_option_name(init_args, instance)
         option_name = nil
 
-        # Use when block if defined
-        if when_block
+        user_specified_option = init_args.is_a?(Hash) && init_args.keys.size == 1
+        user_specified_valid_option = user_specified_option && option_configs.key?(init_args.keys.first)
+
+        if user_specified_valid_option
+          option_name = init_args.keys.first
+          init_args = init_args[option_name] # Extract the inner value
+        elsif when_block.present?
           result = instance.instance_exec(init_args, &when_block)
           if result.is_a?(Hash) && result[:option]
             option_name = result[:option]
@@ -448,24 +453,6 @@ module GlueGun
           end
         end
 
-        # Detect option from user input
-        if option_name.nil? && (init_args.is_a?(Hash) && init_args.keys.size == 1)
-          if option_configs.key?(init_args.keys.first)
-            option_name = init_args.keys.first
-            init_args = init_args[option_name] # Extract the inner value
-          else
-            default_option = get_option(default_option_name)
-            unless default_option.only?
-              raise ArgumentError,
-                    "Unknown #{component_type} option: #{init_args.keys.first}."
-            end
-            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
-
-        # Use default option if none determined
         option_name ||= default_option_name
 
         [option_name, init_args]

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
 
@@ -24,30 +27,74 @@ module GlueGun
           raise ArgumentError, "You must provide a service class, factory, or a block to resolve the service class."
         end
       end
+
+      def find_or_create_by!(attributes)
+        attributes = attributes.deep_symbolize_keys
+        db_attributes = extract_db_attributes(attributes)
+        attributes.except(*db_attributes.keys)
+
+        record = where(db_attributes).first_or_initialize(attributes)
+
+        if record.new_record?
+          record.save!
+        else
+          record.send(:build_service_object, attributes)
+        end
+        yield record if block_given?
+
+        record
+      end
+
+      def find_or_create_by(attributes)
+        attributes = attributes.deep_symbolize_keys
+        db_attributes = extract_db_attributes(attributes)
+        attributes.except(*db_attributes.keys)
+
+        record = where(db_attributes).first_or_initialize(attributes)
+
+        if record.new_record?
+          record.save
+        else
+          record.send(:build_service_object, attributes)
+        end
+        yield record if block_given?
+
+        record
+      end
+
+      def extract_db_attributes(attributes)
+        # Extract attributes that correspond to database columns or associations
+        column_names = self.column_names.map(&:to_sym)
+        association_names = reflect_on_all_associations.map(&:name)
+
+        attributes.slice(*(column_names + association_names))
+      end
     end
 
     def initialize(attributes = {})
+      attributes[:root_dir] = detect_root_dir
       attributes = attributes.deep_symbolize_keys
-      db_attributes = extract_db_attributes(attributes)
+      db_attributes = self.class.extract_db_attributes(attributes)
       super(db_attributes)
-      self.class.send(:attr_reader, service_attribute_name)
       build_service_object(attributes)
     end
 
     private
 
-    def extract_db_attributes(attributes)
-      # Extract attributes that correspond to database columns or associations
-      column_names = self.class.column_names.map(&:to_sym)
-      association_names = self.class.reflect_on_all_associations.map(&:name)
-
-      attributes.slice(*(column_names + association_names))
-    end
-
     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
 
@@ -116,16 +163,36 @@ module GlueGun
           }
         end
       end
-      json = attrs.merge(deps.deep_compact).deep_symbolize_keys
+      json = serializable!(attrs.merge(deps.deep_compact).deep_symbolize_keys)
       write_attribute(:configuration, json.to_json)
     end
 
+    def serializable!(json)
+      regular_args = json.slice(*allowed_names(json.keys))
+      assoc_names = self.class.reflect_on_all_associations.map(&:name)
+      found_associations = assoc_names & json.keys
+      found_associations.each do |association|
+        regular_args[association] = true
+      end
+      regular_args
+    end
+
+    def deserialize_associations(json)
+      assoc_names = self.class.reflect_on_all_associations.map(&:name)
+      found_associations = assoc_names & json.keys
+      found_associations.each do |association|
+        json[association] = send(association)
+      end
+      json
+    end
+
     def deserialize_service_object
       serialized_data = JSON.parse(read_attribute(:configuration) || "{}")
       serialized_data.deep_symbolize_keys!
       service_class = resolve_service_class(serialized_data)
+      serialized_data = deserialize_associations(serialized_data)
       serialized_data = service_class.deserialize(serialized_data) if service_class.respond_to?(:deserialize)
-      service_instance = service_class.new(serialized_data)
+      service_instance = build_service_object(serialized_data)
       instance_variable_set("@#{service_attribute_name}", service_instance)
     end
 
@@ -134,23 +201,11 @@ module GlueGun
       [names.map(&:to_sym) - assoc_names.map(&:to_sym)].flatten
     end
 
-    def serialize
-      dataset_service.attributes
-      write_attribute(:configuration, json.to_json)
-    end
-
-    def deserialize
-      options = JSON.parse(read_attribute(:configuration))
-      options.deep_symbolize_keys!
-
-      build_dataset_service(options)
-    end
-
-    def method_missing(method_name, *args, &block)
+    def method_missing(method_name, *args, **kwargs, &block)
       service_object = instance_variable_get("@#{service_attribute_name}")
 
       if service_object && service_object.respond_to?(method_name)
-        service_object.send(method_name, *args, &block)
+        service_object.send(method_name, *args, **kwargs, &block)
       else
         super
       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.21"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
 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