glue_gun_dsl 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea68a31c6e7206e0aeeb14467b1335a39047b49d870fd79cde4ce334c7c6d860
-  data.tar.gz: 67eb48676fc5502ca0869041ecd6c5a7d653005ea14777fe315828eca035fd42
+  metadata.gz: b5b050524f016e18d7b9937fbc5bbba5e8bf989690fdfda10a6bd0adf09aeb86
+  data.tar.gz: 2eab6853e671117b5253de7a88b9edb0f5274c5688ddd5817ce35ad77d8185de
 SHA512:
-  metadata.gz: 6830bf72b7f05306b46eb9b987f2bd15facc0510c1e2983b2c0a51802807f39518a5d6829dc499a54138a47e797e433ea16ee2b7ef1131b594e50677a64fcefc
-  data.tar.gz: 450f8dd49be6d2b0cdc9d840f4c03f404c1b7aaf69664ed3666b7e0cbef948952754e71ee12484a634b4661cb2e3a42e99eabc2e3d246319f3cc75e7c7598969
+  metadata.gz: 30b842fe667aa8f8785a903d1b61f3e3fb65799cc417214392ecde7022251fd3ab212f81d5d26ea9d8818ca3241649729eb92b8e6454c128a8659f12d3f2f96a
+  data.tar.gz: c000b550317b50a2c17c985f8d7e574e4bef04444e20f9cfdecef46420efa14e931a11f01334e1ad06f04889a60a3dedd29cdd3118fab478236b0703a06b3bbb

data/lib/glue_gun/model.rb

@@ -112,6 +112,7 @@ module GlueGun
     end
 
     def initialize(attributes = {})
+      attributes = {} if attributes.nil?
       attributes[:root_dir] ||= detect_root_dir
       attributes = attributes.deep_symbolize_keys
       attributes[option_key] ||= resolve_service_type(attributes, true)
@@ -210,30 +211,57 @@ module GlueGun
       end.symbolize_keys
     end
 
+    def serialize_object(object)
+      if object.respond_to?(:serialize)
+        object.serialize
+      elsif object.respond_to?(:attributes)
+        object.attributes.deep_compact
+      else
+        Hash[object.instance_variables.map do |var|
+          [var.to_s.delete("@"), object.instance_variable_get(var)]
+        end].deep_compact
+      end
+    end
+
+    def serialize_dependency(dependency, dep_instance = nil)
+      dep_instance = service_object.send(dependency) if dep_instance.nil?
+      return nil unless dep_instance.present?
+
+      return dep_instance.map { |dep| serialize_dependency(dependency, dep) } if dep_instance.is_a?(Array)
+
+      opts = service_object.dependency_definitions[dependency].option_configs
+      selected_option = opts.detect do |_k, v|
+        dep_instance.class == v.class_name
+      end&.first
+      unless selected_option.present?
+        raise "Don't know how to serialize dependency of type #{dependency}, available options are #{opts.keys}. You didn't specify an option."
+      end
+
+      serialized = serialize_object(dep_instance)
+      {
+        selected_option => serialized
+      }
+    end
+
+    def service_object
+      instance_variable_get("@#{service_attribute_name}")
+    end
+
+    def service_class
+      service_object.class
+    end
+
     def serialize_service_object
-      service_object = instance_variable_get("@#{service_attribute_name}")
-      service_klass = service_object.class
-      attrs = service_klass.respond_to?(:serialize) ? service_klass.serialize(service_object) : service_object.attributes
+      attrs = serialize_object(service_object)
       deps = allowed_names(service_object.dependency_definitions.keys).inject({}) do |hash, dep|
         hash.tap do
-          this_dep = service_object.send(dep)
-          next unless this_dep.present?
-
-          opts = service_object.dependency_definitions[dep].option_configs
-          selected_option = opts.detect do |_k, v|
-            this_dep.class == v.class_name
-          end&.first
-          unless selected_option.present?
-            raise "Don't know how to serialize dependency of type #{dep}, available options are #{opts.keys}. You didn't specify an option."
-          end
+          serialized = serialize_dependency(dep)
+          next if serialized.nil?
 
-          serialized = this_dep.respond_to?(:serialize) ? this_dep.serialize : this_dep.attributes
-          hash[dep] = {
-            selected_option => serialized
-          }
+          hash[dep] = serialized
         end
       end
-      json = serializable!(attrs.merge(deps.deep_compact).deep_symbolize_keys)
+      json = serializable!(attrs.merge(deps).deep_symbolize_keys)
       write_attribute(:configuration, json.to_json)
     end
 
@@ -256,12 +284,37 @@ module GlueGun
       json
     end
 
+    def deserialize_dependency(serialized, definition)
+      return serialized.map { |dep| deserialize_dependency(dep, definition) } if serialized.is_a?(Array)
+
+      dep_name = serialized.keys.first
+      selected_option = definition.option_configs[dep_name]
+      dependency_class = selected_option.class_name
+      arguments = serialized[dep_name]
+
+      dependency_class.respond_to?(:deserialize) ? dependency_class.deserialize(arguments) : arguments
+      {
+        dep_name => arguments
+      }
+    end
+
+    def deserialize_dependencies(serialized_data, service_class)
+      serialized_deps = (serialized_data.keys & allowed_names(service_class.dependency_definitions.keys))
+      serialized_deps.each do |name|
+        serialized = serialized_data[name]
+        definition = service_class.dependency_definitions[name]
+        serialized_data[name] = deserialize_dependency(serialized, definition)
+      end
+      serialized_data
+    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)
+      serialized_data = deserialize_dependencies(serialized_data, service_class)
       service_instance = build_service_object(serialized_data)
       instance_variable_set("@#{service_attribute_name}", service_instance)
     end

data/lib/glue_gun/version.rb

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

metadata

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