active_record_compose 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3cb23854b3caafb1f25c297b1d12fb7693c5af5d8e7f917ce3117e5334afa0
-  data.tar.gz: fe905d6071cc4c491fadd68c35b36540b57881d78b6c398acaf2e573d766912c
+  metadata.gz: 2c83677cc55d1c45bfa440db7ca21b2924ffec080a025503b892ec3f0245a6b8
+  data.tar.gz: d5a01db0286b3bb0527b4e16692b62fa468035fc091449e7607f2f709b75b866
 SHA512:
-  metadata.gz: 6a8850ebb01e4705f658bbc65c2cc10366214a2c34787b3d6c6228c34ac405aa00b548212747ef5429fe26eabe1633bf5af9d1019bd95094c1cfd79897811d4c
-  data.tar.gz: a531f7980d9d5ed490aa8c35927176511db6ff81f81009d02ac4121a04abe57efd6ac4dc5db8f353b4ef03c18214c73f246a1c6c8e43e235d1065d436538de31
+  metadata.gz: 44a5cca81d044619077855a534063bd2a28a42ece83f34b2605c6c03192f89066e14b8e3c02309e6c52d25608fe2dad0b519cfd9a32ed3d8f1f8fc76ec1105e2
+  data.tar.gz: 2245da3f3053b93ba7c6c2357eecb08a3c069d99e90645fd0a4c7a2b55b5704fc59dbd22e7a70a1f49d397a59cf9c864c39681eb0d7f65d885f797fe973e95a4

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,18 @@
 ## [Unreleased]
 
+## [0.3.1] - 2024-03-17
+
+- purge nodoc definitions from type signature
+- support `ActiveRecord::Base#lease_connection`
+
+## [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.

data/lib/active_record_compose/delegate_attribute.rb

@@ -38,23 +38,26 @@ module ActiveRecordCompose
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :delegated_attributes, instance_writer: false
+      __skip__ = class_attribute :delegated_attributes, instance_writer: false
     end
 
-    class_methods do
+    module ClassMethods
       # Defines the reader and writer for the specified attribute.
       #
       def delegate_attribute(*attributes, to:, **options)
-        delegates = attributes.flat_map do |attribute|
-          reader = attribute
-          writer = "#{attribute}="
+        __skip__ =
+          begin
+            delegates = attributes.flat_map do |attribute|
+              reader = attribute
+              writer = "#{attribute}="
 
-          [reader, writer]
-        end
+              [reader, writer]
+            end
 
-        delegate(*delegates, to:, **options)
-        delegated_attributes = (self.delegated_attributes ||= [])
-        attributes.each { delegated_attributes.push(_1.to_s) }
+            delegate(*delegates, to:, **options)
+            delegated_attributes = (self.delegated_attributes ||= [])
+            attributes.each { delegated_attributes.push(_1.to_s) }
+          end
       end
     end
 
@@ -63,11 +66,11 @@ 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.merge(delegated_attributes.to_h { [_1, public_send(_1)] })
+      attrs = __skip__ = defined?(super) ? super : {}
+      delegates = __skip__ = delegated_attributes
+
+      # @type var delegates: Array[untyped]
+      attrs.merge(delegates.to_h { [_1, public_send(_1)] })
     end
   end
 end

data/lib/active_record_compose/inner_model.rb

@@ -65,7 +65,7 @@ module ActiveRecordCompose
     # @return [Boolean]
     def ==(other)
       return false unless self.class == other.class
-      return false unless __raw_model == other.__raw_model
+      return false unless (__skip__ = (__raw_model == other.__raw_model))
       return false unless context == other.context
 
       true

data/lib/active_record_compose/inner_model_collection.rb

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

data/lib/active_record_compose/model.rb

@@ -2,15 +2,16 @@
 
 require 'active_record_compose/delegate_attribute'
 require 'active_record_compose/inner_model_collection'
+require 'active_record_compose/transaction_support'
 
 module ActiveRecordCompose
   class Model
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
     include ActiveModel::Attributes
-    include ActiveRecord::Transactions
 
     include ActiveRecordCompose::DelegateAttribute
+    include ActiveRecordCompose::TransactionSupport
 
     define_model_callbacks :save
     define_model_callbacks :create
@@ -19,9 +20,7 @@ module ActiveRecordCompose
     validate :validate_models
 
     def initialize(attributes = {})
-      # steep:ignore all
-      super(attributes)
-      # steep:ignore end
+      __skip__ = super(attributes)
     end
 
     # Save the models that exist in models.
@@ -33,9 +32,11 @@ module ActiveRecordCompose
     def save
       return false if invalid?
 
-      save_in_transaction { save_models(bang: false) }
-    rescue ActiveRecord::RecordInvalid
-      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.
@@ -46,7 +47,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.
@@ -78,9 +81,11 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       return false if invalid?
 
-      save_in_transaction { run_callbacks(:create) { save_models(bang: false) } }
-    rescue ActiveRecord::RecordInvalid
-      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.
@@ -89,7 +94,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.
@@ -121,9 +128,11 @@ module ActiveRecordCompose
       assign_attributes(attributes)
       return false if invalid?
 
-      save_in_transaction { run_callbacks(:update) { save_models(bang: false) } }
-    rescue ActiveRecord::RecordInvalid
-      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.
@@ -132,31 +141,19 @@ 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
 
     private
 
     def models = @__models ||= ActiveRecordCompose::InnerModelCollection.new
 
-    def wrapped_models = models.__each_by_wrapped
+    def wrapped_models = (__skip__ = models.__each_by_wrapped)
 
     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/transaction_support.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ActiveRecordCompose
+  module TransactionSupport
+    extend ActiveSupport::Concern
+    include ActiveRecord::Transactions
+
+    module ClassMethods
+      def lease_connection
+        if ActiveRecord::Base.respond_to?(:lease_connection)
+          __skip__ = ActiveRecord::Base.lease_connection
+        else
+          ActiveRecord::Base.connection
+        end
+      end
+
+      def connection = ActiveRecord::Base.connection
+
+      def composite_primary_key? = false
+    end
+
+    def id = nil
+
+    def trigger_transactional_callbacks? = true
+    def restore_transaction_record_state(_force_restore_state = false) = nil # rubocop:disable Style/OptionalBooleanParameter
+  end
+end

data/lib/active_record_compose/version.rb

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

data/sig/active_record_compose.rbs

@@ -24,13 +24,11 @@ module ActiveRecordCompose
   module DelegateAttribute
     extend ActiveSupport::Concern
 
-    def delegated_attribute: -> Array[untyped]
     def attributes: -> Hash[String, untyped]
-    def delegated_attributes: -> Array[untyped]
-    def delegated_attributes=: (Array[untyped]) -> void
 
-    def self.class_attribute: (untyped, ?untyped) -> untyped
-    def delegate: (*untyped) -> untyped
+    module ClassMethods
+      def delegate_attribute: (*untyped methods, to: untyped?, **untyped) -> untyped
+    end
   end
 
   class InnerModelCollection
@@ -43,7 +41,6 @@ module ActiveRecordCompose
     def empty?: -> bool
     def clear: -> self
     def delete: (_ARLike | InnerModel, ?context: context_types) -> InnerModelCollection?
-    def __each_by_wrapped: () { (InnerModel) -> void } -> InnerModelCollection | () -> Enumerator[InnerModel, self]
 
     private
     def models: -> Array[InnerModel]
@@ -60,7 +57,6 @@ module ActiveRecordCompose
     def invalid?: -> bool
     def valid?: -> bool
     def ==: (untyped) -> bool
-    def __raw_model: -> _ARLike
 
     private
     attr_reader model: _ARLike
@@ -70,9 +66,12 @@ module ActiveRecordCompose
     extend ActiveModel::Callbacks
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
+    extend ActiveModel::Validations::ClassMethods
     include ActiveModel::Attributes
-    include ActiveRecord::Transactions
     include DelegateAttribute
+    extend DelegateAttribute::ClassMethods
+    include TransactionSupport
+    extend TransactionSupport::ClassMethods
 
     @__models: InnerModelCollection
 
@@ -88,13 +87,20 @@ 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
     def raise_on_save_error_message: -> String
+  end
+
+  module TransactionSupport
+    include ActiveRecord::Transactions
+
+    def id: -> untyped
 
-    def self.validate: (*untyped) -> untyped
-    def run_callbacks: (untyped kind) ?{ () -> untyped } -> untyped
+    module ClassMethods
+      def connection: -> ActiveRecord::ConnectionAdapters::AbstractAdapter
+      def lease_connection: -> ActiveRecord::ConnectionAdapters::AbstractAdapter
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - hamajyotan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,6 +42,7 @@ files:
 - lib/active_record_compose/inner_model.rb
 - lib/active_record_compose/inner_model_collection.rb
 - lib/active_record_compose/model.rb
+- lib/active_record_compose/transaction_support.rb
 - lib/active_record_compose/version.rb
 - sig/active_record_compose.rbs
 homepage: https://github.com/hamajyotan/active_record_compose
@@ -51,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.2.1
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.3.1
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -68,7 +69,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