active_record_compose 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6693618ddc81944ece9c991f800ba8ce1ef5b7f462b13bfe0c9f4b03b04bdc6f
-  data.tar.gz: 36cc7ec0a5852c409dab736d21058f2538c3a656e893d37a7ec8bf2ae499f2cb
+  metadata.gz: 9253aaba5ac1cc24965caf5b0cd683c7e910b693f91290626318208f3d35f079
+  data.tar.gz: 57c187fe08e94cdac9a5fd1dc690dea98af686e898be1acaab0ad6a529ca54f6
 SHA512:
-  metadata.gz: 2780e3749043f5667bcd1a693c248f0c3f2378f7cb8d221f636ada171ab4c5b03c7baa2c479e381ab73570352fabd5c1fb623d9d3ca79b8718919bbe77f5fffe
-  data.tar.gz: 4f6eec237d85851c0eb6041dacb2ea8c2000c431bfe4c632e11647e3009a0d9745bcb572b492ff71e07baa03c298faecb9406d76b939468f0d21cb4315c3eb04
+  metadata.gz: f66509b473e1ddbd2c17ff7f566b684d512e234874178f0cd123bea7eed09877e9198bb4d779f2de0dd0b68f63c675a4a9f2bf529f93d14f531b777a8519f437
+  data.tar.gz: 0fca4a8c7712faea8eaae1326591059a53684feece7f79ad68eb66a231ed37d635b77d082c7e1590da44c785c7b4c90f8d9cbbbc1665368e826d1c30fa0b5c71

data/.rubocop.yml

@@ -33,6 +33,9 @@ Layout/LineLength:
 Metrics/BlockLength:
   Enabled: false
 
+Metrics/MethodLength:
+  Enabled: false
+
 Naming/BlockForwarding:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.3.0] - 2024-02-24
+
+- strictify type checking
+- testing with CI even in the head version of rails
+- consolidate the main process of saving into the `#save` method
+- leave transaction control to ActiveRecord::Transactions
+- execution of `before_commit`, `after_commit` and `after_rollback` hook is delayed until after the database commit (or rollback).
+
+## [0.2.1] - 2024-01-31
+
+- in `#save` (without bang), `ActiveRecord::RecordInvalid` error is not passed outward.
+
 ## [0.2.0] - 2024-01-21
 
 - add i18n doc.

data/lib/active_record_compose/delegate_attribute.rb

@@ -63,10 +63,7 @@ module ActiveRecordCompose
     #
     # @return [Hash] hash with the attribute name as key and the attribute value as value.
     def attributes
-      # steep:ignore all
-      attrs = defined?(super) ? super : {}
-      # steep:ignore end
-      # @type var attrs: Hash[String, untyped]
+      attrs = __skip__ = defined?(super) ? super : {}
       attrs.merge(delegated_attributes.to_h { [_1, public_send(_1)] })
     end
   end

data/lib/active_record_compose/model.rb

@@ -18,10 +18,14 @@ module ActiveRecordCompose
 
     validate :validate_models
 
+    # for ActiveRecord::Transactions
+    class << self
+      def connection = ActiveRecord::Base.connection
+      __skip__ = def composite_primary_key? = false
+    end
+
     def initialize(attributes = {})
-      # steep:ignore all
-      super(attributes)
-      # steep:ignore end
+      __skip__ = super(attributes)
     end
 
     # Save the models that exist in models.
@@ -33,7 +37,11 @@ module ActiveRecordCompose
     def save
       return false if invalid?
 
-      save_in_transaction { save_models(bang: false) }
+      with_transaction_returning_status do
+        run_callbacks(:save) { save_models(bang: false) }
+      rescue ActiveRecord::RecordInvalid
+        false
+      end
     end
 
     # Save the models that exist in models.
@@ -44,7 +52,9 @@ module ActiveRecordCompose
     def save!
       valid? || raise_validation_error
 
-      save_in_transaction { save_models(bang: true) } || raise_on_save_error
+      with_transaction_returning_status do
+        run_callbacks(:save) { save_models(bang: true) }
+      end || raise_on_save_error
     end
 
     # Behavior is same to `#save`, but `before_create` and `after_create` hooks fires.
@@ -76,7 +86,11 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       return false if invalid?
 
-      save_in_transaction { run_callbacks(:create) { save_models(bang: false) } }
+      with_transaction_returning_status do
+        run_callbacks(:save) { run_callbacks(:create) { save_models(bang: false) } }
+      rescue ActiveRecord::RecordInvalid
+        false
+      end
     end
 
     # Behavior is same to `#create`, but raises an exception prematurely on failure.
@@ -85,7 +99,9 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       valid? || raise_validation_error
 
-      save_in_transaction { run_callbacks(:create) { save_models(bang: true) } } || raise_on_save_error
+      with_transaction_returning_status do
+        run_callbacks(:save) { run_callbacks(:create) { save_models(bang: true) } }
+      end || raise_on_save_error
     end
 
     # Behavior is same to `#save`, but `before_update` and `after_update` hooks fires.
@@ -117,7 +133,11 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       return false if invalid?
 
-      save_in_transaction { run_callbacks(:update) { save_models(bang: false) } }
+      with_transaction_returning_status do
+        run_callbacks(:save) { run_callbacks(:update) { save_models(bang: false) } }
+      rescue ActiveRecord::RecordInvalid
+        false
+      end
     end
 
     # Behavior is same to `#update`, but raises an exception prematurely on failure.
@@ -126,9 +146,20 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       valid? || raise_validation_error
 
-      save_in_transaction { run_callbacks(:update) { save_models(bang: true) } } || raise_on_save_error
+      with_transaction_returning_status do
+        run_callbacks(:save) { run_callbacks(:update) { save_models(bang: true) } }
+      end || raise_on_save_error
     end
 
+    # for ActiveRecord::Transactions
+    __skip__ = def id = nil
+
+    # for ActiveRecord::Transactions
+    __skip__ = def trigger_transactional_callbacks? = true
+
+    # for ActiveRecord::Transactions
+    __skip__ = def restore_transaction_record_state(_force_restore_state) = nil
+
     private
 
     def models = @__models ||= ActiveRecordCompose::InnerModelCollection.new
@@ -137,20 +168,6 @@ module ActiveRecordCompose
 
     def validate_models = wrapped_models.select { _1.invalid? }.each { errors.merge!(_1) }
 
-    def save_in_transaction(&block)
-      run_callbacks(:commit) do
-        result = ::ActiveRecord::Base.transaction do
-          raise ActiveRecord::Rollback unless run_callbacks(:save, &block)
-
-          true
-        end
-        result.present?
-      rescue StandardError
-        run_callbacks :rollback
-        raise
-      end.present?
-    end
-
     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.2.0'
+  VERSION = '0.3.0'
 end

data/sig/active_record_compose.rbs

@@ -88,7 +88,6 @@ module ActiveRecordCompose
     def models: -> InnerModelCollection
     def wrapped_models: -> Enumerator[InnerModel, InnerModelCollection]
     def validate_models: -> void
-    def save_in_transaction: { -> bool } -> untyped
     def save_models: (bang: bool) -> bool
     def raise_validation_error: -> bot
     def raise_on_save_error: -> bot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - hamajyotan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-20 00:00:00.000000000 Z
+date: 2024-02-24 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.2.0
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.3.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: activemodel form object pattern