glue_gun_dsl 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1757d5bf22062e71a309eb62fd4b55aa830d36a7e7cde695f8525b960d5a0a89
-  data.tar.gz: 8f591ab19ba6b88118834b65aa210166408bc127afba0551bb2792505e7abc64
+  metadata.gz: d8f609405b59c865b180e5e07a5a74ebbf4867cea468444983820202b17fbcb7
+  data.tar.gz: b71c914a42fe7175f41b7faa674c30c58d03fcc2c1f54c281bcbf0b8876b1800
 SHA512:
-  metadata.gz: c25769bebf3f9e450970506b45fa13c82281d223f3da07f1d3e667597678903da636422c24924525456f1063b4d142722729fc9bb240eec9801a6d67a1a5fae9
-  data.tar.gz: 13e57e0b3cc63e2ed15e26d480d0622e6413476dae3fff9ba8bf1686fc6fa4c314baad22452b157982cd10699cbb6f6574c84130168d83874d817aef0dbc98e9
+  metadata.gz: 425a1e574b7a54826b2d2881a38d5efc190d14c46e7f5c85cd9b779c17182ad01a1427a746a1dce10780d4243bf575e9ac8e3a467497c41cd1a1e74ac8466be7
+  data.tar.gz: e819aacabb11e0c6174f167cd9fee3eaf2fdd882797631b0c383abbbf9c0bb69431c28cde2bfc024cd391d6c4e526fb8e5c1fa1862396d28d3d3fc889ae737f4

data/lib/glue_gun/dsl.rb

@@ -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

@@ -24,11 +24,43 @@ 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)
+
+        record.save! if record.new_record?
+
+        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)
+
+        record.save if record.new_record?
+
+        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 = 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)
@@ -36,14 +68,6 @@ module GlueGun
 
     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)
       service_class = resolve_service_class(attributes)
       service_attributes = extract_service_attributes(attributes, service_class)
@@ -116,16 +140,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 +178,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glue_gun_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Brett Shollenberger