active_record_compose 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0bb2d4ff8813ad8fb9a4830c2b1d3887aaa29702f11561c9c8624719a5082f
-  data.tar.gz: a3fcfb870aaf5a0825a218556423cc1af16644b41ec22f0b4d656cb42cd33790
+  metadata.gz: 690ecf032eb0a4c59c97394702c838142a4d519145f72e58f9a381d956cad5ce
+  data.tar.gz: 7133a2f5defa0d1c97dac41b207936512f6d5375e8f534ea77dc6c13c3f61dde
 SHA512:
-  metadata.gz: d5a1ea42bd83a986437faac38b2543ee48aff7f2003afa6267a7adcd325db1bbb0506f4f1f25e2aaa13b733df7956ebd820627821f19101fc36dd4f046a51c43
-  data.tar.gz: 4a9cc98fddbcf1068720387207469cb527b96e536a9f109a6174b5a439daa383f54a1625e916c731d01883cf360c6e01281858a238796b5cb64b92665c2405c3
+  metadata.gz: 2680382210cf6eb2f8371cca7e656f8b00211361f00bf9aed7d2ee4f006a816eee6298a917e48c67d5b4f6149545f2ebb3e67bd5905946279c9e203e9e378d82
+  data.tar.gz: 63aa5b0a8abcbcd59eb81aadadf4c8207622988ad417b09d2e8f977615ed8726233ae8f257f8d8847e16e38f400955e0bda1d9340f9c7733f06ea8d76fa4854a

data/.rubocop.yml

@@ -21,6 +21,9 @@ Style/DoubleNegation:
 Style/NumericPredicate:
   Enabled: false
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/StringLiterals:
   Enabled: true
 
@@ -48,6 +51,9 @@ Layout/LeadingCommentSpace:
 Layout/LineLength:
   Max: 120
 
+Lint/UselessMethodDefinition:
+  Enabled: false
+
 Metrics/AbcSize:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.8.0] - 2025-02-22
+
+- changed `persisted_flag_callback_control` default from `false` to `true`.
+- adjusted to save errors as soon as an invalid is found.
+- drop support rails 6.1.x.
+
 ## [0.7.0] - 2025-02-12
 
 - rename ActiveRecordCompose::InnerModel to ActiveRecordCompose::WrappedModel

data/README.md

@@ -15,7 +15,7 @@ activemodel (activerecord) form object pattern. it embraces multiple AR models a
   - [I18n](#i18n)
 - [Advanced Usage](#advanced-usage)
   - [`destroy` option](#destroy-option)
-  - [Callback ordering by `#save`, `#create` and `#update`](#callback-ordering-by-save-create-and-update)
+  - [Callback ordering by `#persisted?`](#callback-ordering-by-persisted)
 - [Links](#links)
 - [Development](#development)
 - [Contributing](#contributing)
@@ -284,52 +284,15 @@ class AccountRegistration < ActiveRecordCompose::Model
 end
 ```
 
-### Callback ordering by `#save`, `#create` and `#update`.
+### Callback ordering by `#persisted?`
 
 The behavior of `(before|after|around)_create` and `(before|after|around)_update` hooks depends on
 the state of the `persisted_flag_callback_control` setting.
-
-When `persisted_flag_callback_control` is set to false,
-the execution of `#create`, `#update`, or `#save` determines which callbacks will be triggered.
-Currently, the default value is `false`, but it will no longer be supported in the future.
-
-```ruby
-class ComposedModel < ActiveRecordCompose::Model
-  self.persisted_flag_callback_control = false # Currently defaults to false, but will no longer be supported in the future.
-
-  # ...
-
-  before_save { puts 'before_save called!' }
-  before_create { puts 'before_create called!' }
-  before_update { puts 'before_update called!' }
-  after_save { puts 'after_save called!' }
-  after_create { puts 'after_create called!' }
-  after_update { puts 'after_update called!' }
-end
-```
-
-```ruby
-model = ComposedModel.new
-
-model.save
-# before_save called!
-# after_save called!
-
-model.create
-# before_save called!
-# before_create called!
-# after_create called!
-# after_save called!
-
-model.update
-# before_save called!
-# before_update called!
-# after_update called!
-# after_save called!
-```
+default value is `true`, behavior when set to `false` will be removed in the next release.
 
 When `persisted_flag_callback_control` is set to `true`, it behaves almost like callback control in ActiveRecord.
-This behavior will be the default in the future.
+Depending on the evaluation result of `#persisted?`,
+either the create-related callbacks or the update-related callbacks will be triggered.
 
 ```ruby
 class ComposedModel < ActiveRecordCompose::Model
@@ -382,10 +345,43 @@ model.save # or `model.update` (the same callbacks will be triggered in all case
 # after_save called!
 ```
 
-When `persisted_flag_callback_control` is `true`, `#create` is not supported.
+When `persisted_flag_callback_control` is set to false,
+the execution of `#create`, `#update`, or `#save` determines which callbacks will be triggered.
+This behavior will no longer be supported in the next release.
+
+```ruby
+class ComposedModel < ActiveRecordCompose::Model
+  self.persisted_flag_callback_control = false # Currently defaults to false, but will no longer be supported in the future.
+
+  # ...
+
+  before_save { puts 'before_save called!' }
+  before_create { puts 'before_create called!' }
+  before_update { puts 'before_update called!' }
+  after_save { puts 'after_save called!' }
+  after_create { puts 'after_create called!' }
+  after_update { puts 'after_update called!' }
+end
+```
 
 ```ruby
-model.create  # => raises RuntimeError
+model = ComposedModel.new
+
+model.save
+# before_save called!
+# after_save called!
+
+model.create
+# before_save called!
+# before_create called!
+# after_create called!
+# after_save called!
+
+model.update
+# before_save called!
+# before_update called!
+# after_update called!
+# after_save called!
 ```
 
 ## Links

data/lib/active_record_compose/model.rb

@@ -16,7 +16,7 @@ module ActiveRecordCompose
     include ActiveRecordCompose::TransactionSupport
 
     # This flag controls the callback sequence for models.
-    # The current default value is `false`, but support for `false` is planned to be discontinued in the future.
+    # The current default value is `true`, behavior when set to `false` will be removed in the next release.
     #
     # When `persisted_flag_callback_control` is set to `true`,
     # the occurrence of callbacks depends on the evaluation result of `#persisted?`.
@@ -53,7 +53,7 @@ module ActiveRecordCompose
     # * after_create
     # * after_save
     #
-    class_attribute :persisted_flag_callback_control, instance_accessor: false, default: false
+    class_attribute :persisted_flag_callback_control, instance_accessor: false, default: true
 
     define_model_callbacks :save
     define_model_callbacks :create
@@ -78,6 +78,13 @@ module ActiveRecordCompose
         if self.class.persisted_flag_callback_control
           with_callbacks { save_models(bang: false) }
         else
+          # steep:ignore:start
+          deprecator.warn(
+            'The behavior with `persisted_flag_callback_control` set to `false` will be removed in 0.9.0. ' \
+            'Use `self.persisted_flag_callback_control = true` set to `true`. ' \
+            '(Alternatively, exclude statements that set `false`)',
+          )
+          # steep:ignore:end
           run_callbacks(:save) { save_models(bang: false) }
         end
       rescue ActiveRecord::RecordInvalid
@@ -97,6 +104,13 @@ module ActiveRecordCompose
         if self.class.persisted_flag_callback_control
           with_callbacks { save_models(bang: true) }
         else
+          # steep:ignore:start
+          deprecator.warn(
+            'The behavior with `persisted_flag_callback_control` set to `false` will be removed in 0.9.0. ' \
+            'Use `self.persisted_flag_callback_control = true` set to `true`. ' \
+            '(Alternatively, exclude statements that set `false`)',
+          )
+          # steep:ignore:end
           run_callbacks(:save) { save_models(bang: true) }
         end
       end || raise_on_save_error
@@ -127,11 +141,20 @@ module ActiveRecordCompose
     #   # after_create called!
     #   # after_save called!
     #
+    # @deprecated
     def create(attributes = {})
       if self.class.persisted_flag_callback_control
         raise '`#create` cannot be called. The context for creation or update is determined by the `#persisted` flag.'
       end
 
+      # steep:ignore:start
+      deprecator.warn(
+        'The behavior with `persisted_flag_callback_control` set to `false` will be removed in 0.9.0. ' \
+        'Use `self.persisted_flag_callback_control = true` set to `true`. ' \
+        '(Alternatively, exclude statements that set `false`)',
+      )
+      # steep:ignore:end
+
       assign_attributes(attributes)
       return false if invalid?
 
@@ -144,11 +167,20 @@ module ActiveRecordCompose
 
     # Behavior is same to `#create`, but raises an exception prematurely on failure.
     #
+    # @deprecated
     def create!(attributes = {})
       if self.class.persisted_flag_callback_control
         raise '`#create` cannot be called. The context for creation or update is determined by the `#persisted` flag.'
       end
 
+      # steep:ignore:start
+      deprecator.warn(
+        'The behavior with `persisted_flag_callback_control` set to `false` will be removed in 0.9.0. ' \
+        'Use `self.persisted_flag_callback_control = true` set to `true`. ' \
+        '(Alternatively, exclude statements that set `false`)',
+      )
+      # steep:ignore:end
+
       assign_attributes(attributes)
       valid? || raise_validation_error
 
@@ -190,6 +222,13 @@ module ActiveRecordCompose
         if self.class.persisted_flag_callback_control
           with_callbacks { save_models(bang: false) }
         else
+          # steep:ignore:start
+          deprecator.warn(
+            'The behavior with `persisted_flag_callback_control` set to `false` will be removed in 0.9.0. ' \
+            'Use `self.persisted_flag_callback_control = true` set to `true`. ' \
+            '(Alternatively, exclude statements that set `false`)',
+          )
+          # steep:ignore:end
           with_callbacks(context: :update) { save_models(bang: false) }
         end
       rescue ActiveRecord::RecordInvalid
@@ -207,22 +246,41 @@ module ActiveRecordCompose
         if self.class.persisted_flag_callback_control
           with_callbacks { save_models(bang: true) }
         else
+          # steep:ignore:start
+          deprecator.warn(
+            'The behavior with `persisted_flag_callback_control` set to `false` will be removed in 0.9.0. ' \
+            'Use `self.persisted_flag_callback_control = true` set to `true`. ' \
+            '(Alternatively, exclude statements that set `false`)',
+          )
+          # steep:ignore:end
           with_callbacks(context: :update) { save_models(bang: true) }
         end
       end || raise_on_save_error
     end
 
+    # Returns true if model is persisted.
+    #
+    # By overriding this definition, you can control the callbacks that are triggered when a save is made.
+    # For example, returning false will trigger before_create, around_create and after_create,
+    # and returning true will trigger before_update, around_update and after_update.
+    #
+    # @return [Boolean] returns true if model is persisted.
+    def persisted? = super
+
     private
 
     def models = @__models ||= ActiveRecordCompose::ComposedCollection.new(self)
 
     def validate_models
-      models.__wrapped_models.select { _1.invalid? }.each { errors.merge!(_1) }
+      models.__wrapped_models.lazy.select { _1.invalid? }.each { errors.merge!(_1) }
     end
 
     def with_callbacks(context: nil, &block)
-      context ||= persisted? ? :update : :create
-      run_callbacks(:save) { run_callbacks(context, &block) }
+      run_callbacks(:save) { run_callbacks(callback_context(context:), &block) }
+    end
+
+    def callback_context(context: nil)
+      context || (persisted? ? :update : :create)
     end
 
     def save_models(bang:)
@@ -234,5 +292,13 @@ module ActiveRecordCompose
     def raise_on_save_error = raise ActiveRecord::RecordNotSaved.new(raise_on_save_error_message, self)
 
     def raise_on_save_error_message = 'Failed to save the model.'
+
+    def deprecator
+      if ActiveRecord.respond_to?(:deprecator)
+        ActiveRecord.deprecator # steep:ignore
+      else # for rails 7.0.x or lower
+        ActiveSupport::Deprecation
+      end
+    end
   end
 end

data/lib/active_record_compose/transaction_support.rb

@@ -28,6 +28,6 @@ module ActiveRecordCompose
     def id = nil
 
     def trigger_transactional_callbacks? = true
-    def restore_transaction_record_state(_force_restore_state = false) = nil # rubocop:disable Style/OptionalBooleanParameter
+    def restore_transaction_record_state(_force_restore_state = false) = nil
   end
 end

data/lib/active_record_compose/version.rb

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

data/sig/active_record_compose.rbs

@@ -89,6 +89,7 @@ module ActiveRecordCompose
     private
     def models: -> ComposedCollection
     def with_callbacks: (?context: (nil | :create | :update)) { () -> bool } -> bool
+    def callback_context: (?context: (nil | :create | :update)) -> (:create | :update)
     def validate_models: -> void
     def save_models: (bang: bool) -> bool
     def raise_validation_error: -> bot

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - hamajyotan
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 description: activemodel form object pattern. it embraces multiple AR models and provides
   a transparent interface as if they were a single model.
 email:
@@ -52,7 +52,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.7.0
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.8.0
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: