active_record_compose 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c83677cc55d1c45bfa440db7ca21b2924ffec080a025503b892ec3f0245a6b8
-  data.tar.gz: d5a01db0286b3bb0527b4e16692b62fa468035fc091449e7607f2f709b75b866
+  metadata.gz: 9d71146cd07fcae3e2ba02f5a3130d3eab0cba06dc405584793fa30d4add22ad
+  data.tar.gz: 88e70c5d2c6f8327c03c658304d6b036636f9b9ef4f342a45dd2afc7cc1cda4f
 SHA512:
-  metadata.gz: 44a5cca81d044619077855a534063bd2a28a42ece83f34b2605c6c03192f89066e14b8e3c02309e6c52d25608fe2dad0b519cfd9a32ed3d8f1f8fc76ec1105e2
-  data.tar.gz: 2245da3f3053b93ba7c6c2357eecb08a3c069d99e90645fd0a4c7a2b55b5704fc59dbd22e7a70a1f49d397a59cf9c864c39681eb0d7f65d885f797fe973e95a4
+  metadata.gz: 76b5dd94c5246ca424564721a9f185488c1d51dcb12177a08c1d103110e05fd510b87f1cb2811256ab1d0d30425f327e8e1179e4c7e62ea3377fd155a708be9e
+  data.tar.gz: 7e03b2ea7f423047f5eda1ea89b80b586d7ab3c4ad7d616562a6aa9a555e846336f67f30e5e4b45a28e68913091ea5f3e00aee360f22c0689263380b734d0f3f

data/.rubocop.yml

@@ -6,9 +6,15 @@ AllCops:
 Style/ArgumentsForwarding:
   Enabled: false
 
+Style/CommentedKeyword:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 
+Style/NumericPredicate:
+  Enabled: false
+
 Style/StringLiterals:
   Enabled: true
 
@@ -27,6 +33,9 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
+Layout/LeadingCommentSpace:
+  Enabled: false
+
 Layout/LineLength:
   Max: 120
 

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.3.2] - 2024-04-10
+
+- support `ActiveRecord::Base#with_connection`
+- rbs maintained.
+- relax context proc arity.
+
 ## [0.3.1] - 2024-03-17
 
 - purge nodoc definitions from type signature

data/lib/active_record_compose/delegate_attribute.rb

@@ -45,15 +45,15 @@ module ActiveRecordCompose
       # Defines the reader and writer for the specified attribute.
       #
       def delegate_attribute(*attributes, to:, **options)
-        __skip__ =
-          begin
-            delegates = attributes.flat_map do |attribute|
-              reader = attribute
-              writer = "#{attribute}="
+        delegates = attributes.flat_map do |attribute|
+          reader = attribute.to_s
+          writer = "#{attribute}="
 
-              [reader, writer]
-            end
+          [reader, writer]
+        end
 
+        __skip__ =
+          begin
             delegate(*delegates, to:, **options)
             delegated_attributes = (self.delegated_attributes ||= [])
             attributes.each { delegated_attributes.push(_1.to_s) }
@@ -69,7 +69,8 @@ module ActiveRecordCompose
       attrs = __skip__ = defined?(super) ? super : {}
       delegates = __skip__ = delegated_attributes
 
-      # @type var delegates: Array[untyped]
+      # @type var attrs: Hash[String, untyped]
+      # @type var delegates: Array[String]
       attrs.merge(delegates.to_h { [_1, public_send(_1)] })
     end
   end

data/lib/active_record_compose/inner_model.rb

@@ -15,9 +15,20 @@ module ActiveRecordCompose
     delegate :errors, to: :model
 
     # @return [Symbol] :save or :destroy
-    def context
+    def context #: ActiveRecordCompose::context
       c = @context
-      ret = c.is_a?(Proc) ? c.call(model) : c
+      ret =
+        if c.is_a?(Proc)
+          if c.arity == 0
+            # @type var c: ^() -> context
+            c.call
+          else
+            # @type var c: ^(_ARLike) -> context
+            c.call(model)
+          end
+        else
+          c
+        end
       ret.presence_in(%i[save destroy]) || :save
     end
 

data/lib/active_record_compose/inner_model_collection.rb

@@ -82,9 +82,11 @@ module ActiveRecordCompose
     def models = @models ||= []
 
     def wrap(model, context:)
-      if model.is_a?(ActiveRecordCompose::InnerModel)
+      if (__skip__ = model.is_a?(ActiveRecordCompose::InnerModel))
+        # @type var model: ActiveRecordCompose::InnerModel
         model
       else
+        # @type var model: ActiveRecordCompose::_ARLike
         ActiveRecordCompose::InnerModel.new(model, context:)
       end
     end

data/lib/active_record_compose/transaction_support.rb

@@ -7,16 +7,22 @@ module ActiveRecordCompose
 
     module ClassMethods
       def lease_connection
-        if ActiveRecord::Base.respond_to?(:lease_connection)
-          __skip__ = ActiveRecord::Base.lease_connection
+        if ar_class.respond_to?(:lease_connection)
+          __skip__ = ar_class.lease_connection
         else
-          ActiveRecord::Base.connection
+          ar_class.connection
         end
       end
 
-      def connection = ActiveRecord::Base.connection
+      def connection = ar_class.connection
+
+      def with_connection(&) = __skip__ = ar_class.with_connection(&)
 
       def composite_primary_key? = false
+
+      private
+
+      def ar_class = ActiveRecord::Base
     end
 
     def id = nil

data/lib/active_record_compose/version.rb

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

data/sig/active_record_compose.rbs

@@ -5,7 +5,6 @@ module ActiveRecordCompose
   VERSION: String
 
   interface _ARLike
-    def is_a?: (untyped) -> bool
     def save: -> bool
     def save!: -> untyped
     def destroy: -> bool
@@ -13,13 +12,11 @@ module ActiveRecordCompose
     def invalid?: -> bool
     def valid?: -> bool
     def errors: -> untyped
-    def ==: (untyped) -> bool
   end
 
   type attribute_name = (String | Symbol)
-  type context_types = (:save | :destroy)
-  type context_proc = ^(_ARLike) -> context_types
-  type context = context_types | context_proc
+  type context = (:save | :destroy)
+  type context_proc = ((^() -> context) | (^(_ARLike) -> context))
 
   module DelegateAttribute
     extend ActiveSupport::Concern
@@ -37,20 +34,20 @@ module ActiveRecordCompose
 
     def each: () { (_ARLike) -> void } -> InnerModelCollection | () -> Enumerator[_ARLike, self]
     def <<: (_ARLike) -> self
-    def push: (_ARLike, ?context: context) -> self
+    def push: (_ARLike, ?context: (context | context_proc)) -> self
     def empty?: -> bool
     def clear: -> self
-    def delete: (_ARLike | InnerModel, ?context: context_types) -> InnerModelCollection?
+    def delete: (_ARLike | InnerModel, ?context: (context | context_proc)) -> InnerModelCollection?
 
     private
     def models: -> Array[InnerModel]
-    def wrap: (_ARLike | InnerModel, context: context) -> InnerModel
+    def wrap: (_ARLike | InnerModel, context: (context | context_proc)) -> InnerModel
   end
 
   class InnerModel
-    @context: context
+    @context: (context | context_proc)
 
-    def initialize: (_ARLike, ?context: context) -> void
+    def initialize: (_ARLike, ?context: (context | context_proc)) -> void
     def context: -> context
     def save: -> bool
     def save!: -> untyped
@@ -101,6 +98,10 @@ module ActiveRecordCompose
     module ClassMethods
       def connection: -> ActiveRecord::ConnectionAdapters::AbstractAdapter
       def lease_connection: -> ActiveRecord::ConnectionAdapters::AbstractAdapter
+      def with_connection: [T] () { () -> T } -> T
+
+      private
+      def ar_class: -> singleton(ActiveRecord::Base)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - hamajyotan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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.3.1
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.3.2
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []