validates_associated_with_context 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1233b7d28ae93c0fed5840a8f36ee9f8e745e5c09ae7712f634e91d03df6bbfa
-  data.tar.gz: f835e5d9824cc9aceeeff5686c77fe61068440aff02921d855dd4fe9d2a9c531
+  metadata.gz: cadc82e10e44e2ad51e4237f48a2db4693b9d8228d8b81a1f2cca041e12beb82
+  data.tar.gz: bec3863a52663e08bf07d709e11262d6c4f9bd63312b79d731f7d03c867473cb
 SHA512:
-  metadata.gz: cbe112416406fd2a309216571a2926df4e1e2d5eef68a400c3ad1c18cf6e2bb553e2f7d5871e7498a657ded3e2f245f778930e9018b3e9e91231772046713609
-  data.tar.gz: e2bb59482622df4ddebc2a366822e533167b1fe549b7c41c1728156adf6d21a6b4736d9199feda623e9ce8056a5e13920677fffaee53dba3d981429ffc5298fa
+  metadata.gz: 0be5cb7c91b46eb12f7370e72a25d6c8a68435dec3f37cb01a48b086da8d60ea71a671f1481fca40e41d090282d91b7055854853559ead6c441f4eb1e31601ca
+  data.tar.gz: b392807810156061ba7dffd8b5333432e9165d9684f4327196d0720b097301b00ed96c6ceab35329aa9549a8c5171d62d71c3c0fd774e9a74f44a04ea5255ea0

data/lib/validates_associated_with_context/associated_with_context.rb

@@ -2,20 +2,45 @@
 
 module ValidatesAssociatedWithContext
   class AssociatedWithContextValidator < ActiveModel::EachValidator # :nodoc:
-    attr_reader :context, :inherit_context
+    attr_reader :inherit_context, :bubble_messages
 
     def initialize(options)
       @context = options.delete(:context)
       @inherit_context = options.delete(:inherit_context)
+      @bubble_messages = options.delete(:bubble_messages)
 
       super
     end
 
+    def context(record)
+      return record.validation_context if inherit_context
+
+      if @context.respond_to?(:call)
+        @context.call record
+      else
+        @context
+      end
+    end
+
     def validate_each(record, attribute, value)
-      validation_context = inherit_context ? record.validation_context : context
+      validation_context = context(record)
+
+      if bubble_messages
+        Array(value).each do |r|
+          next if valid_object?(r, validation_context)
 
-      if Array(value).reject { |r| valid_object?(r, validation_context) }.any?
-        record.errors.add(attribute, :invalid, **options.merge(value: value))
+          if r.errors.any?
+            r.errors.each do |error|
+              record.errors.add(attribute, error.full_message, **options.merge(value: r))
+            end
+          else
+            record.errors.add(attribute, :invalid, **options.merge(value: r))
+          end
+        end
+      else
+        if Array(value).reject { |r| valid_object?(r, validation_context) }.any?
+          record.errors.add(attribute, :invalid, **options.merge(value: value))
+        end
       end
     end
 

data/lib/validates_associated_with_context/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ValidatesAssociatedWithContext
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_associated_with_context
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Guillaume Dott
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: Adds validates_associated_with_context to models to validate associated
   models with validation context
 email:
@@ -40,7 +54,6 @@ files:
 - lib/validates_associated_with_context.rb
 - lib/validates_associated_with_context/associated_with_context.rb
 - lib/validates_associated_with_context/version.rb
-- validates_associated_with_context.gemspec
 homepage: https://code.amnesix.eu/guillaume/validates_associated_with_context
 licenses:
 - MIT

data/validates_associated_with_context.gemspec

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/validates_associated_with_context/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "validates_associated_with_context"
-  spec.version = ValidatesAssociatedWithContext::VERSION
-  spec.authors = ["Guillaume Dott"]
-  spec.email = ["guillaume+github@dott.fr"]
-
-  spec.summary = "validates_associated with validation context"
-  spec.description = "Adds validates_associated_with_context to models to validate associated models with validation context"
-  spec.homepage = "https://code.amnesix.eu/guillaume/validates_associated_with_context"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://code.amnesix.eu/guillaume/validates_associated_with_context"
-  spec.metadata["changelog_uri"] = "https://code.amnesix.eu/guillaume/validates_associated_with_context/src/branch/main/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "activemodel", "~> 7.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end