schemacop 3.0.10 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8700be126ea3aced42828ce418ad665095584ba0e217eebb0cf2e42faf5b4aef
-  data.tar.gz: 9774973e128d64f02a06e84cfa19990b0a7b0890cf57d4fb94c0f5058337dd20
+  metadata.gz: 45a0558e32f2c4a8e4d9db631ac874629ed7e92a378a177266a216b9e35295bd
+  data.tar.gz: fa2da0867bf598a32ba7728b246343f6bf3849aa1ccdddf9093dcd360df2b53e
 SHA512:
-  metadata.gz: 0cdd515a0d47c7d707b8418fa5f0c7e6e73375ccb28bd2552b8c5f960e0279c75fb3a89c99b4ff677069c7a75e3d2f2376645d720d0d65980688602af09e4d28
-  data.tar.gz: 27cb5b5b8c4c8e14601c907c443d4fd904457ad0762c31af26aabf7d75febbf49459555e19665a1e56674b05601b4a223ccc18cb12fcebf9fddd526c3ec37442
+  metadata.gz: 557da4f2765fc6a9c081b1b894f57b9acb8f3f16ff72c56589064672d060b1879b4d68a498692aeb4764b78ab1091de9b5b0a8dbd4b0ebc0e8bc401875ff5167
+  data.tar.gz: 54748996bd7ea09dda23163c808e32300e898ceb3910d1decfaa0516d49a268d79afeb9c9292f3a3fbc6d5f128ba8de1470111c66470585772b5903580088cbb

data/.github/workflows/ruby.yml

@@ -0,0 +1,27 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.6.2', '2.7.1', '3.0.1']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run rake tests
+      run: bundle exec rake test
+    - name: Run rubocop
+      run: bundle exec rubocop

data/.releaser_config

@@ -1,4 +1,3 @@
 version_file: VERSION
 always_from_master: true
 gem_style: github
-ruby_command: ruby -S

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change log
 
+## 3.0.14 (2021-10-11)
+
+* Add string format `integer_list`
+
+* Improve handling for booleans
+
+## 3.0.13 (2021-10-04)
+
+* When using `boolean` with `cast_str: true`, `"0"` is now casted to `false` and
+  `"1"` to `true`. This in addition to already casting `"true", "false"`.
+
+## 3.0.12 (2021-09-14)
+
+* Fix compatibility issue with `ruby <= 2.5`
+
+## 3.0.11 (2021-03-26)
+
+* Treat blank string as nil when using `cast_str` option
+
 ## 3.0.10 (2021-03-19)
 
 * If wrong type is given, report class of wrong type in error message

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/sitrox/schemacop.svg?branch=master)](https://travis-ci.org/sitrox/schemacop)
+[![Ruby](https://github.com/sitrox/schemacop/actions/workflows/ruby.yml/badge.svg?branch=master)](https://github.com/sitrox/schemacop/actions/workflows/ruby.yml)
 [![Gem Version](https://badge.fury.io/rb/schemacop.svg)](https://badge.fury.io/rb/schemacop)
 
 # Schemacop

data/README_V3.md

@@ -233,8 +233,8 @@ transformed into various types.
   addresses do not have their own ruby type.
 
 * `boolean`
-  The string must be either `true` or `false`. This value will be casted to
-  Ruby's `TrueClass` or `FalseClass`.
+  The string must be either `true`, `false`, `0` or `1`. This value will be
+  casted to Ruby's `TrueClass` or `FalseClass`.
 
 * `binary`
   The string is expected to contain binary contents. No casting or additional
@@ -246,6 +246,9 @@ transformed into various types.
 * `number`
   The string must be a number and will be casted to a ruby `Float` object.
 
+* `integer_list`
+  The string must consist of comma-separated integers casted to a ruby `Array<Integer>` object
+
 * `symbol`
   The string can be anything and will be casted to a ruby `Symbol` object.
 
@@ -317,7 +320,7 @@ integer can be done.
 * `cast_str`
   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.
+  are in the `Integer` format. Blank strings will be treated equally as `nil`.
 
 #### Examples
 
@@ -346,6 +349,19 @@ schema.validate!('102')           # => Schemacop::Exceptions::ValidationError: /
 schema.validate!('42.1')          # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
 schema.validate!('4r')            # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
 schema.validate!('(4 + 0i)')      # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!(nil)             # => nil
+schema.validate!('')              # => nil
+```
+
+Please note, that `nil` and blank strings are treated equally when using the `cast_str` option,
+and validating a blank string will return `nil`.
+If you need a value, use the `required` option:
+
+```ruby
+schema = Schemacop::Schema3.new(:integer, minimum: 0, maximum: 100, multiple_of: 2, cast_str: true, required: true)
+schema.validate!('42')  # => 42
+schema.validate!(nil)   # => Schemacop::Exceptions::ValidationError: /: Value must be given.
+schema.validate!('')    # => Schemacop::Exceptions::ValidationError: /: Value must be given.
 ```
 
 ### Number
@@ -386,7 +402,7 @@ 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.
+  not work. Blank strings will be treated equally as `nil`.
 
 #### Examples
 
@@ -414,6 +430,19 @@ schema.validate!('51')        # => Schemacop::Exceptions::ValidationError: /: Ma
 schema.validate!('42.5')      # => 42.5
 schema.validate!('1.5r')      # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
 schema.validate!('(4 + 0i)')  # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!(nil)         # => nil
+schema.validate!('')          # => nil
+```
+
+Please note, that `nil` and blank strings are treated equally when using the `cast_str` option,
+and validating a blank string will return `nil`.
+If you need a value, use the `required` option:
+
+```ruby
+schema = Schemacop::Schema3.new(:number, cast_str: true, minimum: 0.0, maximum: (50r), multiple_of: BigDecimal('0.5'), require: true)
+schema.validate!('42.5')  # => 42.5
+schema.validate!(nil)     # => Schemacop::Exceptions::ValidationError: /: Value must be given.
+schema.validate!('')      # => Schemacop::Exceptions::ValidationError: /: Value must be given.
 ```
 
 ### Symbol
@@ -426,7 +455,7 @@ The symbol type is used to validate elements for the Ruby `Symbol` class.
 #### Options
 
 * `cast_str`
-  When set to `true`, this node also accepts strings that can be casted to a symbol.
+  When set to `true`, this node also accepts strings that can be casted to a symbol. Blank strings will be treated equally as `nil`.
 
 #### Examples
 
@@ -450,6 +479,19 @@ schema.validate!('foo')    # => :foo
 schema.validate!('123')    # => :"123"
 schema.validate!('false')  # => :false
 schema.validate!(':false') # => :":false"
+schema.validate!(nil)      # => nil
+schema.validate!('')       # => nil
+```
+
+Please note, that `nil` and blank strings are treated equally when using the `cast_str` option,
+and validating a blank string will return `nil`.
+If you need a value, use the `required` option:
+
+```ruby
+schema = Schemacop::Schema3.new(:symbol, cast_str: true, required: true)
+schema.validate!('foo')   # => :foo
+schema.validate!(nil)     # => Schemacop::Exceptions::ValidationError: /: Value must be given.
+schema.validate!('')      # => Schemacop::Exceptions::ValidationError: /: Value must be given.
 ```
 
 ### Boolean
@@ -462,8 +504,9 @@ The boolean type is used to validate Ruby booleans, i.e. the `TrueClass` and `Fa
 #### Options
 
 * `cast_str`
-  When set to `true`, this node also accepts strings that can be casted to a boolean, i.e.
-  the values `'true'` and `'false'`
+  When set to `true`, this node also accepts strings that can be casted to a
+  boolean, namely the values `'true'`, `'false'`, `'1'` and `'0'`. Blank strings
+  will be treated equally as `nil`.
 
 #### Examples
 
@@ -475,6 +518,11 @@ schema.validate!(false)   # => false
 schema.validate!(:false)  # => Schemacop::Exceptions::ValidationError: /: Invalid type, got type "Symbol", expected "boolean".
 schema.validate!('false') # => Schemacop::Exceptions::ValidationError: /: Invalid type, got type "String", expected "boolean".
 schema.validate!(1234)    # => Schemacop::Exceptions::ValidationError: /: Invalid type, got type "Integer", expected "boolean".
+
+schema.validate!('0', cast_str: true)     # => false
+schema.validate!('1', cast_str: true)     # => true
+schema.validate!('false', cast_str: true) # => false
+schema.validate!('true', cast_str: true)  # => true
 ```
 
 With `cast_str` enabled:
@@ -486,6 +534,19 @@ schema.validate!(false)   # => false
 schema.validate!(:false)  # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
 schema.validate!('false') # => false
 schema.validate!(1234)    # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!(nil)     # => nil
+schema.validate!('')      # => nil
+```
+
+Please note, that `nil` and blank strings are treated equally when using the `cast_str` option,
+and validating a blank string will return `nil`.
+If you need a value, use the `required` option:
+
+```ruby
+schema = Schemacop::Schema3.new(:boolean, cast_str: true, required: true)
+schema.validate!('false') # => false
+schema.validate!(nil)     # => Schemacop::Exceptions::ValidationError: /: Value must be given.
+schema.validate!('')      # => Schemacop::Exceptions::ValidationError: /: Value must be given.
 ```
 
 ### Array
@@ -1289,7 +1350,8 @@ files.  This is especially useful is you have schemas in your application which
 are used multiple times throughout the application.
 
 For each schema, you define the schema in a separate file, and after loading the
-schemas, you can reference them in other schemas.
+schemas, you can reference them in other schemas. The schema can be retrieved
+by using the file name, e.g. `user` in the example `app/schemas/user.rb` below.
 
 The default load path is `'app/schemas'`, but this can be configured by setting
 the value of the `load_paths` attribute of the `Schemacop` module.
@@ -1306,7 +1368,7 @@ Where:
 * context schemas: Defined in the current context using `context.schema`
 * global schemas: Defined in a ruby file in the load path
 
-### Rails applications
+### External schemas in Rails applications
 
 In Rails applications, your schemas are automatically eager-loaded from the load
 path `'app/schemas'` when your application is started, unless your application
@@ -1333,7 +1395,7 @@ end
 ```
 
 ```ruby
-# app/schemas/nested/user.rb
+# app/schemas/nested/group.rb
 schema :hash do
   str! :name
 end
@@ -1357,7 +1419,7 @@ schema.validate!({usr: {first_name: 'Joe', last_name: 'Doe', groups: [{name: 'fo
   # => {"usr"=>{"first_name"=>"Joe", "last_name"=>"Doe", "groups"=>[{"name"=>"foo"}, {"name"=>"bar"}]}}
 ```
 
-### Non-Rails applications
+### External schemas in Non-Rails applications
 
 Usage in non-Rails applications is the same as with usage in Rails applications,
 however you might need to eager load the schemas yourself:

data/VERSION

@@ -1 +1 @@
-3.0.10
+3.0.14

data/lib/schemacop/v3/combination_node.rb

@@ -38,7 +38,7 @@ module Schemacop
       end
 
       def matches(data)
-        @items.filter { |i| item_matches?(i, data) }
+        @items.select { |i| item_matches?(i, data) }
       end
     end
   end

data/lib/schemacop/v3/hash_node.rb

@@ -187,7 +187,7 @@ module Schemacop
 
           casted_data = prop.cast(data_hash[prop.name])
 
-          if casted_data.present? || data_hash.include?(prop.name)
+          if !casted_data.nil? || data_hash.include?(prop.name)
             result[prop_name] = casted_data
           end
 

data/lib/schemacop/v3/node.rb

@@ -33,10 +33,11 @@ module Schemacop
         if options.delete(:cast_str)
           format = NodeRegistry.name(klass)
           one_of_options = {
-            required:    options.delete(:required),
-            name:        options.delete(:name),
-            as:          options.delete(:as),
-            description: options.delete(:description)
+            required:           options.delete(:required),
+            treat_blank_as_nil: true,
+            name:               options.delete(:name),
+            as:                 options.delete(:as),
+            description:        options.delete(:description)
           }
           node = create(:one_of, **one_of_options) do
             self.node node
@@ -177,7 +178,7 @@ module Schemacop
         json[:title] = @title if @title
         json[context.swagger_json? ? :example : :examples] = @examples if @examples
         json[:description] = @description if @description
-        json[:default] = @default if @default
+        json[:default] = @default unless @default.nil?
         json[:enum] = @enum.to_a if @enum
 
         return json.as_json
@@ -196,7 +197,7 @@ module Schemacop
 
         # Apply default #
         if data.nil?
-          if default
+          if !default.nil?
             data = default
           else
             return nil

data/lib/schemacop/v3/one_of_node.rb

@@ -5,8 +5,30 @@ module Schemacop
         :oneOf
       end
 
+      def self.allowed_options
+        super + %i[treat_blank_as_nil]
+      end
+
+      def cast(value)
+        item = match(value)
+
+        unless item
+          if options[:treat_blank_as_nil] && value.blank? && !value.is_a?(FalseClass)
+            return nil
+          else
+            return value
+          end
+        end
+
+        return item.cast(value)
+      end
+
       def _validate(data, result:)
-        super_data = super
+        if options[:treat_blank_as_nil] && data.blank? && !data.is_a?(FalseClass)
+          data = nil
+        end
+
+        super_data = super(data, result: result)
         return if super_data.nil?
 
         matches = matches(super_data)

data/lib/schemacop/v3/string_node.rb

@@ -9,15 +9,16 @@ module Schemacop
 
       # 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)$/,
-        binary:      nil,
-        symbol:      nil,
-        integer:     /^-?[0-9]+$/,
-        number:      /^-?[0-9]+(\.[0-9]+)?$/
+        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
 
@@ -92,7 +93,7 @@ module Schemacop
 
         case options[:format]
         when :boolean
-          return to_cast == 'true'
+          %w[true 1].include?(to_cast)
         when :date
           return Date.parse(to_cast)
         when :'date-time'
@@ -103,6 +104,8 @@ module Schemacop
           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
         else

data/schemacop.gemspec

@@ -1,37 +1,49 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.10 ruby lib
+# stub: schemacop 3.0.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.10"
+  s.version = "3.0.14"
 
   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-03-19"
-  s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.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.date = "2021-10-11"
+  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]
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Schemacop validates ruby structures consisting of nested hashes and arrays against simple schema definitions.".freeze
   s.test_files = ["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]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
-    s.add_runtime_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
-    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-    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<pry>.freeze, [">= 0"])
-    s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
-    s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_runtime_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      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<pry>.freeze, [">= 0"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
+    else
+      s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      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<pry>.freeze, [">= 0"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
+    end
   else
     s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
     s.add_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])

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

@@ -18,6 +18,38 @@ module Schemacop
         assert_json(type: :boolean)
       end
 
+      def test_required_default
+        schema do
+          boo? :enabled, default: true
+        end
+
+        assert_validation(enabled: true)
+        assert_validation(enabled: false)
+
+        assert_cast({}, { 'enabled' => true })
+
+        schema do
+          boo? :enabled, default: false
+        end
+
+        assert_validation(enabled: true)
+        assert_validation(enabled: false)
+
+        assert_cast({}, { 'enabled' => false })
+      end
+
+      def test_default_bug
+        schema do
+          str! :send_message
+          boo? :always_show_successful, default: true
+        end
+
+        assert_cast(
+          { 'send_message' => 'foo' },
+          { 'send_message' => 'foo', 'always_show_successful' => true }
+        )
+      end
+
       def test_required
         schema :boolean, required: true
 
@@ -146,12 +178,49 @@ module Schemacop
         assert_cast('true', true)
         assert_cast('false', false)
 
+        assert_cast('1', true)
+        assert_cast('0', false)
+
         assert_cast(true, true)
         assert_cast(false, false)
 
-        assert_validation('1') do
+        assert_validation('5') do
           error '/', 'Matches 0 definitions but should match exactly 1.'
         end
+
+        # Nil can be validated, as it's not required
+        assert_validation(nil)
+
+        assert_validation('')
+
+        assert_cast('', nil)
+        assert_cast(nil, nil)
+      end
+
+      def test_cast_str_required
+        schema :boolean, cast_str: true, required: true
+
+        assert_cast('true', true)
+        assert_cast('false', false)
+
+        assert_cast(true, true)
+        assert_cast(false, false)
+
+        assert_validation('4') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+
+        assert_validation('foo') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+
+        assert_validation(nil) do
+          error '/', 'Value must be given.'
+        end
+
+        assert_validation('') do
+          error '/', 'Value must be given.'
+        end
       end
     end
   end

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

@@ -965,6 +965,46 @@ module Schemacop
         assert_cast({ foo: 42, bar: 13 }, { bar: 42 }.with_indifferent_access)
         assert_cast({ bar: 13, foo: 42 }, { bar: 42 }.with_indifferent_access)
       end
+
+      def test_cast_str_required
+        schema :hash do
+          boo! :active, cast_str: true
+          int! :id, cast_str: true
+        end
+
+        assert_validation({ active: true, id: 1 })
+        assert_validation({ active: 'true', id: '1' })
+
+        assert_validation({}) do
+          error '/active', 'Value must be given.'
+          error '/id', 'Value must be given.'
+        end
+
+        assert_cast({ active: 'true', id: '1' }, { active: true, id: 1 }.with_indifferent_access)
+
+        assert_validation({ active: '', id: '' }) do
+          error '/active', 'Value must be given.'
+          error '/id', 'Value must be given.'
+        end
+      end
+
+      def test_cast_str_optional
+        schema :hash do
+          boo? :active, cast_str: true
+          int? :id, cast_str: true
+        end
+
+        assert_validation({ active: true, id: 1 })
+        assert_validation({ active: 'true', id: '1' })
+
+        assert_cast({ active: 'true', id: '1' }, { active: true, id: 1 }.with_indifferent_access)
+
+        assert_validation({})
+        assert_validation({ active: nil, id: nil })
+
+        assert_validation({ active: '', id: '' })
+        assert_cast({ active: '', id: '' }, { active: nil, id: nil }.with_indifferent_access)
+      end
     end
   end
 end

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

@@ -339,6 +339,28 @@ module Schemacop
         assert_cast('1', 1)
         assert_cast(1, 1)
 
+        assert_cast(nil, nil)
+        assert_cast('', nil)
+
+        assert_validation('true') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+      end
+
+      def test_cast_str_required
+        schema :integer, cast_str: true, required: true
+
+        assert_cast('1', 1)
+        assert_cast(1, 1)
+
+        assert_validation(nil) do
+          error '/', 'Value must be given.'
+        end
+
+        assert_validation('') do
+          error '/', 'Value must be given.'
+        end
+
         assert_validation('true') do
           error '/', 'Matches 0 definitions but should match exactly 1.'
         end

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

@@ -93,6 +93,10 @@ module Schemacop
           error '/', 'Value must be given.'
         end
 
+        assert_validation('') do
+          error '/', 'Value must be given.'
+        end
+
         assert_validation('5')
         assert_validation('5.3') do
           error '/', 'Matches 0 definitions but should match exactly 1.'
@@ -156,6 +160,12 @@ module Schemacop
         assert_validation([nil]) do
           error '/[0]', 'Value must be given.'
         end
+        assert_validation(['']) do
+          error '/[0]', 'Value must be given.'
+        end
+        assert_validation([]) do
+          error '/', 'Array has 0 items but must have exactly 1.'
+        end
       end
 
       def test_not_support_block

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

@@ -308,6 +308,9 @@ module Schemacop
         assert_cast('1', 1)
         assert_cast(1, 1)
 
+        assert_validation(nil)
+        assert_validation('')
+
         assert_cast('1.0', 1.0)
         assert_cast(1.0, 1.0)
 

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

@@ -182,6 +182,18 @@ module Schemacop
           schema :one_of
         end
       end
+
+      def test_treat_blank_as_nil
+        schema :one_of, treat_blank_as_nil: true do
+          boo
+          str format: :boolean
+        end
+
+        assert_validation(nil)
+        assert_validation('')
+        assert_validation('true')
+        assert_validation(true)
+      end
     end
   end
 end

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

@@ -200,6 +200,30 @@ module Schemacop
         assert_cast('039n23$g- sfk3/', :'039n23$g- sfk3/')
       end
 
+      def test_format_integer_list
+        schema :string, format: :integer_list
+
+        assert_json(type: :string, format: :'integer-list')
+
+        assert_validation '1,2,3,4'
+        assert_validation '1,2,-3,-54'
+        assert_validation '2'
+        assert_validation '-2'
+
+        assert_validation 234 do
+          error '/', StringNodeTest.invalid_type_error(Integer)
+        end
+
+        assert_validation 'sd sfdij soidf' do
+          error '/', 'String does not match format "integer-list".'
+        end
+
+        assert_cast nil,      nil
+        assert_cast '1,-2,3', [1, -2, 3]
+        assert_cast '1',      [1]
+        assert_cast '-1',     [-1]
+      end
+
       def test_enum
         schema :string, enum: ['foo', 'some string', 'some other string', 42]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.14
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,10 +170,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".releaser_config"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
- - 2.6.2
- - 2.7.1
- - 3.0.0
-script:
- - bundle install
- - bundle exec rake test
- - bundle exec rubocop