schemacop 3.0.11 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40958dccae4c661f133f181907cc729c0002ca02702a6675c1beb1c90fed425e
-  data.tar.gz: 4ef5dcf205bd5f5cc8203867e95d07ff5a56a8c4654f3eac89e90596cb9a2e39
+  metadata.gz: 2e43238e69ebe95beaac85536a9dadbf3233bd4fa5751c7e019ca6d07aa05860
+  data.tar.gz: 8bafd412f0572e0c12a7c163cba48b6f6f69900ec903684dc3c9495b4913cf52
 SHA512:
-  metadata.gz: 1af517385c88340f64067895363b6e79d2ce15e00415ef5d0110200706b2e264701e6a0eeac9332e2ea8d9c5967989e8e05a9e311291a1e942d1effc5cc15219
-  data.tar.gz: c773bd33014ae3a8ccb4f1cd22c2066b375de678fdde702d2d95dcbc78880bd6d19940bb06b8052b06f955bc740834b7761f5c389d21bec56250ee18a4680ce6
+  metadata.gz: 9da291f938673bf76f55f4f4fddbf5a3355fe9c72ae30f8be8c9e224b9bea2f1a89dbcb2da8312ddbaca09dcd25da5511e904963400633d9ef193014da9ee0ec
+  data.tar.gz: 21793a6a7f3fc730a123f7ed8ceacde1e930620b77fef63c7e30c919a9e9ebf3372a8a5208dbdf177880e011322f529d04558bd68d363cbfd85b023a1f2ed265

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.15 (2021-10-11)
+
+* Add support for custom string formatters
+
+## 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

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,9 +246,30 @@ 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.
 
+#### 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
@@ -501,8 +522,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'`. Blank strings will be treated equally as `nil`.
+  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
 
@@ -514,6 +536,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:
@@ -1341,7 +1368,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.
@@ -1358,7 +1386,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
@@ -1385,7 +1413,7 @@ end
 ```
 
 ```ruby
-# app/schemas/nested/user.rb
+# app/schemas/nested/group.rb
 schema :hash do
   str! :name
 end
@@ -1409,7 +1437,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.11
+3.0.15

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

@@ -178,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
@@ -197,7 +197,7 @@ module Schemacop
 
         # Apply default #
         if data.nil?
-          if default
+          if !default.nil?
             data = default
           else
             return nil

data/lib/schemacop/v3/string_node.rb

@@ -7,20 +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)$/,
-        binary:      nil,
-        symbol:      nil,
-        integer:     /^-?[0-9]+$/,
-        number:      /^-?[0-9]+(\.[0-9]+)?$/
-      }.freeze
-      # rubocop:enable Layout/LineLength
-
       def self.allowed_options
         super + ATTRIBUTES + %i[format_options pattern allow_blank]
       end
@@ -70,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])
@@ -90,21 +77,8 @@ module Schemacop
           return nil
         end
 
-        case options[:format]
-        when :boolean
-          return to_cast == 'true'
-        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 :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
@@ -119,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.rb

@@ -13,6 +13,80 @@ module Schemacop
   mattr_accessor :default_schema_version
   self.default_schema_version = 3
 
+  mattr_accessor :string_formatters
+  self.string_formatters = {}
+
+  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) }
+  )
+
+  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(&:to_i) }
+  )
+
   def self.with_context(context)
     prev_context = Thread.current[CONTEXT_THREAD_KEY]
     Thread.current[CONTEXT_THREAD_KEY] = context

data/schemacop.gemspec

@@ -1,37 +1,49 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.11 ruby lib
+# stub: schemacop 3.0.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.11"
+  s.version = "3.0.15"
 
   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-26"
-  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,10 +178,13 @@ 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
 
@@ -171,7 +206,11 @@ module Schemacop
         assert_cast(true, true)
         assert_cast(false, false)
 
-        assert_validation('1') do
+        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
 

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,80 @@ 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
+
+        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_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
         schema :string, enum: ['foo', 'some string', 'some other string', 42]
 
@@ -224,33 +317,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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.15
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 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