From 30f49cfccab3bb29fdcaba001ab18b24ef63381c Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Wed, 30 Nov 2022 14:51:32 +0100 Subject: [PATCH 1/2] Update gemspec for Rails 7.0 --- active_presenter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/active_presenter.gemspec b/active_presenter.gemspec index f5f2588..54499bf 100644 --- a/active_presenter.gemspec +++ b/active_presenter.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |s| 'test/lint_test.rb', 'test/test_helper.rb' ] - s.add_runtime_dependency('activerecord', ['>= 3.2', '< 7.0']) + s.add_runtime_dependency('activerecord', ['>= 3.2', '< 8.0']) s.add_development_dependency('rake', ['>= 12.0']) s.add_development_dependency('rspec', ['>= 3.0.0']) s.add_development_dependency('sqlite3', ['>= 1.3.5']) From 490ff2a972eeb4d27b3cf2f9f949b2cef1d8b588 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Wed, 29 Mar 2023 15:01:05 +0200 Subject: [PATCH 2/2] Fix errors loop --- lib/active_presenter/base.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/active_presenter/base.rb b/lib/active_presenter/base.rb index 3ed9543..11d2ff5 100644 --- a/lib/active_presenter/base.rb +++ b/lib/active_presenter/base.rb @@ -264,11 +264,11 @@ def attribute_prefix(type) end def merge_errors(presented_inst, type) - presented_inst.errors.each do |att,msg| - if att == :base - errors.add(type, msg) + presented_inst.errors.each do |error| + if error.attribute == :base + errors.add(type, error.message) else - errors.add(attribute_prefix(type)+att.to_s, msg) + errors.add(attribute_prefix(type) + error.attribute.to_s, error.message) end end end