glia-errors 0.11.11 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 171865a0d5dbbd2469f022baecf691da4593a50765bbd6032b64641316208d93
-  data.tar.gz: 4f5520230499c9cdb90ec3276c6092408b04f3d9b3a3574d72100504f6d0d653
+  metadata.gz: 75bb40adb6fce2b0a2b5388d30c01d281a87722926709b3a1297a327e5cfb450
+  data.tar.gz: d8404ba18f6e9b45035989ae6d22491014b476721195bec83e9217c94114c8c7
 SHA512:
-  metadata.gz: a86c2deacb6b53bb3af9701fd2eebe946a11537560dca47230c0b521653e162bf5d452a1d245a8d6d7c12b98a1ebe6d0e290a6de324841d3f476242542b180b3
-  data.tar.gz: cfde2dbd2c1cc7c973c3b9c335dc536e314619844835abe199b2c49f3e1ef6361185ef5bbca7a05ef3e4fe8899df62be08f2d0d7492de66b518d1db11c2c3482
+  metadata.gz: c6892d2c4db86ff5baf559d797255fc3cc5d8617330777c7123cc22be4795bc3a1dff13a2672faa14f75ac659f05f40bd12df18ad3e77b5e396571eaa0a2dddc
+  data.tar.gz: 517bbdd25581e00d43da36bc96f19113270fa56535068e5019d3306489e04ff300477197a392bdd0adbfc13535159d1cda17069e3924b659bc3c1439dff5e09d

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'dry-validation', '~> 1.8'
 gem 'prettier', '~> 0.22'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.10'
@@ -11,9 +12,3 @@ gem 'rubocop', '~> 1.5'
 gem 'rubocop-rake', '~> 0.5'
 gem 'rubocop-rspec', '~> 2.0'
 gem 'super_diff'
-
-group :test do
-  gem 'appraisal'
-end
-
-gem 'dry-validation', '~> 1.8'

data/Gemfile.lock

@@ -6,10 +6,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (2.3.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
     ast (2.4.2)
     attr_extras (6.2.5)
     concurrent-ruby (1.1.10)
@@ -90,7 +86,6 @@ GEM
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.0.1)
     unicode-display_width (2.1.0)
 
 PLATFORMS
@@ -98,7 +93,6 @@ PLATFORMS
   x86_64-darwin-19
 
 DEPENDENCIES
-  appraisal
   dry-validation (~> 1.8)
   glia-errors!
   prettier (~> 0.22)

data/README.md

@@ -31,9 +31,7 @@ glia_error = Glia::Errors::ResourceNotFoundError.new(resource: :engagement)
 
 #### Create Glia error from `dry-validation` result
 
-Currently 2 `dry-validation` versions are supported:
-* `v0` up to `0.13`
-* `v1` up to `1.8`
+Supports `dry-validation` from `1.6.x` to `1.8.x`
 
 ```ruby
 schema = Dry::Validation.Schema do
@@ -115,27 +113,10 @@ A Github Action will push the `.gem` file to [rubygems.org](https://rubygems.org
 
 ### Testing
 
-Glia errors support multiple versions of `dry-validation` and tests are run against each supported major version.
-Under the hood we use `Appraisal` gem which generals additional gemfiles for each of the versions.
-
-To run all tests use:
-
 ```
 bundle exec rake test
 ```
 
-To run tests only for `dry-validation` v1:
-
-```
-bundle exec rake test_dry_validation_v1
-```
-
-To run tests only for `dry-validation` v0:
-
-```
-bundle exec rake test_dry_validation_v0
-```
-
 ### Formatting
 
 ```

data/Rakefile

@@ -11,7 +11,7 @@ RuboCop::RakeTask.new do |task|
   task.requires << 'rubocop-rspec'
 end
 
-task default: %i[lint test]
+task default: %i[lint spec]
 
 task :lint do
   sh "rubocop && rbprettier --check '**/*.rb'"
@@ -20,26 +20,3 @@ end
 task :format do
   sh "rbprettier --write '**/*.rb'"
 end
-
-task :install_test_deps do
-  sh 'bundle exec appraisal install'
-end
-
-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
-
-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/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.11'
+  spec.version       = '0.13.0'
   spec.authors       = ['Glia TechMovers']
   spec.email         = ['techmovers@glia.com']
 

data/lib/glia/errors/mapper.rb

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

data/lib/glia/errors.rb

@@ -11,13 +11,14 @@ module Glia
   module Errors
     def self.from_dry_validation_result(result, custom_error_map = {})
       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('2.0')
-        Mapper.from_dry_validation_result(result.to_h, result.errors.to_h, custom_error_map)
-      else
+
+      # When updating supported version ensure that if new version contains new dry-validation new validations
+      # that they are correctly mapped to Glia errors in mapper.rb
+      unless dry_validation_version >= Gem::Version.new('1.0') && dry_validation_version < Gem::Version.new('1.9')
         raise 'Unsupported dry-validation version'
       end
+
+      Mapper.from_dry_validation_result(result.to_h, result.errors.to_h, custom_error_map)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glia-errors
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.13.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -24,13 +24,10 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
-- Appraisals
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
-- gemfiles/dry_validation_v0.gemfile
-- gemfiles/dry_validation_v1.gemfile
 - glia-errors.gemspec
 - lib/glia/errors.rb
 - lib/glia/errors/client_errors.rb

data/Appraisals

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-ruby_major_version = RUBY_VERSION.split('.').first.to_i
-
-if ruby_major_version < 3
-  appraise 'dry_validation_v0' do
-    gem 'dry-container', '~> 0.8.0'
-    gem 'dry-core', '~> 0.5.0'
-    gem 'dry-validation', '~> 0.13.0'
-  end
-end
-
-appraise 'dry_validation_v1' do
-  gem 'dry-validation', '~> 1.8'
-end

data/gemfiles/dry_validation_v0.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "prettier", "~> 0.22"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.10"
-gem "rubocop", "~> 1.5"
-gem "rubocop-rake", "~> 0.5"
-gem "rubocop-rspec", "~> 2.0"
-gem "super_diff"
-gem "dry-validation", "~> 0.13.0"
-gem "dry-container", "~> 0.8.0"
-gem "dry-core", "~> 0.5.0"
-
-group :test do
-  gem "appraisal"
-end
-
-gemspec path: "../"

data/gemfiles/dry_validation_v1.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "prettier", "~> 0.22"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.10"
-gem "rubocop", "~> 1.5"
-gem "rubocop-rake", "~> 0.5"
-gem "rubocop-rspec", "~> 2.0"
-gem "super_diff"
-gem "dry-validation", "~> 1.8"
-
-group :test do
-  gem "appraisal"
-end
-
-gemspec path: "../"