active_record_compose 0.11.1 → 0.11.3

data/sig/_internal/package_private.rbs

@@ -1,10 +1,46 @@
 module ActiveRecordCompose
-  module AttributeQuerying
+  module Attributes
     extend ActiveSupport::Concern
-    extend ActiveModel::AttributeMethods::ClassMethods
+    include ActiveModel::Attributes
+    include Querying
 
-    private
-    def attribute?: (attribute_name) -> untyped
+    def delegated_attributes: () -> Array[Delegation]
+
+    module ClassMethods : Module
+      include ActiveModel::Attributes::ClassMethods
+      include ActiveModel::AttributeMethods::ClassMethods
+
+      def delegate_attribute: (*untyped methods, to: untyped, ?allow_nil: bool) -> untyped
+      def delegated_attributes: () -> Array[Delegation]
+      def delegated_attributes=: (Array[Delegation]) -> untyped
+    end
+
+    class Delegation
+      def initialize: (attribute: String, to: Symbol, ?allow_nil: bool) -> void
+      def attribute: () -> Symbol
+      def attribute_name: () -> String
+      def attribute_hash: (Object model) -> Hash[String, untyped]
+      def define_delegated_attribute: ((Module & ActiveModel::AttributeMethods::ClassMethods) klass) -> void
+
+      @attribute: Symbol
+      @to: Symbol
+      @allow_nil: bool
+
+      private
+      def to: () -> Symbol
+      def allow_nil: () -> bool
+      def reader: () -> String
+      def writer: () -> String
+    end
+
+    module Querying
+      include ActiveModel::AttributeMethods
+      extend ActiveSupport::Concern
+      extend ActiveModel::AttributeMethods::ClassMethods
+
+      private
+      def attribute?: (attribute_name) -> untyped
+    end
   end
 
   module Callbacks
@@ -36,26 +72,12 @@ module ActiveRecordCompose
     include PackagePrivate
   end
 
-  module DelegateAttribute : ActiveModel::Attributes
-    extend ActiveSupport::Concern
-
-    def delegated_attributes: () -> Array[String]
-
-    module ClassMethods : Module
-      include ActiveModel::AttributeMethods::ClassMethods
-
-      def delegate_attribute: (*untyped methods, to: untyped, ?allow_nil: untyped?) -> untyped
-      def delegated_attributes: () -> Array[String]
-      def delegated_attributes=: (Array[String]) -> untyped
-    end
-  end
-
   class Model
-    include DelegateAttribute
-    extend DelegateAttribute::ClassMethods
+    include Attributes
+    extend Attributes::ClassMethods
     include TransactionSupport
     extend TransactionSupport::ClassMethods
-    include ActiveRecordCompose::Callbacks
+    include Callbacks
 
     @__models: ComposedCollection
 
@@ -79,7 +101,27 @@ module ActiveRecordCompose
     end
   end
 
+  module Persistence
+    include Callbacks
+    include TransactionSupport
+    extend TransactionSupport::ClassMethods
+
+    def save: (**untyped options) -> bool
+    def save!: (**untyped options) -> untyped
+    def update: (?Hash[attribute_name, untyped]) -> bool
+    def update!: (?Hash[attribute_name, untyped]) -> untyped
+
+    private
+    def models: -> ComposedCollection
+    def save_models: (bang: bool, **untyped options) -> bool
+    def raise_on_save_error: -> bot
+    def raise_on_save_error_message: -> String
+  end
+
   module Validations : Model
+    extend ActiveSupport::Concern
+    extend ActiveModel::Validations::ClassMethods
+
     def save: (**untyped options) -> bool
     def save!: (**untyped options) -> untyped
     def valid?: (?validation_context context) -> bool
@@ -87,7 +129,6 @@ module ActiveRecordCompose
     @context_for_override_validation: OverrideValidationContext
 
     private
-
     def perform_validations: (::Hash[untyped, untyped]) -> bool
     def raise_validation_error: -> bot
     def context_for_override_validation: -> OverrideValidationContext

data/sig/active_record_compose.rbs

@@ -71,7 +71,7 @@ module ActiveRecordCompose
     def self.after_commit: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> void } -> void
     def self.after_rollback: (*callback[instance], ?if: condition[instance], ?unless: condition[instance], **untyped) ?{ () [self: instance] -> void } -> void
 
-    def self.delegate_attribute: (*untyped methods, to: untyped, ?allow_nil: untyped?) -> untyped
+    def self.delegate_attribute: (*untyped methods, to: untyped, ?allow_nil: bool) -> untyped
     def self.connection: -> ActiveRecord::ConnectionAdapters::AbstractAdapter
     def self.lease_connection: -> ActiveRecord::ConnectionAdapters::AbstractAdapter
     def self.with_connection: [T] () { () -> T } -> T

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - hamajyotan
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
 description: activemodel form object pattern. it embraces multiple AR models and provides
   a transparent interface as if they were a single model.
 email:
@@ -32,16 +38,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
 - lib/active_record_compose.rb
-- lib/active_record_compose/attribute_querying.rb
+- lib/active_record_compose/attributes.rb
+- lib/active_record_compose/attributes/delegation.rb
+- lib/active_record_compose/attributes/querying.rb
 - lib/active_record_compose/callbacks.rb
 - lib/active_record_compose/composed_collection.rb
-- lib/active_record_compose/delegate_attribute.rb
 - lib/active_record_compose/model.rb
+- lib/active_record_compose/persistence.rb
 - lib/active_record_compose/transaction_support.rb
 - lib/active_record_compose/validations.rb
 - lib/active_record_compose/version.rb
@@ -55,7 +64,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.11.1
+  documentation_uri: https://hamajyotan.github.io/active_record_compose/
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -71,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: activemodel form object pattern
 test_files: []

data/lib/active_record_compose/attribute_querying.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordCompose
-  # = Attribute \Querying
-  #
-  # This provides predicate methods based on the attributes.
-  #
-  #   class AccountRegistration < ActiveRecordCompose::Model
-  #     def initialize
-  #       @account = Account.new
-  #       super()
-  #       models << account
-  #     end
-  #
-  #     attribute :original_attr
-  #     delegate_attribute :name, :email, to: :account
-  #
-  #     private
-  #
-  #     attr_reader :account
-  #   end
-  #
-  #   model = AccountRegistration.new
-  #
-  #   model.name                    #=> nil
-  #   model.name?                   #=> false
-  #   model.name = 'Alice'
-  #   model.name?                   #=> true
-  #
-  #   model.original_attr = "Bob"
-  #   model.original_attr?          #=> true
-  #   model.original_attr = ""
-  #   model.original_attr?          #=> false
-  #
-  #   # If the value is numeric, it returns the result of checking whether it is zero or not.
-  #   # This behavior is consistent with `ActiveRecord::AttributeMethods::Query`.
-  #   model.original_attr = 123
-  #   model.original_attr?          #=> true
-  #   model.original_attr = 0
-  #   model.original_attr?          #=> false
-  #
-  module AttributeQuerying
-    extend ActiveSupport::Concern
-
-    included do
-      attribute_method_suffix '?', parameters: false
-    end
-
-    private
-
-    def attribute?(attr_name)
-      value = public_send(attr_name)
-
-      case value
-      when true then true
-      when false, nil then false
-      else
-        if value.respond_to?(:zero?)
-          !value.zero?
-        else
-          value.present?
-        end
-      end
-    end
-  end
-end

data/lib/active_record_compose/delegate_attribute.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordCompose
-  # = Delegate \Attribute
-  #
-  # It provides a macro description that expresses access to the attributes of the AR model through delegation.
-  #
-  #   class AccountRegistration < ActiveRecordCompose::Model
-  #     def initialize(account, attributes = {})
-  #       @account = account
-  #       super(attributes)
-  #       models.push(account)
-  #     end
-  #
-  #     attribute :original_attribute, :string, default: 'qux'
-  #
-  #     # like a `delegate :name, :name=, to: :account`
-  #     delegate_attribute :name, to: :account
-  #
-  #     private
-  #
-  #     attr_reader :account
-  #   end
-  #
-  #   account = Account.new
-  #   account.name = 'foo'
-  #
-  #   registration = AccountRegistration.new(account)
-  #   registration.name  #=> 'foo'  # delegate to account#name
-  #
-  #   registration.name = 'bar'  # delegate to account#name=
-  #   account.name  #=> 'bar'
-  #
-  #   # Attributes defined in delegate_attribute will be included in the original `#attributes`.
-  #   registration.attributes  #=> { 'original_attribute' => 'qux', 'name' => 'bar' }
-  #
-  module DelegateAttribute
-    extend ActiveSupport::Concern
-
-    included do
-      # @type self: Class
-      class_attribute :delegated_attributes, instance_writer: false
-    end
-
-    module ClassMethods
-      # Defines the reader and writer for the specified attribute.
-      #
-      def delegate_attribute(*attributes, to:, allow_nil: nil)
-        delegates = attributes.flat_map do |attribute|
-          reader = attribute.to_s
-          writer = "#{attribute}="
-
-          [reader, writer]
-        end
-
-        delegate(*delegates, to:, allow_nil:)
-        attributes.each { define_attribute_methods _1 }
-        self.delegated_attributes = delegated_attributes.to_a + attributes.map { _1.to_s }
-      end
-    end
-
-    # Returns a array of attribute name.
-    # Attributes declared with `delegate_attribute` are also merged.
-    #
-    # @return [Array<String>] array of attribute name.
-    def attribute_names = super + delegated_attributes
-
-    # Returns a hash with the attribute name as key and the attribute value as value.
-    # Attributes declared with `delegate_attribute` are also merged.
-    #
-    # @return [Hash] hash with the attribute name as key and the attribute value as value.
-    def attributes
-      super.merge(delegated_attributes.to_h { [_1, public_send(_1)] })
-    end
-  end
-end