glia-errors 0.11.4 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbaef28887dfc236d0f10cb730ac6dc44813f102bc8023da5fda37089815f318
-  data.tar.gz: 4e33efaa3c820a47896b3b69b859f00fbebcc2477ae0dc8d796f3eab6ed4b17a
+  metadata.gz: 60637b108734e188c93f311dfe47eff44b1a674758f8a57be79abd3992931c3e
+  data.tar.gz: 93cb024740d9e8285bba6d47662af6c36b9489822d8955e5d04aec5baa40a607
 SHA512:
-  metadata.gz: 52bdf038de5e035b2825c870d0f9912e93aa27254c464c2b55c5dac3864d429e05455b283fba81105cd03c0ba837b1d4aaf957d89af8b82f359c514bb0093c76
-  data.tar.gz: fb6f1cd85a31526f692be5d5a4201074decaf2f82d1d40fec3bee9f24b43683c9300bc707c2ea918f7dfd73b1bfbcd92db4b70aabf05a3c65e0092c8ad5fe359
+  metadata.gz: 7006e976f159bf23b2540af04b55d8ca156fddb45257f80c23bafdfd8b87c884c802b5e55a07d013d926229177e4e94cc53dd108fa16531f202cb4104fc8e0ab
+  data.tar.gz: eb2421995bccf24037acd5d5f6e3af524301b03ac236422ab37b4e5d9f48e748b87178401498e0b7a2a509d71d31b180dc2014fbda34dcb74f3e1ccf0eb55104

data/.rubocop.yml

@@ -14,3 +14,6 @@ Metrics/ModuleLength:
 Metrics/BlockLength:
   Exclude:
   - 'spec/**/*'
+
+Gemspec/RequireMFA:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.1

data/Appraisals

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
-appraise 'dry_validation_v0' do
-  gem 'dry-validation', '~> 0.13.0'
+ruby_major_version = RUBY_VERSION.split('.').first.to_i
+
+if ruby_major_version < 3
+  appraise 'dry_validation_v0' do
+    gem 'dry-core', '~> 0.5.0'
+    gem 'dry-validation', '~> 0.13.0'
+  end
 end
 
 appraise 'dry_validation_v1' do
-  gem 'dry-validation', '~> 1.6'
+  gem 'dry-validation', '~> 1.7'
 end

data/Gemfile

@@ -2,6 +2,8 @@
 
 source 'https://rubygems.org'
 
+gemspec
+
 gem 'prettier', '~> 0.22'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.10'
@@ -13,3 +15,5 @@ gem 'super_diff'
 group :test do
   gem 'appraisal'
 end
+
+gem 'dry-validation', '~> 1.8'

data/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    glia-errors (0.11.8)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -5,19 +10,53 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.1)
-    attr_extras (6.2.4)
-    diff-lcs (1.4.4)
-    parallel (1.20.1)
-    parser (2.7.2.0)
+    ast (2.4.2)
+    attr_extras (6.2.5)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    dry-configurable (0.14.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.1)
+    dry-initializer (3.1.1)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-schema (1.9.1)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.5)
+    dry-types (1.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    dry-validation (1.8.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.5, >= 0.5)
+      dry-initializer (~> 3.0)
+      dry-schema (~> 1.9, >= 1.9.1)
+    optimist (3.0.1)
+    parallel (1.22.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    patience_diff (1.1.0)
-      trollop (~> 1.16)
+    patience_diff (1.2.0)
+      optimist (~> 3.0)
     prettier (0.22.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.1)
-    regexp_parser (2.0.0)
-    rexml (3.2.4)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -31,30 +70,28 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.5.2)
+    rubocop (1.26.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.5.1)
       rubocop
-    rubocop-rspec (2.0.1)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    ruby-progressbar (1.10.1)
-    super_diff (0.5.2)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    super_diff (0.8.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
     thor (1.0.1)
-    trollop (1.16.2)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -62,6 +99,8 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  dry-validation (~> 1.8)
+  glia-errors!
   prettier (~> 0.22)
   rake (~> 13.0)
   rspec (~> 3.10)
@@ -71,4 +110,4 @@ DEPENDENCIES
   super_diff
 
 BUNDLED WITH
-   2.2.4
+   2.3.9

data/README.md

@@ -33,7 +33,7 @@ glia_error = Glia::Errors::ResourceNotFoundError.new(resource: :engagement)
 
 Currently 2 `dry-validation` versions are supported:
 * `v0` up to `0.13`
-* `v1` up to `1.6`
+* `v1` up to `1.8`
 
 ```ruby
 schema = Dry::Validation.Schema do

data/Rakefile

@@ -25,12 +25,21 @@ task :install_test_deps do
   sh 'bundle exec appraisal install'
 end
 
-task test: %i[test_dry_validation_v1 test_dry_validation_v0]
+ruby_major_version = RUBY_VERSION.split('.').first.to_i
+
+# dry-validation 0.x won't load in Ruby 3
+if ruby_major_version < 3
+  task test: %i[test_dry_validation_v1 test_dry_validation_v0]
+else
+  task test: :test_dry_validation_v1
+end
 
 task test_dry_validation_v1: :install_test_deps do
   sh 'bundle exec appraisal dry_validation_v1 rspec'
 end
 
-task test_dry_validation_v0: :install_test_deps do
-  sh 'bundle exec appraisal dry_validation_v0 rspec --tag dry_validation_v0'
+if ruby_major_version < 3
+  task test_dry_validation_v0: :install_test_deps do
+    sh 'bundle exec appraisal dry_validation_v0 rspec --tag dry_validation_v0'
+  end
 end

data/gemfiles/dry_validation_v0.gemfile

@@ -10,7 +10,10 @@ gem "rubocop-rake", "~> 0.5"
 gem "rubocop-rspec", "~> 2.0"
 gem "super_diff"
 gem "dry-validation", "~> 0.13.0"
+gem "dry-core", "~> 0.5.0"
 
 group :test do
   gem "appraisal"
 end
+
+gemspec path: "../"

data/gemfiles/dry_validation_v1.gemfile

@@ -9,8 +9,10 @@ gem "rubocop", "~> 1.5"
 gem "rubocop-rake", "~> 0.5"
 gem "rubocop-rspec", "~> 2.0"
 gem "super_diff"
-gem "dry-validation", "~> 1.6"
+gem "dry-validation", "~> 1.7"
 
 group :test do
   gem "appraisal"
 end
+
+gemspec path: "../"

data/glia-errors.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'glia-errors'
-  spec.version       = '0.11.4'
+  spec.version       = '0.11.8'
   spec.authors       = ['Glia TechMovers']
   spec.email         = ['techmovers@glia.com']
 
@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.5'
+  spec.required_ruby_version = '>= 2.5', '< 4.0'
 end

data/lib/glia/errors/client_errors.rb

@@ -56,6 +56,7 @@ module Glia
         DATE = 'date'
         TIME = 'time'
         UUID = 'uuid'
+        URL = 'url'
       end
 
       def initialize(field:, format: nil, message: nil)
@@ -84,6 +85,8 @@ module Glia
           'ISO-8601 date and time'
         when Formats::UUID
           'UUID'
+        when Formats::URL
+          'URL'
         else
           raise 'Unexpected InvalidFormatError format'
         end

data/lib/glia/errors/mapper.rb

@@ -125,7 +125,8 @@ module Glia
         'is missing' => MISSING_VALUE_ERROR,
         # Custom format errors
         'must be in E.164 format' => INVALID_FORMAT_ERROR,
-        'must be up to 7-digit string' => INVALID_FORMAT_ERROR,
+        'must be up to 25 symbol string that contains only 1-7 digits and commas' =>
+          INVALID_FORMAT_ERROR,
         'must be a valid email' => INVALID_FORMAT_ERROR
       }.freeze
 

data/lib/glia/errors.rb

@@ -13,7 +13,7 @@ module Glia
       dry_validation_version = Gem.loaded_specs['dry-validation'].version
       if dry_validation_version < Gem::Version.new('1.0')
         Mapper.from_dry_validation_result(result.output, result.errors, custom_error_map)
-      elsif dry_validation_version <= Gem::Version.new('1.6')
+      elsif dry_validation_version <= Gem::Version.new('1.8')
         Mapper.from_dry_validation_result(result.to_h, result.errors.to_h, custom_error_map)
       else
         raise 'Unsupported dry-validation version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glia-errors
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.8
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -49,16 +49,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Glia REST API errors