glia-errors 0.11.10 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182a479821307d1d9b7fd5b1ba47ee4bbeb5cb8c69c6e58963d387b8b383b92b
-  data.tar.gz: 988265708f5ed2a46d14a05c39ec2b526f27ef540959f5d234a749cb7290c8b5
+  metadata.gz: 2a2c74c904931658ed3873ae51474edddcb93b0110129cfa7e70bb4c4894ffc8
+  data.tar.gz: 377d265f4e0772363bfbbac4fc4be97ba925d99afe78ba458ef72f1329e79fad
 SHA512:
-  metadata.gz: c83b5503cd6904ac367f1afbebcdf9e45a380bdaacb28d0ff10a414ef68cffd2d7ea8dbf227b1577427108c5ced9a636c5cf4fe71500adbfe20a2981e5fccf5b
-  data.tar.gz: 594b6ab2e41d8219cfe587db80e5c04684b780f7c9eb74dcc90289c84ccd2ecfcf49a942ba74ce64d042b5039895a7c9831397682933131284496d030c281e33
+  metadata.gz: c3d8c4ad7aaf500b3d3cc056d7166b0f41ec184a452a11d1f89c28f1d518bbdfe79386ec1c796d5254486b968f81336a638343f913c6c313a872a72f31da1f80
+  data.tar.gz: 67833dced10d66343315259b86de96565e583295295352caac505e488555d101d1a1daa82c95476b6158bcf80972f3a8edf9ac537e4d7992190ec19dd89c1178

data/.prettierrc

@@ -1 +1 @@
-printWidth: 100
+printWidth: 120

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
@@ -106,31 +104,19 @@ else
 end
 ```
 
-## Contributing
+## Releasing a new version
 
-### Testing
+A new version is created when a change is merged into the master branch that changes the version number in `glia-errors.gemspec`.
+A Github Action will push the `.gem` file to [rubygems.org](https://rubygems.org)
 
-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.
+## Contributing
 
-To run all tests use:
+### Testing
 
 ```
 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.10'
+  spec.version       = '0.12.0'
   spec.authors       = ['Glia TechMovers']
   spec.email         = ['techmovers@glia.com']
 

data/lib/glia/errors/client_errors.rb

@@ -62,11 +62,7 @@ module Glia
 
       def initialize(field:, format: nil, message: nil)
         default_message =
-          if format
-            "has invalid format, required format is #{humanize_format(format)}"
-          else
-            'has invalid format'
-          end
+          format ? "has invalid format, required format is #{humanize_format(format)}" : 'has invalid format'
         super(
           type: INVALID_FORMAT_ERROR,
           ref: create_ref(INVALID_FORMAT_ERROR),
@@ -261,9 +257,7 @@ module Glia
     class RouteNotFoundError < Error
       def initialize(message: nil)
         super(
-          type: ROUTE_NOT_FOUND_ERROR,
-          ref: create_ref(ROUTE_NOT_FOUND_ERROR),
-          message: message || 'Route not found'
+          type: ROUTE_NOT_FOUND_ERROR, ref: create_ref(ROUTE_NOT_FOUND_ERROR), message: message || 'Route not found'
         )
       end
     end
@@ -281,9 +275,7 @@ module Glia
     class CarrierError < Error
       def initialize(message: nil)
         super(
-          type: CARRIER_ERROR,
-          ref: create_ref(CARRIER_ERROR),
-          message: message || 'Downstream carrier issue occurred'
+          type: CARRIER_ERROR, ref: create_ref(CARRIER_ERROR), message: message || 'Downstream carrier issue occurred'
         )
       end
     end
@@ -417,6 +409,25 @@ module Glia
       end
     end
 
+    class ItemsOverlapError < Error
+      def initialize(overlapping_item_indexes:, message: nil)
+        raise ArgumentError, 'overlapping_item_indexes value must be list' unless overlapping_item_indexes.is_a?(Array)
+
+        raise ArgumentError, 'at least 2 overlapping item indexes are required' if overlapping_item_indexes.size < 2
+
+        overlapping_item_indexes.each do |value|
+          raise ArgumentError, 'overlapping_item_indexes values must be integers' unless value.is_a?(Integer)
+        end
+
+        super(
+          type: ITEMS_OVERLAP_ERROR,
+          ref: create_ref(ITEMS_OVERLAP_ERROR),
+          message: message || 'Items must not overlap each other',
+          error_details: { overlapping_item_indexes: overlapping_item_indexes }
+        )
+      end
+    end
+
     # rubocop:enable Style/Documentation
   end
 end

data/lib/glia/errors/error.rb

@@ -16,9 +16,7 @@ module Glia
       end
 
       def to_h
-        {
-          type: type, ref: ref, message: message, error_details: error_details_to_h(@error_details)
-        }.compact
+        { type: type, ref: ref, message: message, error_details: error_details_to_h(@error_details) }.compact
       end
 
       private
@@ -27,9 +25,7 @@ module Glia
         return details if primitive?(details)
 
         if details.is_a?(Hash)
-          details.keys.each_with_object({}) do |field, hash|
-            hash[field] = error_details_to_h(details[field])
-          end
+          details.keys.each_with_object({}) { |field, hash| hash[field] = error_details_to_h(details[field]) }
         elsif details.is_a?(Array)
           details.map { |error| error_details_to_h(error) }
         elsif details.respond_to?(:to_h)
@@ -40,8 +36,7 @@ module Glia
       end
 
       def primitive?(details)
-        details.nil? ||
-          [TrueClass, FalseClass, String, Integer, Float, Symbol].include?(details.class)
+        details.nil? || [TrueClass, FalseClass, String, Integer, Float, Symbol].include?(details.class)
       end
 
       def create_ref(type)

data/lib/glia/errors/error_types.rb

@@ -34,8 +34,8 @@ module Glia
     FACEBOOK_ACCESS_TOKEN_NOT_PERMANENT_ERROR = 'facebook_access_token_not_permanent_error'
     OAUTH_CODE_EXPIRED_ERROR = 'oauth_code_expired_error'
     OAUTH_CODE_ALREADY_USED_ERROR = 'oauth_code_already_used_error'
-    APPLE_BUSINESS_CHAT_BUSINESS_USED_BY_OTHER_SITE_ERROR =
-      'apple_business_chat_business_used_by_other_site_error'
+    APPLE_BUSINESS_CHAT_BUSINESS_USED_BY_OTHER_SITE_ERROR = 'apple_business_chat_business_used_by_other_site_error'
+    ITEMS_OVERLAP_ERROR = 'items_overlap_error'
 
     # Server errors
     INTERNAL_SERVER_ERROR = 'internal_server_error'

data/lib/glia/errors/mapper.rb

@@ -12,8 +12,7 @@ module Glia
               InvalidTypeError::Types::ARRAY
             when 'must be an integer', 'must be Integer'
               InvalidTypeError::Types::INTEGER
-            when 'must be a number', 'must be a float', 'must be a decimal', 'must be Float',
-                 'must be BigDecimal'
+            when 'must be a number', 'must be a float', 'must be a decimal', 'must be Float', 'must be BigDecimal'
               InvalidTypeError::Types::NUMBER
             when 'must be a hash', 'must be Hash'
               InvalidTypeError::Types::OBJECT
@@ -39,11 +38,7 @@ module Glia
       # so we are separating them ourselves
       INVALID_NUMBER_OR_VALUE_ERROR =
         lambda do |field, value, _message|
-          if value.is_a?(String)
-            InvalidValueError.new(field: field)
-          else
-            InvalidNumberError.new(field: field)
-          end
+          value.is_a?(String) ? InvalidValueError.new(field: field) : InvalidNumberError.new(field: field)
         end
 
       INVALID_DATE_FORMAT =
@@ -125,8 +120,7 @@ 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 only 1-7 digits and commas' => INVALID_FORMAT_ERROR,
         'must be a valid email' => INVALID_FORMAT_ERROR
       }.freeze
 
@@ -146,9 +140,7 @@ module Glia
                 # This is not needed for the `else` case as dry-validation already provides an array.
                 [from_dry_validation_result_rec(field_value, field_messages, error_map)]
               else
-                field_messages.map do |message|
-                  from_dry_validation_error(field, field_value, message, error_map)
-                end
+                field_messages.map { |message| from_dry_validation_error(field, field_value, message, error_map) }
               end
           end
         InputValidationError.new(error_details: error_details)

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.10
+  version: 0.12.0
 platform: ruby
 authors:
 - Glia TechMovers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-10-13 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
@@ -39,11 +36,11 @@ files:
 - lib/glia/errors/mapper.rb
 - lib/glia/errors/naming.rb
 - lib/glia/errors/server_errors.rb
-homepage:
+homepage: 
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -61,8 +58,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Glia REST API errors
 test_files: []

data/Appraisals

@@ -1,14 +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-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,19 +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-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: "../"