active_record_compose 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff1c2fd72a225a89ada1c0cab86b6d32f31c0052d8857e665eb2796f4a40883
-  data.tar.gz: 307e8ecf50282b9a19e224870796944de47d37f8802d0ffe63cca465eb663cc4
+  metadata.gz: b8e8c6c04b96e3396f6718d7bfbbf8867dce32cf34b9235ea2d37609c9e84dfb
+  data.tar.gz: c05ca6adb42a249a813ef250ea48fe05c72b073408bf3e5503acdb16df9cf585
 SHA512:
-  metadata.gz: 12f503a644d60932a095a587e8152d37af25b8eccfb0cc5cd32dc5941eb896104880328ff6e3ed2b7fd53ee78fad9f7962e23b5ffc1070bbaa00518e482dccf4
-  data.tar.gz: 91d912f794a250e44e8ad5fea2694f00a52eb98df3f217364e8eb637a6971692998526e86c2d908dc28ce7b0ff99ada394ca287b39342714377af63a1869c4be
+  metadata.gz: 2c3e646ab33c317647fa533e6d652e9b28fe442d337385d9505f2adafc65aaa75a7c3e6fad86cf869f3842b6c5ac8eebc05690e12547c76ccacdc3c08ca8c4e8
+  data.tar.gz: 1dcaf9de91f6b59a41c7848c969880290c5cb5288e1abba45de07a41b030d3f3d2e6312eca37ac120556d9233b62184a11d410ce208202adf56c9cc00e74acdf

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.1.8] - 2024-01-16
+
+- avoid executing `#save!` from `Model#save`
+- on save, ignore nil elements from models.
+
 ## [0.1.7] - 2024-01-15
 
 - remove `add_development_dependency` from gemspec

data/lib/active_record_compose/inner_model_collection.rb

@@ -73,7 +73,7 @@ module ActiveRecordCompose
     def __each_by_wrapped
       return enum_for(:__each_by_wrapped) unless block_given?
 
-      models.each { yield _1 }
+      models.each { yield _1 if _1.__raw_model }
       self
     end
 

data/lib/active_record_compose/model.rb

@@ -31,7 +31,7 @@ module ActiveRecordCompose
     def save
       return false if invalid?
 
-      save_in_transaction { save_models }
+      save_in_transaction { save_models(bang: false) }
     end
 
     # Save the models that exist in models.
@@ -42,7 +42,7 @@ module ActiveRecordCompose
     def save!
       valid? || raise_validation_error
 
-      save_in_transaction { save_models } || raise_on_save_error
+      save_in_transaction { save_models(bang: true) } || raise_on_save_error
     end
 
     # Behavior is same to `#save`, but `before_create` and `after_create` hooks fires.
@@ -74,7 +74,7 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       return false if invalid?
 
-      save_in_transaction { run_callbacks(:create) { save_models } }
+      save_in_transaction { run_callbacks(:create) { save_models(bang: false) } }
     end
 
     # Behavior is same to `#create`, but raises an exception prematurely on failure.
@@ -83,7 +83,7 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       valid? || raise_validation_error
 
-      save_in_transaction { run_callbacks(:create) { save_models } } || raise_on_save_error
+      save_in_transaction { run_callbacks(:create) { save_models(bang: true) } } || raise_on_save_error
     end
 
     # Behavior is same to `#save`, but `before_update` and `after_update` hooks fires.
@@ -115,7 +115,7 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       return false if invalid?
 
-      save_in_transaction { run_callbacks(:update) { save_models } }
+      save_in_transaction { run_callbacks(:update) { save_models(bang: false) } }
     end
 
     # Behavior is same to `#update`, but raises an exception prematurely on failure.
@@ -124,7 +124,7 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       valid? || raise_validation_error
 
-      save_in_transaction { run_callbacks(:update) { save_models } } || raise_on_save_error
+      save_in_transaction { run_callbacks(:update) { save_models(bang: true) } } || raise_on_save_error
     end
 
     private
@@ -135,10 +135,10 @@ module ActiveRecordCompose
 
     def validate_models = wrapped_models.select { _1.invalid? }.each { errors.merge!(_1) }
 
-    def save_in_transaction(&block)
+    def save_in_transaction(...)
       run_callbacks(:commit) do
         result = ::ActiveRecord::Base.transaction do
-          raise ActiveRecord::Rollback unless run_callbacks(:save, &block)
+          raise ActiveRecord::Rollback unless run_callbacks(:save, ...)
 
           true
         end
@@ -149,7 +149,7 @@ module ActiveRecordCompose
       end.present?
     end
 
-    def save_models = wrapped_models.all? { _1.save! }
+    def save_models(bang:) = wrapped_models.all? { bang ? _1.save! : _1.save }
 
     def raise_validation_error = raise ActiveRecord::RecordInvalid, self
 

data/lib/active_record_compose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordCompose
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - hamajyotan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-14 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -51,7 +51,7 @@ metadata:
   homepage_uri: https://github.com/hamajyotan/active_record_compose
   source_code_uri: https://github.com/hamajyotan/active_record_compose
   changelog_uri: https://github.com/hamajyotan/active_record_compose/blob/main/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.1.7
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.1.8
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []