error_merger 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87170e6fd3bc27364650b6f827e45f66f9d0d3c5396510db4818bb617db82c55
-  data.tar.gz: fa46155a9ce06b76259446361a70c8551691307bc39f818ad45c8da8517cd9fb
+  metadata.gz: 04c86c83cf6f379820aa9192b42c5a957851a5ca7e115e98be6c958c53d02a37
+  data.tar.gz: 0c332e185ae4dfbf4a987785faa15c8c413abdbff132076d622b4f9009b0b5cb
 SHA512:
-  metadata.gz: cb16d0e6e035dd9a178484caee3b2c4ad89f549190d97bc9df76288d1c47c2e8579c6dca8844f26286f08323c5d578d224bd809101b75996fc57e48a6a7d0dd2
-  data.tar.gz: 244ec7c85feca9165e8293a09742a95d3003cafa85551fcabab2167d032f7d9ef7eaa81236fa2a8738e29b877e0bf8efd8353881b1f9ba559d96e42f7bb94290
+  metadata.gz: 8e773ba97e0b1f58f8583b1a27a21173b49e392c6c201526df2886ccf10b94fefdbefedad72634f5f8d591d6ab67ef1b949dd2e2e336f9719643cbaf93072997
+  data.tar.gz: d16c73f04d5753ce608c5114b0eb978df96b279ccecabc1c415269ebc53707a81dba3704a9405543837f80c142a486e2751b2c49bd525cac26ec9aefb864574c

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Gemfile.*.lock
 InstalledFiles
 _yardoc
 coverage

data/Rakefile

@@ -9,3 +9,33 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
+
+GEMFILES = {
+  '2.6@gem52' => 'Gemfile.rails52',
+  '2.6@gem60' => 'Gemfile.rails60',
+  '2.6@gem61' => 'Gemfile.rails61',
+}
+
+namespace :test do
+  task :install_all do
+    GEMFILES.each do |gemset, gemfile|
+      puts "\n\n========== Running 'bundle install' with #{gemfile} ==========\n"
+      puts `rvm #{gemset} --create do bundle install --gemfile=gemfiles/#{gemfile}`
+    end
+  end
+
+  desc 'test against all supported versions of rails'
+  task :all do
+    err = 0
+    cmd = ENV['RUN'] || 'rake test'
+    GEMFILES.each do |gemset, gemfile|
+      puts "\n\n========== Running '#{cmd}' with #{gemfile} ==========\n"
+      puts `rvm #{gemset} do bundle exec --gemfile=gemfiles/#{gemfile} #{cmd}`
+      err += 1 unless $?.success?
+    end
+    if err > 0
+      puts "\n>>> #{err} gemfiles failed"
+      exit err # exit code is # of failed runs
+    end
+  end
+end

data/error_merger.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'activemodel', '>= 5', '< 6.1'
+  spec.add_dependency 'activemodel', '>= 5.2', '< 6.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/gemfiles/Gemfile.rails52

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 5.2.0'
+
+# Specify your gem's dependencies in error_merger.gemspec
+gemspec path: '..'

data/gemfiles/Gemfile.rails60

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 6.0.0'
+
+# Specify your gem's dependencies in error_merger.gemspec
+gemspec path: '..'

data/gemfiles/Gemfile.rails61

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 6.1.0'
+
+# Specify your gem's dependencies in error_merger.gemspec
+gemspec path: '..'

data/lib/error_merger/error_merger.rb

@@ -5,7 +5,11 @@ module ErrorMerger
   #     @user.errors.merge @account, "Account ##{@account.id}:"
   #     @user.errors.merge @account, attribute: :account
   def merge(assoc_or_errors, prefix=nil, attribute: :base)
-    errors = assoc_or_errors.respond_to?(:errors) ? assoc_or_errors.errors : assoc_or_errors
+    if assoc_or_errors.respond_to?(:errors) && assoc_or_errors.errors.is_a?(ActiveModel::Errors)
+      errors = assoc_or_errors.errors
+    else
+      errors = assoc_or_errors
+    end
 
     if attribute == :base && prefix.nil? && errors.instance_variable_defined?(:@base)
       prefix = "#{errors.instance_variable_get(:@base).class.model_name.human}: "
@@ -26,7 +30,14 @@ module ErrorMerger
   end
 
   def full_sentences
-    map{ |attr, m| full_sentence(attr, m) }
+    if defined?(ActiveModel::Error)
+      map do |error|
+        m = error.full_message
+        m.end_with?('.') ? m : "#{m}."
+      end
+    else
+      map{ |attr, m| full_sentence(attr, m) }
+    end
   end
 
   def full_sentence(attribute, message)

data/lib/error_merger/version.rb

@@ -1,3 +1,3 @@
 module ErrorMerger
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: error_merger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - thomas morgan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,9 @@ files:
 - README.md
 - Rakefile
 - error_merger.gemspec
+- gemfiles/Gemfile.rails52
+- gemfiles/Gemfile.rails60
+- gemfiles/Gemfile.rails61
 - lib/error_merger.rb
 - lib/error_merger/error_merger.rb
 - lib/error_merger/version.rb
@@ -83,7 +86,7 @@ homepage: https://github.com/zarqman/error_merger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Enhances the Error class on ActiveModel-compliant models
 test_files: