schemacop 3.0.14 → 3.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a0558e32f2c4a8e4d9db631ac874629ed7e92a378a177266a216b9e35295bd
-  data.tar.gz: fa2da0867bf598a32ba7728b246343f6bf3849aa1ccdddf9093dcd360df2b53e
+  metadata.gz: c486c27262569e4a3f3f3b9751aedfab72a15611c457c9748577e2d2625f43ec
+  data.tar.gz: dc61cc778afc5403904fcc51cb74c81fadb0d5b3142ffb91f0b09b2eb82f4c69
 SHA512:
-  metadata.gz: 557da4f2765fc6a9c081b1b894f57b9acb8f3f16ff72c56589064672d060b1879b4d68a498692aeb4764b78ab1091de9b5b0a8dbd4b0ebc0e8bc401875ff5167
-  data.tar.gz: 54748996bd7ea09dda23163c808e32300e898ceb3910d1decfaa0516d49a268d79afeb9c9292f3a3fbc6d5f128ba8de1470111c66470585772b5903580088cbb
+  metadata.gz: 2ad16e54c5d883e62b456718dbb8e086c6e0cad805b88996817876176451fe04b0ababa4410762e2d58adbefbdce34e69a8a0f0ff9499b683dbdfcb3b89185f9
+  data.tar.gz: b08189742b46257f92dd7e54fd0f917cbb03b95092add3557a90b428f64fdc7ad7428ae96004ee5a645eefec83b70934b3a03f39152fa71d35dc4132bfa9694b

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.6.2', '2.7.1', '3.0.1']
+        ruby-version: ['2.6.2', '2.7.1', '3.0.1', '3.1.0']
 
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -105,4 +105,7 @@ Style/ConditionalAssignment:
   Enabled: false
 
 Style/CaseLikeIf:
+  Enabled: false
+
+Lint/EmptyClass:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change log
 
+## 3.0.17 (2022-06-08)
+
+* Add options `filter` and `reject` to array nodes which allow to filter arrays
+  before they are validated.
+
+* `#64545`: Fix an issue where `cast_str` in conjunction with `number` notes
+  lead to parsing errors when the given number had a leading zero, e.g. parsing
+  the string `08` lead to an error, as the number was interpreted as an octal
+  string. Numbers are now always being treated as decimal with base 10.
+
+## 3.0.16 (2021-11-23)
+
+* Add setting `Schemacop.v3_default_options` which allows to set default node
+  options vor V3 schemas. This is particularly useful for the option `cast_str`
+  to allow string casting globally.
+
+## 3.0.15 (2021-10-11)
+
+* Add support for custom string formatters
+
 ## 3.0.14 (2021-10-11)
 
 * Add string format `integer_list`

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2016 - 2021 Sitrox
+Copyright © 2016 - 2022 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -14,9 +14,10 @@ Schemacop is tested with the following ruby versions:
 
 * 2.6.2
 * 2.7.1
-* 3.0.0
+* 3.0.1
+* 3.1.0
 
-Other ruby versions might work but are not covered by our Travis tests.
+Other ruby versions might work but are not covered by our automated tests.
 
 ## Basic example
 
@@ -118,4 +119,4 @@ To run tests:
 
 ## Copyright
 
-Copyright © 2016 - 2021 Sitrox. See `LICENSE` for further details.
+Copyright © 2016 - 2022 Sitrox. See `LICENSE` for further details.

data/README_V3.md

@@ -21,6 +21,7 @@
     13. [Reference](#reference)
 5. [Context](#context)
 6. [External schemas](#external-schemas)
+7. [Default options](#default-options)
 
 ## Validation
 
@@ -252,6 +253,24 @@ transformed into various types.
 * `symbol`
   The string can be anything and will be casted to a ruby `Symbol` object.
 
+#### Custom Formats
+
+You can also implement your custom formats or override the behavior of the
+standard formats. This can be done in the initializer configuration (in case of
+a Rails appliation):
+
+```ruby
+# config/initializers/schemacop.rb
+Schemacop.register_string_formatter(
+  :character_array,                        # Formatter name
+  pattern: /^[a-zA-Z](,[a-zA-Z])*/,        # Regex pattern for validation
+  handler: ->(value) { value.split(',') }  # Casting callback
+)
+
+# In your schema
+str! :my_list, format: :character_array
+```
+
 #### Examples
 
 ```ruby
@@ -321,6 +340,8 @@ integer can be done.
   When set to `true`, this node also accepts strings that can be casted to an integer, e.g.
   the values `'-5'` or `'42'`. Please note that you can only validate numbers which
   are in the `Integer` format. Blank strings will be treated equally as `nil`.
+  Strings will be parsed with base 10, so only decimal numbers are allowed.
+  Leading zeroes will be ignored.
 
 #### Examples
 
@@ -402,7 +423,9 @@ With the various available options, validations on the value of the number can b
   When set to `true`, this node also accepts strings that can be casted to a number, e.g.
   the values `'0.1'` or `'3.1415'`. Please note that you can only validate numbers which
   are in the `Integer` or `Float` format, i.e. values like `'1.5r'` or `'(4 + 0i)'` will
-  not work. Blank strings will be treated equally as `nil`.
+  not work. Blank strings will be treated equally as `nil`.  Strings will be
+  parsed with base 10, so only decimal numbers are allowed.  Leading zeroes will
+  be ignored.
 
 #### Examples
 
@@ -572,6 +595,26 @@ It consists of one or multiple values, which can be validated using arbitrary no
   each other, or if there may be duplicate values. By default, this is false,
   i.e. duplicate values are allowed
 
+* `filter`
+  This option allows you to filter an array *before it is validated*. When using
+  casting, this also filters the data returned by the validator. If the given value
+  is a `Symbol`, the method with the given name will be executed on each array
+  item in order to determine whether it is kept. If the given value is a `Proc`,
+  it will be called for each array item to determine whether it is kept. Both
+  functions or Procs are expected to return either `true` or `false`.
+
+  This is the inverse of option `reject`.
+
+* `reject`
+  This option allows you to filter an array *before it is validated*. When using
+  casting, this also filters the data returned by the validator. If the given value
+  is a `Symbol`, the method with the given name will be executed on each array
+  item in order to determine whether it is removed. If the given value is a `Proc`,
+  it will be called for each array item to determine whether it is removed. Both
+  functions or Procs are expected to return either `true` or `false`.
+
+  This is the inverse of option `filter`.
+
 #### Contains
 
 The `array` node features the *contains* node, which you can use with the DSL
@@ -747,6 +790,53 @@ schema.validate!([1, 'foo'])  # => [1, "foo"]
 schema.validate!([1, :bar])   # => Schemacop::Exceptions::ValidationError: /[1]: Matches 0 definitions but should match exactly 1.
 ```
 
+#### Filtering
+
+Using the options `filter` and `reject`, arrays can be filtered. Filtering
+happens before validation. Both options behave in the same way, with the only
+difference being that `filter` uses a inclusive approach and `reject` an
+exclusive (see [filter](https://apidock.com/ruby/Array/filter) and
+[reject](https://apidock.com/ruby/Array/reject] in the Ruby API, as they behave
+in a similar manor).
+
+You can either pass a Symbol which specifies the name of the method that is
+called on each array item:
+
+```ruby
+# FYI: This example requires active_support for the blank? method
+schema = Schemacop::Schema3.new :array, reject: :blank? do
+  list :string
+end
+
+schema.validate!(['', 'foo'])  # => ["foo"]
+```
+
+You can also pass a proc to `filter` or `reject`:
+
+```ruby
+schema = Schemacop::Schema3.new :array, filter: ->(value) { value.is_a?(String) } do
+  list :string
+end
+
+schema.validate!(['foo', 42])  # => ["foo"]
+```
+
+Note that the given method name or proc should work with all element types that
+could possibly be in the (unvalidated) array. If a `NoMethodError` is
+encountered during a single filtering iteration, the element will be left in the
+array and, in most cases, trigger a validation error later:
+
+```ruby
+schema = Schemacop::Schema3.new :array, reject: :zero? do
+  list :integer
+end
+
+# In this example, the value 'foo' does not respond to the method `zero?` which
+# lead to a `NoMethodError` that is caught by Schemacop which in turn leaves the
+# value in the array.
+schema.validate!(['foo', 42, 0]) # => Schemacop::Exceptions::ValidationError: /[0]: Invalid type, got type "String", expected "integer".
+```
+
 ### Hash
 
 Type: `:hash`\
@@ -1431,3 +1521,21 @@ Schemacop::V3::GlobalContext.eager_load!
 As mentioned before, you can also use the external schemas without having to
 eager-load them, but if you use the schemas multiple times, it might be better
 to eager-load them on start of your application / script.
+
+## Default options
+
+Using the setting `Schemacop.v3_default_options`, you can specify a hash
+containing default options that will be used for every schemacop node (options
+not supported by a particular node are automatically ignored). Options passed
+directly to a node still take precedence. The setting can be set in an
+initializer:
+
+```ruby
+# config/initializers/schemacop.rb
+Schemacop.v3_default_options = { cast_str: true }.freeze
+
+# Example schema: As cast_str is enabled in the default options, strings will
+# automatically be casted where supported.
+schema = Schemacop::Schema3.new(:integer)
+schema.validate!('42')  # => 42
+```

data/Rakefile

@@ -1,7 +1,7 @@
 task :gemspec do
   gemspec = Gem::Specification.new do |spec|
     spec.name          = 'schemacop'
-    spec.version       = IO.read('VERSION').chomp
+    spec.version       = File.read('VERSION').chomp
     spec.authors       = ['Sitrox']
     spec.summary       = %(
       Schemacop validates ruby structures consisting of nested hashes and arrays
@@ -24,13 +24,13 @@ task :gemspec do
     spec.add_development_dependency 'minitest'
     spec.add_development_dependency 'minitest-reporters'
     spec.add_development_dependency 'colorize'
-    spec.add_development_dependency 'rubocop', '0.92.0'
+    spec.add_development_dependency 'rubocop', '1.24.1'
     spec.add_development_dependency 'pry'
     spec.add_development_dependency 'byebug'
     spec.add_development_dependency 'simplecov', '0.21.2'
   end
 
-  File.open('schemacop.gemspec', 'w') { |f| f.write(gemspec.to_ruby.strip) }
+  File.write('schemacop.gemspec', gemspec.to_ruby.strip)
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-3.0.14
+3.0.17

data/lib/schemacop/v2/collector.rb

@@ -60,7 +60,7 @@ module Schemacop::V2
     def exception_message
       # rubocop:disable Style/StringConcatenation
       return "Schemacop validation failed:\n" + @exceptions.map do |e|
-        "- #{e[:path].join('')}: #{e[:message]}"
+        "- #{e[:path].join}: #{e[:message]}"
       end.join("\n")
       # rubocop:enable Style/StringConcatenation
     end

data/lib/schemacop/v3/array_node.rb

@@ -10,7 +10,7 @@ module Schemacop
       supports_children
 
       def self.allowed_options
-        super + ATTRIBUTES + %i[additional_items]
+        super + ATTRIBUTES + %i[additional_items reject filter]
       end
 
       def self.dsl_methods
@@ -80,7 +80,10 @@ module Schemacop
         super_data = super
         return if super_data.nil?
 
-        # Validate length #
+        # Preprocess
+        super_data = preprocess_array(super_data)
+
+        # Validate length
         length = super_data.size
 
         if options[:min_items] && length < options[:min_items]
@@ -163,11 +166,37 @@ module Schemacop
           end
         end
 
-        return result
+        return preprocess_array(result)
       end
 
       protected
 
+      def preprocess_array(value)
+        # Handle filter
+        if options[:filter]
+          block = Proc.new(&options[:filter])
+
+          value = value.filter do |item|
+            block.call(item)
+          rescue NoMethodError
+            true
+          end
+        end
+
+        # Handle reject
+        if options[:reject]
+          block = Proc.new(&options[:reject])
+
+          value = value.reject do |item|
+            block.call(item)
+          rescue NoMethodError
+            false
+          end
+        end
+
+        return value
+      end
+
       def list?
         list_item.present?
       end

data/lib/schemacop/v3/global_context.rb

@@ -86,7 +86,7 @@ module Schemacop
         begin
           @current_schemas = []
           env = ScopedEnv.new(self, DSL_METHODS)
-          env.instance_eval IO.read(path)
+          env.instance_eval File.read(path)
         rescue StandardError => e
           fail "Could not load schema #{path.inspect}: #{e.message}"
         end

data/lib/schemacop/v3/hash_node.rb

@@ -55,8 +55,8 @@ module Schemacop
         end
 
         json = {}
-        json[:properties] = Hash[properties.values.map { |p| [p.name, p.as_json] }] if properties.any?
-        json[:patternProperties] = Hash[pattern_properties.values.map { |p| [V3.sanitize_exp(p.name), p.as_json] }] if pattern_properties.any?
+        json[:properties] = properties.values.map { |p| [p.name, p.as_json] }.to_h if properties.any?
+        json[:patternProperties] = pattern_properties.values.map { |p| [V3.sanitize_exp(p.name), p.as_json] }.to_h if pattern_properties.any?
 
         # In schemacop, by default, additional properties are not allowed,
         # the users explicitly need to enable additional properties

data/lib/schemacop/v3/node.rb

@@ -30,6 +30,8 @@ module Schemacop
 
         node = klass.new(**options, &block)
 
+        options = Schemacop.v3_default_options.slice(*klass.allowed_options).merge(options)
+
         if options.delete(:cast_str)
           format = NodeRegistry.name(klass)
           one_of_options = {
@@ -197,10 +199,10 @@ module Schemacop
 
         # Apply default #
         if data.nil?
-          if !default.nil?
-            data = default
-          else
+          if default.nil?
             return nil
+          else
+            data = default
           end
         end
 

data/lib/schemacop/v3/object_node.rb

@@ -12,7 +12,7 @@ module Schemacop
       protected
 
       def allowed_types
-        Hash[@classes.map { |c| [c, c.name] }]
+        @classes.map { |c| [c, c.name] }.to_h
       end
 
       def init

data/lib/schemacop/v3/string_node.rb

@@ -7,21 +7,6 @@ module Schemacop
         format
       ].freeze
 
-      # rubocop:disable Layout/LineLength
-      FORMAT_PATTERNS = {
-        date:           /^([0-9]{4})-?(1[0-2]|0[1-9])-?(3[01]|0[1-9]|[12][0-9])$/,
-        'date-time':    /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$/,
-        time:           /^(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$/,
-        email:          URI::MailTo::EMAIL_REGEXP,
-        boolean:        /^(true|false|0|1)$/,
-        binary:         nil,
-        symbol:         nil,
-        integer:        /^-?[0-9]+$/,
-        number:         /^-?[0-9]+(\.[0-9]+)?$/,
-        'integer-list': /^(-?[0-9]+)(,-?[0-9]+)*$/
-      }.freeze
-      # rubocop:enable Layout/LineLength
-
       def self.allowed_options
         super + ATTRIBUTES + %i[format_options pattern allow_blank]
       end
@@ -71,8 +56,9 @@ module Schemacop
         end
 
         # Validate format #
-        if options[:format] && FORMAT_PATTERNS.include?(options[:format])
-          pattern = FORMAT_PATTERNS[options[:format]]
+        if options[:format] && Schemacop.string_formatters.include?(options[:format])
+          pattern = Schemacop.string_formatters[options[:format]][:pattern]
+
           if pattern && !super_data.match?(pattern)
             result.error "String does not match format #{options[:format].to_s.inspect}."
           elsif options[:format_options] && Node.resolve_class(options[:format])
@@ -91,23 +77,8 @@ module Schemacop
           return nil
         end
 
-        case options[:format]
-        when :boolean
-          %w[true 1].include?(to_cast)
-        when :date
-          return Date.parse(to_cast)
-        when :'date-time'
-          return DateTime.parse(to_cast)
-        when :time
-          Time.parse(to_cast)
-        when :integer
-          return Integer(to_cast)
-        when :number
-          return Float(to_cast)
-        when :'integer-list'
-          return to_cast.split(',').map(&:to_i)
-        when :symbol
-          return to_cast.to_sym
+        if (handler = Schemacop.string_formatters.dig(options[:format], :handler))
+          return handler.call(to_cast)
         else
           return to_cast
         end
@@ -122,7 +93,7 @@ module Schemacop
       end
 
       def validate_self
-        if options.include?(:format) && !FORMAT_PATTERNS.include?(options[:format])
+        if options.include?(:format) && !Schemacop.string_formatters.include?(options[:format])
           fail "Format #{options[:format].to_s.inspect} is not supported."
         end
 

data/lib/schemacop/v3.rb

@@ -9,7 +9,7 @@ module Schemacop
       return exp if exp.is_a?(String)
 
       _start_slash, caret, exp, dollar, _end_slash, flags = exp.inspect.match(%r{^(/?)(\^)?(.*?)(\$)?(/?)([ixm]*)?$}).captures
-      flags = flags.split('')
+      flags = flags.chars
 
       if flags.delete('i')
         exp = "(?i)(#{exp})"

data/lib/schemacop.rb

@@ -13,6 +13,83 @@ module Schemacop
   mattr_accessor :default_schema_version
   self.default_schema_version = 3
 
+  mattr_accessor :string_formatters
+  self.string_formatters = {}
+
+  mattr_accessor :v3_default_options
+  self.v3_default_options = {}
+
+  def self.register_string_formatter(name, pattern:, handler:)
+    name = name.to_s.dasherize.to_sym
+
+    string_formatters[name] = {
+      pattern: pattern,
+      handler: handler
+    }
+  end
+
+  register_string_formatter(
+    :date,
+    pattern: /^([0-9]{4})-?(1[0-2]|0[1-9])-?(3[01]|0[1-9]|[12][0-9])$/,
+    handler: ->(value) { Date.parse(value) }
+  )
+
+  # rubocop: disable Layout/LineLength
+  register_string_formatter(
+    :'date-time',
+    pattern: /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$/,
+    handler: ->(value) { DateTime.parse(value) }
+  )
+  # rubocop: enable Layout/LineLength
+
+  register_string_formatter(
+    :time,
+    pattern: /^(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$/,
+    handler: ->(value) { Time.parse(value) }
+  )
+
+  register_string_formatter(
+    :email,
+    pattern: URI::MailTo::EMAIL_REGEXP,
+    handler: ->(value) { value }
+  )
+
+  register_string_formatter(
+    :boolean,
+    pattern: /^(true|false|0|1)$/,
+    handler: ->(value) { %w[true 1].include?(value) }
+  )
+
+  register_string_formatter(
+    :binary,
+    pattern: nil,
+    handler: ->(value) { value }
+  )
+
+  register_string_formatter(
+    :symbol,
+    pattern: nil,
+    handler: ->(value) { value.to_sym }
+  )
+
+  register_string_formatter(
+    :integer,
+    pattern: /^-?[0-9]+$/,
+    handler: ->(value) { Integer(value, 10) }
+  )
+
+  register_string_formatter(
+    :number,
+    pattern: /^-?[0-9]+(\.[0-9]+)?$/,
+    handler: ->(value) { Float(value) }
+  )
+
+  register_string_formatter(
+    :'integer-list',
+    pattern: /^(-?[0-9]+)(,-?[0-9]+)*$/,
+    handler: ->(value) { value.split(',').map { |i| Integer(i, 10) } }
+  )
+
   def self.with_context(context)
     prev_context = Thread.current[CONTEXT_THREAD_KEY]
     Thread.current[CONTEXT_THREAD_KEY] = context

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.14 ruby lib
+# stub: schemacop 3.0.17 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.14"
+  s.version = "3.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2021-10-11"
+  s.date = "2022-06-08"
   s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "README_V2.md".freeze, "README_V3.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/base_schema.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/railtie.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/schema2.rb".freeze, "lib/schemacop/schema3.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/v2.rb".freeze, "lib/schemacop/v2/caster.rb".freeze, "lib/schemacop/v2/collector.rb".freeze, "lib/schemacop/v2/dupper.rb".freeze, "lib/schemacop/v2/field_node.rb".freeze, "lib/schemacop/v2/node.rb".freeze, "lib/schemacop/v2/node_resolver.rb".freeze, "lib/schemacop/v2/node_supporting_field.rb".freeze, "lib/schemacop/v2/node_supporting_type.rb".freeze, "lib/schemacop/v2/node_with_block.rb".freeze, "lib/schemacop/v2/validator/array_validator.rb".freeze, "lib/schemacop/v2/validator/boolean_validator.rb".freeze, "lib/schemacop/v2/validator/float_validator.rb".freeze, "lib/schemacop/v2/validator/hash_validator.rb".freeze, "lib/schemacop/v2/validator/integer_validator.rb".freeze, "lib/schemacop/v2/validator/nil_validator.rb".freeze, "lib/schemacop/v2/validator/number_validator.rb".freeze, "lib/schemacop/v2/validator/object_validator.rb".freeze, "lib/schemacop/v2/validator/string_validator.rb".freeze, "lib/schemacop/v2/validator/symbol_validator.rb".freeze, "lib/schemacop/v3.rb".freeze, "lib/schemacop/v3/all_of_node.rb".freeze, "lib/schemacop/v3/any_of_node.rb".freeze, "lib/schemacop/v3/array_node.rb".freeze, "lib/schemacop/v3/boolean_node.rb".freeze, "lib/schemacop/v3/combination_node.rb".freeze, "lib/schemacop/v3/context.rb".freeze, "lib/schemacop/v3/dsl_scope.rb".freeze, "lib/schemacop/v3/global_context.rb".freeze, "lib/schemacop/v3/hash_node.rb".freeze, "lib/schemacop/v3/integer_node.rb".freeze, "lib/schemacop/v3/is_not_node.rb".freeze, "lib/schemacop/v3/node.rb".freeze, "lib/schemacop/v3/node_registry.rb".freeze, "lib/schemacop/v3/number_node.rb".freeze, "lib/schemacop/v3/numeric_node.rb".freeze, "lib/schemacop/v3/object_node.rb".freeze, "lib/schemacop/v3/one_of_node.rb".freeze, "lib/schemacop/v3/reference_node.rb".freeze, "lib/schemacop/v3/result.rb".freeze, "lib/schemacop/v3/string_node.rb".freeze, "lib/schemacop/v3/symbol_node.rb".freeze, "schemacop.gemspec".freeze, "test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
       s.add_development_dependency(%q<minitest-reporters>.freeze, [">= 0"])
       s.add_development_dependency(%q<colorize>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rubocop>.freeze, ["= 0.92.0"])
+      s.add_development_dependency(%q<rubocop>.freeze, ["= 1.24.1"])
       s.add_development_dependency(%q<pry>.freeze, [">= 0"])
       s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
       s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<minitest>.freeze, [">= 0"])
       s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
       s.add_dependency(%q<colorize>.freeze, [">= 0"])
-      s.add_dependency(%q<rubocop>.freeze, ["= 0.92.0"])
+      s.add_dependency(%q<rubocop>.freeze, ["= 1.24.1"])
       s.add_dependency(%q<pry>.freeze, [">= 0"])
       s.add_dependency(%q<byebug>.freeze, [">= 0"])
       s.add_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<minitest>.freeze, [">= 0"])
     s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
     s.add_dependency(%q<colorize>.freeze, [">= 0"])
-    s.add_dependency(%q<rubocop>.freeze, ["= 0.92.0"])
+    s.add_dependency(%q<rubocop>.freeze, ["= 1.24.1"])
     s.add_dependency(%q<pry>.freeze, [">= 0"])
     s.add_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, ["= 0.21.2"])

data/test/unit/schemacop/v2/nil_dis_allow_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-# Note: A test for req and opt is part of validator_hash_test.rb
+# NOTE: A test for req and opt is part of validator_hash_test.rb
 
 module Schemacop
   module V2

data/test/unit/schemacop/v2/validator_symbol_test.rb

@@ -9,7 +9,7 @@ module Schemacop
         end
 
         assert_nothing_raised { s.validate!(:good) }
-        assert_nothing_raised { s.validate!('-+/'.to_sym) }
+        assert_nothing_raised { s.validate!(:'-+/') }
         assert_verr { s.validate!('bad') }
         assert_verr { s.validate!(456) }
       end

data/test/unit/schemacop/v3/array_node_test.rb

@@ -462,6 +462,112 @@ module Schemacop
         end
       end
 
+      def test_reject_with_symbol
+        schema :array, min_items: 3, max_items: 3, reject: :blank? do
+          list :symbol
+        end
+
+        input = [:foo, :bar, :baz, :'']
+        input_was = input.dup
+
+        assert_validation(input)
+        assert_cast(input, %i[foo bar baz])
+
+        assert_equal input, input_was
+      end
+
+      def test_reject_with_proc
+        schema :array, reject: ->(i) { i > 5 } do
+          list :integer, maximum: 5
+        end
+
+        input = [1, 2, 3, 4, 5, 6]
+        input_was = input.dup
+
+        assert_validation(input)
+        assert_cast(input, [1, 2, 3, 4, 5])
+
+        assert_equal input, input_was
+      end
+
+      def test_reject_with_argument_error
+        schema :array, reject: :zero? do
+          list :integer
+        end
+
+        assert_validation([0, 1, 2, :a]) do
+          error '/[2]', 'Invalid type, got type "Symbol", expected "integer".'
+        end
+      end
+
+      def test_filter_with_symbol
+        schema :array, min_items: 3, max_items: 3, filter: :present? do
+          list :symbol
+        end
+
+        input = [:foo, :bar, :baz, :'']
+        input_was = input.dup
+
+        assert_validation(input)
+        assert_cast(input, %i[foo bar baz])
+
+        assert_equal input, input_was
+      end
+
+      def test_filter_with_proc
+        schema :array, filter: ->(i) { i <= 5 } do
+          list :integer, maximum: 5
+        end
+
+        input = [1, 2, 3, 4, 5, 6]
+        input_was = input.dup
+
+        assert_validation(input)
+        assert_cast(input, [1, 2, 3, 4, 5])
+
+        assert_equal input, input_was
+      end
+
+      def test_filter_with_argument_error
+        schema :array, filter: :nonzero? do
+          list :integer
+        end
+
+        assert_validation([0, 1, 2, :a]) do
+          error '/[2]', 'Invalid type, got type "Symbol", expected "integer".'
+        end
+      end
+
+      def test_doc_example_reject_blank
+        # FYI: This example requires active_support for the blank? method
+        schema = Schemacop::Schema3.new :array, reject: :blank? do
+          list :string
+        end
+
+        assert_equal ['foo'], schema.validate!(['', 'foo'])
+      end
+
+      def test_doc_example_filter_proc
+        schema = Schemacop::Schema3.new :array, filter: ->(value) { value.is_a?(String) } do
+          list :string
+        end
+
+        assert_equal ['foo'], schema.validate!(['foo', 42])
+      end
+
+      def test_doc_example_reject_zero
+        schema = Schemacop::Schema3.new :array, reject: :zero? do
+          list :integer
+        end
+
+        assert_raises_with_message(
+          Schemacop::Exceptions::ValidationError,
+          '/[0]: Invalid type, got type "String", expected "integer".'
+        ) do
+          schema.validate!(['foo', 42, 0])
+        end
+      end
+
       def test_contains
         schema :array do
           cont :string

data/test/unit/schemacop/v3/boolean_node_test.rb

@@ -5,7 +5,7 @@ module Schemacop
   module V3
     class BooleanNodeTest < V3Test
       def self.invalid_type_error(type)
-        type = type.class unless type.class == Class
+        type = type.class unless type.instance_of?(Class)
         "Invalid type, got type \"#{type}\", expected \"boolean\"."
       end
 

data/test/unit/schemacop/v3/global_context_test.rb

@@ -53,9 +53,9 @@ module Schemacop
       def test_file_reload
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
-        IO.write(File.join(dir, 'foo.rb'), %(schema :string))
+        File.write(File.join(dir, 'foo.rb'), %(schema :string))
         assert_is_a StringNode, GlobalContext.instance.schema_for('foo')
-        IO.write(File.join(dir, 'foo.rb'), %(schema :integer))
+        File.write(File.join(dir, 'foo.rb'), %(schema :integer))
         assert_is_a IntegerNode, GlobalContext.instance.schema_for('foo')
       end
 
@@ -63,12 +63,12 @@ module Schemacop
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
 
-        IO.write(File.join(dir, 'foo.rb'), %(schema :string))
+        File.write(File.join(dir, 'foo.rb'), %(schema :string))
 
         GlobalContext.instance.eager_load!
 
         assert_is_a StringNode, GlobalContext.instance.schema_for('foo')
-        IO.write(File.join(dir, 'foo.rb'), %(schema :integer))
+        File.write(File.join(dir, 'foo.rb'), %(schema :integer))
         assert_is_a StringNode, GlobalContext.instance.schema_for('foo')
       end
 
@@ -117,7 +117,7 @@ module Schemacop
       def test_empty_schema
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
-        IO.write(File.join(dir, 'foo.rb'), %())
+        File.write(File.join(dir, 'foo.rb'), %())
         assert_raises_with_message RuntimeError, /does not define any schema/ do
           GlobalContext.instance.schema_for('foo')
         end
@@ -126,7 +126,7 @@ module Schemacop
       def test_multiple_schemas
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
-        IO.write(File.join(dir, 'foo.rb'), %(schema :string\nschema :integer))
+        File.write(File.join(dir, 'foo.rb'), %(schema :string\nschema :integer))
         assert_raises_with_message RuntimeError, /Schema "#{File.join(dir, 'foo.rb')}" defines multiple schemas/ do
           GlobalContext.instance.schema_for('foo')
         end
@@ -135,7 +135,7 @@ module Schemacop
       def test_invalid_schema
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
-        IO.write(File.join(dir, 'foo.rb'), %(foobarbaz))
+        File.write(File.join(dir, 'foo.rb'), %(foobarbaz))
 
         assert_raises_with_message RuntimeError, /Could not load schema/ do
           GlobalContext.schema_for('foo')
@@ -145,7 +145,7 @@ module Schemacop
       def test_overrides_with_eager_load
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
-        IO.write(File.join(dir, 'user.rb'), %(schema :string))
+        File.write(File.join(dir, 'user.rb'), %(schema :string))
 
         assert_raises_with_message RuntimeError, %r{in both load paths "test/schemas" and "#{dir}"} do
           GlobalContext.eager_load!
@@ -155,7 +155,7 @@ module Schemacop
       def test_overrides_with_lazy_load
         dir = Dir.mktmpdir
         Schemacop.load_paths << dir
-        IO.write(File.join(dir, 'user.rb'), %(schema :string))
+        File.write(File.join(dir, 'user.rb'), %(schema :string))
 
         assert_raises_with_message RuntimeError, %r{in both load paths "test/schemas" and "#{dir}"} do
           GlobalContext.instance.schema_for('user')

data/test/unit/schemacop/v3/integer_node_test.rb

@@ -339,6 +339,11 @@ module Schemacop
         assert_cast('1', 1)
         assert_cast(1, 1)
 
+        assert_cast('08', 8)
+        assert_cast('09', 9)
+        assert_cast('050', 50)
+        assert_cast('01', 1)
+
         assert_cast(nil, nil)
         assert_cast('', nil)
 

data/test/unit/schemacop/v3/node_test.rb

@@ -181,6 +181,14 @@ module Schemacop
 
         assert_equal(@schema.root.children, [])
       end
+
+      def test_default_options
+        Schemacop.v3_default_options = { cast_str: true }.freeze
+        schema :number
+        assert_cast('1', 1)
+      ensure
+        Schemacop.v3_default_options = {}
+      end
     end
   end
 end

data/test/unit/schemacop/v3/number_node_test.rb

@@ -308,6 +308,11 @@ module Schemacop
         assert_cast('1', 1)
         assert_cast(1, 1)
 
+        assert_cast('08', 8)
+        assert_cast('09', 9)
+        assert_cast('050', 50)
+        assert_cast('01', 1)
+
         assert_validation(nil)
         assert_validation('')
 

data/test/unit/schemacop/v3/string_node_test.rb

@@ -158,6 +158,14 @@ module Schemacop
         assert_cast('2018-11-13T20:20:39+00:00', DateTime.new(2018, 11, 13, 20, 20, 39))
       end
 
+      def test_format_time
+        schema :string, format: :time
+        assert_json(type: :string, format: :time)
+        assert_cast '20:30:39+00:00', Time.strptime('20:30:39+00:00', '%H:%M:%S%z')
+
+        assert_cast nil, nil
+      end
+
       def test_format_email
         schema :string, format: :email
 
@@ -183,6 +191,17 @@ module Schemacop
         assert_cast('john.doe@example.com', 'john.doe@example.com')
       end
 
+      def test_format_boolean
+        schema :string, format: :boolean
+
+        assert_json(type: :string, format: :boolean)
+
+        assert_cast 'true', true
+        assert_cast 'false', false
+
+        assert_cast nil, nil
+      end
+
       def test_format_symbol
         schema :string, format: :symbol
 
@@ -200,6 +219,28 @@ module Schemacop
         assert_cast('039n23$g- sfk3/', :'039n23$g- sfk3/')
       end
 
+      def test_format_integer
+        schema :string, format: :integer
+
+        assert_json(type: :string, format: :integer)
+
+        assert_validation '23425'
+        assert_validation '-23425'
+
+        assert_validation 12_312 do
+          error '/', StringNodeTest.invalid_type_error(Integer)
+        end
+
+        assert_validation '24.32' do
+          error '/', 'String does not match format "integer".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast('2234', 2234)
+        assert_cast('-1', -1)
+        assert_cast('-0', 0)
+      end
+
       def test_format_integer_list
         schema :string, format: :integer_list
 
@@ -222,6 +263,38 @@ module Schemacop
         assert_cast '1,-2,3', [1, -2, 3]
         assert_cast '1',      [1]
         assert_cast '-1',     [-1]
+        assert_cast '08',     [8]
+        assert_cast '09',     [9]
+        assert_cast '050',    [50]
+        assert_cast '01,032', [1, 32]
+      end
+
+      def test_format_custom
+        Schemacop.register_string_formatter(
+          :integer_tuple_list,
+          pattern: /^(-?[0-9]+):(-?[0-9]+)(,(-?[0-9]+):(-?[0-9]+))*$/,
+          handler: proc do |value|
+            value.split(',').map { |t| t.split(':').map(&:to_i) }
+          end
+        )
+
+        schema :string, format: :integer_tuple_list
+
+        assert_json(type: :string, format: :'integer-tuple-list')
+
+        assert_validation '1:5,4:2,-4:4,4:-1,0:0'
+        assert_validation '-1:5'
+
+        assert_validation 234 do
+          error '/', StringNodeTest.invalid_type_error(Integer)
+        end
+
+        assert_validation 'sd sfdij soidf' do
+          error '/', 'String does not match format "integer-tuple-list".'
+        end
+
+        assert_cast nil, nil
+        assert_cast '1:2,3:4,5:-6', [[1, 2], [3, 4], [5, -6]]
       end
 
       def test_enum
@@ -248,33 +321,6 @@ module Schemacop
         end
       end
 
-      def test_boolean_casting
-        schema :string, format: :boolean
-
-        assert_json(type: :string, format: :boolean)
-
-        assert_cast 'true', true
-        assert_cast 'false', false
-
-        assert_cast nil, nil
-      end
-
-      def test_time_casting
-        schema :string, format: :time
-        assert_json(type: :string, format: :time)
-        assert_cast '20:30:39+00:00', Time.strptime('20:30:39+00:00', '%H:%M:%S%z')
-
-        assert_cast nil, nil
-      end
-
-      def test_date_casting
-        schema :string, format: :date
-        assert_json(type: :string, format: :date)
-        assert_cast '2018-11-13', Date.new(2018, 11, 13)
-
-        assert_cast nil, nil
-      end
-
       def test_date_time_casting
         schema :string, format: :date_time
         assert_json(type: :string, format: :'date-time')

data/test/unit/schemacop/v3/symbol_node_test.rb

@@ -4,7 +4,7 @@ module Schemacop
   module V3
     class SymbolNodeTest < V3Test
       def self.invalid_type_error(type)
-        type = type.class unless type.class == Class
+        type = type.class unless type.instance_of?(Class)
         "Invalid type, got type \"#{type}\", expected \"Symbol\"."
       end
 
@@ -25,7 +25,7 @@ module Schemacop
       def test_required
         schema :symbol, required: true
         assert_validation :foo
-        assert_validation ''.to_sym
+        assert_validation :""
         assert_validation nil do
           error '/', 'Value must be given.'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.17
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.24.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -164,8 +164,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.21.2
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -277,7 +277,7 @@ homepage: https://github.com/sitrox/schemacop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,8 +292,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.