glue_gun_dsl 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e38dfcee3bde86f31b597d6dccf5138fb7200050a05904a055b7d8f201192ab0
-  data.tar.gz: 9b031f91fd59f57d8a10edef069d0ec656e04b8440d55af1354dda0cbfa124e4
+  metadata.gz: e2fd5acfe5156d1581b51d68d5598ef181faea52ec3c46d730fef428f7faba15
+  data.tar.gz: c6185af99fd906dd841582b283b4559d8f1fbc4e3046086d7cf4a15ac5e1b1d3
 SHA512:
-  metadata.gz: b25d5acc5cc955c9c3b20147c6bbf81c2911860f7e7f32b48b4f21273bf7c1f992f05c6b21ed2e6353b3ace8ac39023f87dcbd100fc9041731bea3a62b5bdf2b
-  data.tar.gz: 69736bb98acb9e1365879c0f68f7c401cc6b675e4c7c21af9fee87c0ea074dc76fc103413a386b5b76b1c8e44534f2c3e2f163ed2242389e14dc80fc7c02e923
+  metadata.gz: 587486d0afa4a7cde26ffc1a6d6a766123db4c09111b4f2e9d3b4f9f17651856a6a587b81832cb78fe93fa6d0f9f23cae88c145a61ac9905968508ffb6f8b7fc
+  data.tar.gz: 14d80f872b13ada859d605068799e8331136c36db88e9dd5ba81eadd93b34b7362918e08eb3e1a48848e8b42ea4477f597d43cc1b3633205dfdc2d2e84d66b5d

data/lib/glue_gun/model.rb

@@ -15,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
@@ -35,11 +48,7 @@ module GlueGun
 
         record = where(db_attributes).first_or_initialize(attributes)
 
-        if record.new_record?
-          record.save!
-        else
-          record.send(:build_service_object, attributes)
-        end
+        record.save! if record.new_record?
         yield record if block_given?
 
         record
@@ -52,11 +61,7 @@ module GlueGun
 
         record = where(db_attributes).first_or_initialize(attributes)
 
-        if record.new_record?
-          record.save
-        else
-          record.send(:build_service_object, attributes)
-        end
+        record.save if record.new_record?
         yield record if block_given?
 
         record
@@ -79,6 +84,22 @@ module GlueGun
       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)

data/lib/glue_gun/version.rb

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

metadata

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