schemacop 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e43238e69ebe95beaac85536a9dadbf3233bd4fa5751c7e019ca6d07aa05860
-  data.tar.gz: 8bafd412f0572e0c12a7c163cba48b6f6f69900ec903684dc3c9495b4913cf52
+  metadata.gz: 3c6c1009f3a4a23a39f58dd1aef99c63136f8d362963d14a7513f08f0d705c0c
+  data.tar.gz: 58a4e7ace82f8f5b1a69ac70ec39dc44a0b4766a167920e3f6de497a7ebe3ee9
 SHA512:
-  metadata.gz: 9da291f938673bf76f55f4f4fddbf5a3355fe9c72ae30f8be8c9e224b9bea2f1a89dbcb2da8312ddbaca09dcd25da5511e904963400633d9ef193014da9ee0ec
-  data.tar.gz: 21793a6a7f3fc730a123f7ed8ceacde1e930620b77fef63c7e30c919a9e9ebf3372a8a5208dbdf177880e011322f529d04558bd68d363cbfd85b023a1f2ed265
+  metadata.gz: 7086af3afd13d6cabe140cd550a53b9fed5117b496fb01e67ea4fc9a468d0e5e9a8c5f563fe330fae88a3c4a61fd9c98cbe6317ac1cf6478ab159b66afca9391
+  data.tar.gz: 438129e855a0da9ba74fd7a03c9de3abf3bd206cca4cfe5c70a5ae5ad21d88a927d3cc25738934a3a51f72c32781d48ea1da47c0f7db427a94945792a892641b

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change log
 
+## 3.0.17 (2021-12-06)
+
+* `#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

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
 
@@ -339,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
 
@@ -420,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
 
@@ -1449,3 +1454,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/VERSION

@@ -1 +1 @@
-3.0.15
+3.0.16

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 = {

data/lib/schemacop.rb

@@ -16,6 +16,9 @@ module Schemacop
   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
 
@@ -72,7 +75,7 @@ module Schemacop
   register_string_formatter(
     :integer,
     pattern: /^-?[0-9]+$/,
-    handler: ->(value) { Integer(value) }
+    handler: ->(value) { Integer(value, 10) }
   )
 
   register_string_formatter(
@@ -84,7 +87,7 @@ module Schemacop
   register_string_formatter(
     :'integer-list',
     pattern: /^(-?[0-9]+)(,-?[0-9]+)*$/,
-    handler: ->(value) { value.split(',').map(&:to_i) }
+    handler: ->(value) { value.split(',').map { |i| Integer(i, 10) } }
   )
 
   def self.with_context(context)

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.15 ruby lib
+# stub: schemacop 3.0.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.15"
+  s.version = "3.0.16"
 
   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 = "2021-12-06"
   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]

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

@@ -263,6 +263,10 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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.2.22
+signing_key:
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.