active_record_compose 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f089bd84bf403659ef6e4835080c952a07d7fb393aa7820c8b030294956f525
-  data.tar.gz: 9c9d6137b7c1d4715e89bc4c0f7c9e9965fdd3b9a2c265517ccac8568c3365fd
+  metadata.gz: 5fe788a613275af9e9784ba51b84af314792e0a5761e0c8d5e985602dfe7d586
+  data.tar.gz: 0621ff28f43377240efc94a97b12ffde861e71142f6ba2ac349d4d9a165d6401
 SHA512:
-  metadata.gz: e6a6bc59528725186b32d4447de1b7883e831cbdbd0579bfd5dadc100290a385ecd8410da67d760bf8bccc8c5548f73401319cb18b2289d649ad06a70184d42d
-  data.tar.gz: 1b25e47a0c9a4c49d1b8141499357b7f32bd6d724e05958531e98d164db3d738c1cf19c1045df96eae4d441e1144af610a6472c2372f018c32021aff12d0fa3b
+  metadata.gz: d67bf25365ccad6f049a17cbc311cbf19c48ee4719e51afefc149fb0227989ec8f1c55684ab26328839ae7c79897fed27ac6b5c7db90c42bf0b81e3bc4437c97
+  data.tar.gz: ab71a4b2bd61619136f8685b0b1346d4ad111fec0717a1527ce714985f5eaee91f0c91dd9713ba835a2633acbdc2a197f2ae2c77767d2028b13eb4bcb5f21887

data/.rubocop.yml

@@ -12,6 +12,9 @@ Style/CommentedKeyword:
 Style/Documentation:
   Enabled: false
 
+Style/DoubleNegation:
+  Enabled: false
+
 Style/NumericPredicate:
   Enabled: false
 
@@ -39,6 +42,9 @@ Layout/LeadingCommentSpace:
 Layout/LineLength:
   Max: 120
 
+Metrics/AbcSize:
+  Enabled: false
+
 Metrics/BlockLength:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.4.1] - 2024-09-20
+
+- Omitted optional argument for `InnerModelCollection#destroy`.
+  `InnerModel` equivalence is always performed based on the instance of the inner `model`.
+  Since there are no use cases that depend on the original behavior.
+
+## [0.4.0] - 2024-09-15
+
+- support `destrpy` option. and deprecated `context` option.
+  `:context` will be removed in 0.5.0. Use `:destroy`  option instead.
+  for example,
+  - `models.push(model, context: :destroy)` is replaced by `models.push(model, destroy: true)`
+  - `models.push(model, context: -> { foo? ? :destroy : :save })` is replaced by `models.push(model, destroy: -> { foo? })`
+  - `models.push(model, context: ->(m) { m.bar? ? :destroy : :save })` is replaced by `models.push(model, destroy: ->(m) { m.bar? })`
+- `destroy` option can now be specified with a `Symbol` representing the method name.
+
 ## [0.3.4] - 2024-09-01
 
 - ci: removed sqlite3 version specifing for new AR.

data/README.md

@@ -156,7 +156,7 @@ Account.count  #=> 1
 Profile.count  #=> 1
 ```
 
-By adding to the `models` array while specifying `context: :destroy`, you can perform a delete instead of a save on the model at `#save` time.
+By adding to the `models` array while specifying `destroy: true`, you can perform a delete instead of a save on the model at `#save` time.
 
 ```ruby
 class AccountResignation < ActiveRecordCompose::Model
@@ -164,7 +164,7 @@ class AccountResignation < ActiveRecordCompose::Model
     @account = account
     @profile = account.profile  # Suppose that Account has_one Profile.
     models.push(account)
-    models.push(profile, context: :destroy)
+    models.push(profile, destroy: true)
   end
 
   attr_reader :account, :profile
@@ -193,6 +193,29 @@ account.resigned_at.present?  #=> Tue, 02 Jan 2024 22:58:01.991008870 JST +09:00
 account.profile.blank?        #=> true
 ```
 
+Conditional destroy (or save) can be written like this.
+
+```ruby
+class AccountRegistration < ActiveRecordCompose::Model
+  def initialize(account, attributes = {})
+    @account = account
+    @profile = account.profile || account.build_profile
+    super(attributes)
+    models.push(account)
+    models.push(profile, destroy: :all_blank?) # destroy if all blank, otherwise save.
+  end
+
+  delegate_attribute :name, :email, to: :account
+  delegate_attribute :firstname, :lastname, :age, to: :profile
+
+  private
+
+  attr_reader :account, :profile
+
+  def all_blank? = firstname.blank && lastname.blank? && age.blank?
+end
+```
+
 ### `delegate_attribute`
 
 It provides a macro description that expresses access to the attributes of the AR model through delegation.

data/lib/active_record_compose/inner_model.rb

@@ -5,67 +5,82 @@ require 'active_support/core_ext/object'
 module ActiveRecordCompose
   class InnerModel
     # @param model [Object] the model instance.
-    # @param context [Symbol] :save or :destroy
-    # @param context [Proc] proc returning either :save or :destroy
-    def initialize(model, context: :save)
+    # @param destroy [Boolean] given true, destroy model.
+    # @param destroy [Proc] when proc returning true, destroy model.
+    def initialize(model, destroy: false, context: nil)
       @model = model
-      @context = context
-    end
+      @destroy_context_type =
+        if context
+          c = context
 
-    delegate :errors, to: :model
+          if c.is_a?(Proc)
+            # @type var c: ((^() -> (context)) | (^(_ARLike) -> (context)))
+            if c.arity == 0
+              deprecator.warn(
+                '`:context` will be removed in 0.5.0. Use `:destroy` option instead. ' \
+                'for example, `models.push(model, context: -> { foo? ? :destroy : :save })` ' \
+                'is replaced by `models.push(model, destroy: -> { foo? })`.',
+              )
+
+              # @type var c: ^() -> (context)
+              -> { c.call == :destroy }
+            else
+              deprecator.warn(
+                '`:context` will be removed in 0.5.0. Use `:destroy` option instead. ' \
+                'for example, `models.push(model, context: ->(m) { m.bar? ? :destroy : :save })` ' \
+                'is replaced by `models.push(model, destroy: ->(m) { m.bar? })`.',
+              )
 
-    # @return [Symbol] :save or :destroy
-    def context #: ActiveRecordCompose::context
-      c = @context
-      ret =
-        if c.is_a?(Proc)
-          if c.arity == 0
-            # @type var c: ^() -> context
-            c.call
+              # @type var c: ^(_ARLike) -> (context)
+              ->(model) { c.call(model) == :destroy }
+            end
+          elsif %i[save destroy].include?(c)
+            deprecator.warn(
+              '`:context` will be removed in 0.5.0. Use `:destroy` option instead. ' \
+              "for example, `models.push(model, context: #{c.inspect})` " \
+              "is replaced by `models.push(model, destroy: #{(c == :destroy).inspect})`.",
+            )
+
+            # @type var c: (:save | :destory)
+            c == :destroy
           else
-            # @type var c: ^(_ARLike) -> context
-            c.call(model)
+            c
           end
         else
-          c
+          destroy
         end
-      ret.presence_in(%i[save destroy]) || :save
     end
 
-    # Execute save or destroy. Returns true on success, false on failure.
-    # Whether save or destroy is executed depends on the value of context.
-    #
-    # @return [Boolean] returns true on success, false on failure.
-    def save
-      case context
-      when :destroy
-        model.destroy
+    delegate :errors, to: :model
+
+    def destroy_context?
+      d = destroy_context_type
+      if d.is_a?(Proc)
+        if d.arity == 0
+          # @type var d: ^() -> (bool | context)
+          !!d.call
+        else
+          # @type var d: ^(_ARLike) -> (bool | context)
+          !!d.call(model)
+        end
       else
-        model.save
+        !!d
       end
     end
 
+    # Execute save or destroy. Returns true on success, false on failure.
+    # Whether save or destroy is executed depends on the value of `#destroy_context?`.
+    #
+    # @return [Boolean] returns true on success, false on failure.
+    def save = destroy_context? ? model.destroy : model.save
+
     # Execute save or destroy. Unlike #save, an exception is raises on failure.
-    # Whether save or destroy is executed depends on the value of context.
+    # Whether save or destroy is executed depends on the value of `#destroy_context?`.
     #
-    def save!
-      case context
-      when :destroy
-        model.destroy!
-      else
-        model.save!
-      end
-    end
+    def save! = destroy_context? ? model.destroy! : model.save!
 
     # @return [Boolean]
-    def invalid?
-      case context
-      when :destroy
-        false
-      else
-        model.invalid?
-      end
-    end
+    def invalid? = destroy_context? ? false : model.invalid?
 
     # @return [Boolean]
     def valid? = !invalid?
@@ -77,11 +92,11 @@ module ActiveRecordCompose
     def ==(other)
       return false unless self.class == other.class
       return false unless __raw_model == other.__raw_model # steep:ignore
-      return false unless context == other.context
 
       true
     end
 
+    # @private
     # Returns a model instance of raw, but it should
     # be noted that application developers are not expected to use this interface.
     #
@@ -90,6 +105,14 @@ module ActiveRecordCompose
 
     private
 
-    attr_reader :model
+    attr_reader :model, :destroy_context_type
+
+    def deprecator
+      if ActiveRecord.respond_to?(:deprecator)
+        ActiveRecord.deprecator
+      else # for rails 7.0.x or lower
+        ActiveSupport::Deprecation
+      end
+    end
   end
 end

data/lib/active_record_compose/inner_model_collection.rb

@@ -6,6 +6,11 @@ module ActiveRecordCompose
   class InnerModelCollection
     include Enumerable
 
+    def initialize(owner)
+      @owner = owner
+      @models = []
+    end
+
     # Enumerates model objects.
     #
     # @yieldparam [Object] the model instance
@@ -23,17 +28,19 @@ module ActiveRecordCompose
     # @param model [Object] the model instance
     # @return [self] returns itself.
     def <<(model)
-      models << wrap(model, context: :save)
+      models << wrap(model, destroy: false)
       self
     end
 
     # Appends model to collection.
     #
     # @param model [Object] the model instance
-    # @param context [Symbol] :save or :destroy
+    # @param destroy [Boolean] given true, destroy model.
+    # @param destroy [Proc] when proc returning true, destroy model.
+    # @param destroy [Symbol] applies boolean value of result of sending a message to `owner` to evaluation.
     # @return [self] returns itself.
-    def push(model, context: :save)
-      models << wrap(model, context:)
+    def push(model, destroy: false, context: nil)
+      models << wrap(model, destroy:, context:)
       self
     end
 
@@ -54,16 +61,25 @@ module ActiveRecordCompose
     # Returns nil if the deletion fails, self if it succeeds.
     #
     # @param model [Object] the model instance
-    # @param context [Symbol] :save or :destroy
     # @return [self] Successful deletion
     # @return [nil] If deletion fails
-    def delete(model, context: :save)
-      wrapped = wrap(model, context:)
+    def delete(model, destroy: nil, context: nil)
+      if !destroy.nil? || !context.nil?
+        # steep:ignore:start
+        deprecator.warn(
+          'In `InnerModelConnection#destroy`, the option values `destroy` and `context` are ignored. ' \
+          'These options will be removed in 0.5.0.',
+        )
+        # steep:ignore:end
+      end
+
+      wrapped = wrap(model)
       return nil unless models.delete(wrapped)
 
       self
     end
 
+    # @private
     # Enumerates model objects, but it should be noted that
     # application developers are not expected to use this interface.
     #
@@ -79,15 +95,27 @@ module ActiveRecordCompose
 
     private
 
-    def models = @models ||= []
+    attr_reader :owner, :models
 
-    def wrap(model, context:)
+    def wrap(model, destroy: false, context: nil)
       if model.is_a?(ActiveRecordCompose::InnerModel) # steep:ignore
         # @type var model: ActiveRecordCompose::InnerModel
         model
       else
+        if destroy.is_a?(Symbol)
+          method = destroy
+          destroy = -> { owner.__send__(method) }
+        end
         # @type var model: ActiveRecordCompose::_ARLike
-        ActiveRecordCompose::InnerModel.new(model, context:)
+        ActiveRecordCompose::InnerModel.new(model, destroy:, context:)
+      end
+    end
+
+    def deprecator
+      if ActiveRecord.respond_to?(:deprecator)
+        ActiveRecord.deprecator # steep:ignore
+      else # for rails 7.0.x or lower
+        ActiveSupport::Deprecation
       end
     end
   end

data/lib/active_record_compose/model.rb

@@ -148,7 +148,7 @@ module ActiveRecordCompose
 
     private
 
-    def models = @__models ||= ActiveRecordCompose::InnerModelCollection.new
+    def models = @__models ||= ActiveRecordCompose::InnerModelCollection.new(self)
 
     def wrapped_models = models.__each_by_wrapped # steep:ignore
 

data/lib/active_record_compose/version.rb

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

data/lib/active_record_compose.rb

@@ -3,8 +3,6 @@
 require 'active_record'
 
 require_relative 'active_record_compose/version'
-require_relative 'active_record_compose/inner_model'
-require_relative 'active_record_compose/inner_model_collection'
 require_relative 'active_record_compose/model'
 
 module ActiveRecordCompose

data/sig/active_record_compose.rbs

@@ -17,6 +17,7 @@ module ActiveRecordCompose
   type attribute_name = (String | Symbol)
   type context = (:save | :destroy)
   type context_proc = ((^() -> context) | (^(_ARLike) -> context))
+  type destroy_context_type = (bool | Symbol | (^() -> boolish) | (^(_ARLike) -> boolish))
 
   module DelegateAttribute
     extend ActiveSupport::Concern
@@ -30,25 +31,24 @@ module ActiveRecordCompose
 
   class InnerModelCollection
     include ::Enumerable[_ARLike]
-    @models: Array[InnerModel]
 
+    def initialize: (Model) -> void
     def each: () { (_ARLike) -> void } -> InnerModelCollection | () -> Enumerator[_ARLike, self]
     def <<: (_ARLike) -> self
-    def push: (_ARLike, ?context: (context | context_proc)) -> self
+    def push: (_ARLike, ?destroy: destroy_context_type, ?context: (nil | context | context_proc)) -> self
     def empty?: -> bool
     def clear: -> self
-    def delete: (_ARLike | InnerModel, ?context: (context | context_proc)) -> InnerModelCollection?
+    def delete: (_ARLike | InnerModel, ?destroy: (nil | destroy_context_type), ?context: (nil | context | context_proc)) -> InnerModelCollection?
 
     private
-    def models: -> Array[InnerModel]
-    def wrap: (_ARLike | InnerModel, context: (context | context_proc)) -> InnerModel
+    attr_reader owner: Model
+    attr_reader models: Array[InnerModel]
+    def wrap: (_ARLike | InnerModel, ?destroy: destroy_context_type, ?context: (nil | context | context_proc)) -> InnerModel
   end
 
   class InnerModel
-    @context: (context | context_proc)
-
-    def initialize: (_ARLike, ?context: (context | context_proc)) -> void
-    def context: -> context
+    def initialize: (_ARLike, ?destroy: destroy_context_type, ?context: (nil | context | context_proc)) -> void
+    def destroy_context?: -> bool
     def save: -> bool
     def save!: -> untyped
     def invalid?: -> bool
@@ -57,6 +57,7 @@ module ActiveRecordCompose
 
     private
     attr_reader model: _ARLike
+    attr_reader destroy_context_type: destroy_context_type
   end
 
   class Model

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - hamajyotan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-01 00:00:00.000000000 Z
+date: 2024-09-19 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.4
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.4.1
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: activemodel form object pattern