active_record_compose 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e8c6c04b96e3396f6718d7bfbbf8867dce32cf34b9235ea2d37609c9e84dfb
-  data.tar.gz: c05ca6adb42a249a813ef250ea48fe05c72b073408bf3e5503acdb16df9cf585
+  metadata.gz: 0c3cb23854b3caafb1f25c297b1d12fb7693c5af5d8e7f917ce3117e5334afa0
+  data.tar.gz: fe905d6071cc4c491fadd68c35b36540b57881d78b6c398acaf2e573d766912c
 SHA512:
-  metadata.gz: 2c3e646ab33c317647fa533e6d652e9b28fe442d337385d9505f2adafc65aaa75a7c3e6fad86cf869f3842b6c5ac8eebc05690e12547c76ccacdc3c08ca8c4e8
-  data.tar.gz: 1dcaf9de91f6b59a41c7848c969880290c5cb5288e1abba45de07a41b030d3f3d2e6312eca37ac120556d9233b62184a11d410ce208202adf56c9cc00e74acdf
+  metadata.gz: 6a8850ebb01e4705f658bbc65c2cc10366214a2c34787b3d6c6228c34ac405aa00b548212747ef5429fe26eabe1633bf5af9d1019bd95094c1cfd79897811d4c
+  data.tar.gz: a531f7980d9d5ed490aa8c35927176511db6ff81f81009d02ac4121a04abe57efd6ac4dc5db8f353b4ef03c18214c73f246a1c6c8e43e235d1065d436538de31

data/.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [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.
+- add sig/
+- add typecheck for ci.
+
 ## [0.1.8] - 2024-01-16
 
 - avoid executing `#save!` from `Model#save`

data/README.md

@@ -271,6 +271,30 @@ model.update
 # after_save called!
 ```
 
+### I18n
+
+When the `#save!` operation raises an `ActiveRecord::RecordInvalid` exception, it is necessary to have pre-existing locale definitions in order to construct i18n information correctly.
+The specific keys required are `activemodel.errors.messages.record_invalid` or `errors.messages.record_invalid`.
+
+(Replace `en` as appropriate in the context.)
+
+```yaml
+en:
+  activemodel:
+    errors:
+      messages:
+        record_invalid: 'Validation failed: %{errors}'
+```
+
+Alternatively, the following definition is also acceptable:
+
+```yaml
+en:
+  errors:
+    messages:
+      record_invalid: 'Validation failed: %{errors}'
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/active_record_compose/delegate_attribute.rb

@@ -63,7 +63,11 @@ module ActiveRecordCompose
     #
     # @return [Hash] hash with the attribute name as key and the attribute value as value.
     def attributes
-      (defined?(super) ? super : {}).merge(delegated_attributes.to_h { [_1, public_send(_1)] })
+      # 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)] })
     end
   end
 end

data/lib/active_record_compose/inner_model.rb

@@ -16,7 +16,8 @@ module ActiveRecordCompose
 
     # @return [Symbol] :save or :destroy
     def context
-      ret = @context.respond_to?(:call) ? @context.call(model) : @context
+      c = @context
+      ret = c.is_a?(Proc) ? c.call(model) : c
       ret.presence_in(%i[save destroy]) || :save
     end
 

data/lib/active_record_compose/model.rb

@@ -19,7 +19,9 @@ module ActiveRecordCompose
     validate :validate_models
 
     def initialize(attributes = {})
+      # steep:ignore all
       super(attributes)
+      # steep:ignore end
     end
 
     # Save the models that exist in models.
@@ -32,6 +34,8 @@ module ActiveRecordCompose
       return false if invalid?
 
       save_in_transaction { save_models(bang: false) }
+    rescue ActiveRecord::RecordInvalid
+      false
     end
 
     # Save the models that exist in models.
@@ -75,6 +79,8 @@ module ActiveRecordCompose
       return false if invalid?
 
       save_in_transaction { run_callbacks(:create) { save_models(bang: false) } }
+    rescue ActiveRecord::RecordInvalid
+      false
     end
 
     # Behavior is same to `#create`, but raises an exception prematurely on failure.
@@ -116,6 +122,8 @@ module ActiveRecordCompose
       return false if invalid?
 
       save_in_transaction { run_callbacks(:update) { save_models(bang: false) } }
+    rescue ActiveRecord::RecordInvalid
+      false
     end
 
     # Behavior is same to `#update`, but raises an exception prematurely on failure.
@@ -135,10 +143,10 @@ module ActiveRecordCompose
 
     def validate_models = wrapped_models.select { _1.invalid? }.each { errors.merge!(_1) }
 
-    def save_in_transaction(...)
+    def save_in_transaction(&block)
       run_callbacks(:commit) do
         result = ::ActiveRecord::Base.transaction do
-          raise ActiveRecord::Rollback unless run_callbacks(:save, ...)
+          raise ActiveRecord::Rollback unless run_callbacks(:save, &block)
 
           true
         end

data/lib/active_record_compose/version.rb

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

data/sig/active_record_compose.rbs

@@ -0,0 +1,100 @@
+# TypeProf 0.21.9
+
+# Classes
+module ActiveRecordCompose
+  VERSION: String
+
+  interface _ARLike
+    def is_a?: (untyped) -> bool
+    def save: -> bool
+    def save!: -> untyped
+    def destroy: -> bool
+    def destroy!: -> untyped
+    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
+
+  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
+  end
+
+  class InnerModelCollection
+    include ::Enumerable[_ARLike]
+    @models: Array[InnerModel]
+
+    def each: () { (_ARLike) -> void } -> InnerModelCollection | () -> Enumerator[_ARLike, self]
+    def <<: (_ARLike) -> self
+    def push: (_ARLike, ?context: context) -> self
+    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]
+    def wrap: (_ARLike | InnerModel, context: context) -> InnerModel
+  end
+
+  class InnerModel
+    @context: context
+
+    def initialize: (_ARLike, ?context: context) -> void
+    def context: -> context
+    def save: -> bool
+    def save!: -> untyped
+    def invalid?: -> bool
+    def valid?: -> bool
+    def ==: (untyped) -> bool
+    def __raw_model: -> _ARLike
+
+    private
+    attr_reader model: _ARLike
+  end
+
+  class Model
+    extend ActiveModel::Callbacks
+    include ActiveModel::Model
+    include ActiveModel::Validations::Callbacks
+    include ActiveModel::Attributes
+    include ActiveRecord::Transactions
+    include DelegateAttribute
+
+    @__models: InnerModelCollection
+
+    def initialize: (?Hash[attribute_name, untyped]) -> void
+    def save: -> bool
+    def save!: -> untyped
+    def create: (?Hash[attribute_name, untyped]) -> bool
+    def create!: (?Hash[attribute_name, untyped]) -> untyped
+    def update: (?Hash[attribute_name, untyped]) -> bool
+    def update!: (?Hash[attribute_name, untyped]) -> untyped
+
+    private
+    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
+
+    def self.validate: (*untyped) -> untyped
+    def run_callbacks: (untyped kind) ?{ () -> untyped } -> untyped
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - hamajyotan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -37,13 +37,13 @@ files:
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/active_record_compose.rb
 - lib/active_record_compose/delegate_attribute.rb
 - 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/version.rb
+- sig/active_record_compose.rbs
 homepage: https://github.com/hamajyotan/active_record_compose
 licenses:
 - MIT
@@ -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.1.8
+  documentation_uri: https://www.rubydoc.info/gems/active_record_compose/0.2.1
   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.4.10
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: activemodel form object pattern

data/Rakefile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]