error_merger 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c86c83cf6f379820aa9192b42c5a957851a5ca7e115e98be6c958c53d02a37
-  data.tar.gz: 0c332e185ae4dfbf4a987785faa15c8c413abdbff132076d622b4f9009b0b5cb
+  metadata.gz: 6dbc3b90b25bd6dc93fdc352da3dee477e34caefcef094af0f8e7fcaf8cca6b9
+  data.tar.gz: 90155d54eaad0bee370401666cc6aff5c4ac185e908cbe0a4d31a3219ee16d01
 SHA512:
-  metadata.gz: 8e773ba97e0b1f58f8583b1a27a21173b49e392c6c201526df2886ccf10b94fefdbefedad72634f5f8d591d6ab67ef1b949dd2e2e336f9719643cbaf93072997
-  data.tar.gz: d16c73f04d5753ce608c5114b0eb978df96b279ccecabc1c415269ebc53707a81dba3704a9405543837f80c142a486e2751b2c49bd525cac26ec9aefb864574c
+  metadata.gz: 56408c18a41997bf40869aeb37f47cc8bf4114ca63b30f6f63129eaf8aa7bf2fd174ab7f8ddda833d2c2e42e8a78960fdbd5b038b3a0198b04468030014e491e
+  data.tar.gz: d04027b123849ce8f58950161d44d40d45be411f919448c429c75070c2a92a8450892079f9f65aff20974f678ed0b566632675a6af14b33262bda6cde806e561

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 Gemfile.*.lock
 InstalledFiles
 _yardoc

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    error_merger (1.2.0)
+      activemodel (>= 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.2.2)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.20.0)
+    rake (13.0.6)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  error_merger!
+  rake
+
+BUNDLED WITH
+   2.2.22

data/error_merger.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency 'activemodel', '>= 5.2', '< 6.2'
+  spec.add_dependency 'activemodel', '>= 6.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 end

data/lib/error_merger/error_merger.rb

@@ -33,7 +33,7 @@ module ErrorMerger
     if defined?(ActiveModel::Error)
       map do |error|
         m = error.full_message
-        m.end_with?('.') ? m : "#{m}."
+        m =~ %r{[.?!。]$} ? m : "#{m}."
       end
     else
       map{ |attr, m| full_sentence(attr, m) }
@@ -42,7 +42,7 @@ module ErrorMerger
 
   def full_sentence(attribute, message)
     m = full_message(attribute, message)
-    m.end_with?('.') ? m : "#{m}."
+    m =~ %r{[.?!。]$} ? m : "#{m}."
   end
 
   def join_sentences

data/lib/error_merger/version.rb

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

data/test/error_merger_test.rb

@@ -84,6 +84,9 @@ class ErrorMergerTest < ActiveSupport::TestCase
   test "sentences" do
     assert_equal "Name is invalid.", @author.errors.full_sentence(:name, "is invalid")
     assert_equal "Name is invalid.", @author.errors.full_sentence(:name, "is invalid.")
+    assert_equal "Name is invalid!", @author.errors.full_sentence(:name, "is invalid!")
+    assert_equal "Name is invalid?", @author.errors.full_sentence(:name, "is invalid?")
+    assert_equal "Name is invalid。", @author.errors.full_sentence(:name, "is invalid。")
 
     @author.errors.add :name, :invalid
     assert_equal ["Name can't be blank.", "Name is invalid."], @author.errors.full_sentences

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: error_merger
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +62,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - 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
@@ -94,14 +87,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Enhances the Error class on ActiveModel-compliant models

data/gemfiles/Gemfile.rails52

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

data/gemfiles/Gemfile.rails60

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