schemacop 3.0.4 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b28a407ae498b94fa8c7897895d052c1bea34ebeee991ab992b4a86aa94f7ab
-  data.tar.gz: 7bd4dbd4f0a51ac591a7ff6189fd98e803597c0487f8a16e43c78774dc75c5e3
+  metadata.gz: 8081d63289f1f0078e74dc2d404b549fa5529c2d9ae977fcff713ecd01312f27
+  data.tar.gz: aff64b9eb5bc7a9a73a64c2ed0066584cfb59a18dff3566aadcd3c632f8599f8
 SHA512:
-  metadata.gz: b40fb214b50815f65f87f978052f0c6bc38018340d00eeeddb68e392dfb44106e0d6ebeb5e908172113dadc57cd0f88bbdf1d230d38cd5dab31382f8d217f34a
-  data.tar.gz: cf87908ded44c22bd53b824e732f7447ade01608104cb55a844879fb7f17b2172b78c13b47adb0f373abbba3a90f75d353cf0f63ec5d74b16128eee780743db6
+  metadata.gz: 3084d61eb18f126ce9b88341d0809614f10c5ba74f39ece8fe7f1cc29c9b7f3d3fa89fadd55fe48fa515602bd80d755c326cfc4ce3d4850993d9cbf0e694a48b
+  data.tar.gz: b55349b141d1c971923152ecf19793905fc1811bfcb8647271415706d3372bde616d159aa1e8202d4b5630a84443ae6c2d5ccb67acabb5f115db9270b9f0825b

data/.releaser_config

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

data/CHANGELOG.md

@@ -1,14 +1,41 @@
 # Change log
 
-<!--
-## master (unreleased)
+## 3.0.9 (2021-02-26)
 
-### New features
+* Fix casting of blank strings
 
-### Bug fixes
+* Add `allow_blank` option to `String` nodes
 
-### Changes
--->
+## 3.0.8 (2021-02-23)
+
+* Fix `object` nodes in hashes with no classes
+
+* Document `cast_str` option
+
+## 3.0.7 (2021-02-22)
+
+* Adapt schema definitions handling when using Swagger-standard JSON
+
+## 3.0.6 (2021-02-14)
+
+* Remove option `json_format` from {Schemacop::Schema3.as_json as_json} again.
+  If you need to use the swagger format, use
+  {Schemacop::V3::Context.with_json_format} instead.
+
+* Rename `Schemacop::V3::Context.spawn_with` to
+  {Schemacop::V3::Context.with_json_format} and make keyword argument
+  `json_format` a positional argument.
+
+## 3.0.5 (2021-02-14)
+
+* Allow option `pattern` to be a `Regexp` for `string` (`str`) nodes
+
+* Remove `examples_keyword` from context again
+
+* Add option `json_format` to {Schemacop::Schema3.as_json as_json}. This allows
+  generating a JSON schema that is [specific to
+  swagger](https://swagger.io/docs/specification/data-models/keywords/) by
+  passing `:swagger` to it.
 
 ## 3.0.4 (2021-02-15)
 

data/README_V3.md

@@ -199,14 +199,19 @@ transformed into various types.
 * `max_length`
   Defines the (inclusive) maximum required string length
 * `pattern`
-  Defines a (ruby) regex pattern the value will be matched against. Must be a
-  string and should generally start with `^` and end with `$` so as to evaluate
-  the entire string. It should not be enclosed in `/` characters.
+  Defines a (ruby) regex pattern the value will be matched against. Must be either
+  a string which should not be enclosed in `/` characters, or a Ruby Regexp.
+  The pattern should generally start with `^` and end with `$` so as to evaluate
+  the entire string.
 * `format`
   The `format` option allows for basic semantic validation on certain kinds of
   string values that are commonly used. See section *formats* for more
   information on the available formats. Note that strings with a format are also
   **casted** into that format.
+* `allow_blank`
+  By default, blank strings are allowed and left as they are when casted (e.g.
+  the string `''` is valid). If you want to disallow blank strings, set this
+  option to `false`.
 
 #### Formats
 
@@ -246,6 +251,38 @@ transformed into various types.
 
 #### Examples
 
+```ruby
+# Basic example
+schema = Schemacop::Schema3.new :string
+schema.validate!(nil)   # => nil
+schema.validate!('')    # => ""
+schema.validate!('foo') # => "foo"
+schema.validate!("\n")  # => "\n"
+```
+
+With the `required` option:
+
+```ruby
+# Basic example
+schema = Schemacop::Schema3.new :string, required: true
+schema.validate!(nil)   # => Schemacop::Exceptions::ValidationError: /: Value must be given.
+schema.validate!('')    # => ""
+schema.validate!('foo') # => "foo"
+schema.validate!("\n")  # => "\n"
+```
+
+With the `allow_blank` option:
+
+```ruby
+# Basic example
+schema = Schemacop::Schema3.new :string, allow_blank: false
+schema.validate!(nil)   # => Schemacop::Exceptions::ValidationError: /: String is blank but must not be blank!
+schema.validate!('')    # => Schemacop::Exceptions::ValidationError: /: String is blank but must not be blank!
+schema.validate!('foo') # => "foo"
+schema.validate!("\n")  # => Schemacop::Exceptions::ValidationError: /: String is blank but must not be blank!
+```
+Example of using a `format` option:
+
 ```ruby
 # By using a format, string values are casted to that respective format
 schema = Schemacop::Schema3.new(:string, format: :date)
@@ -277,6 +314,10 @@ integer can be done.
 * `multiple_of`
   The received number has to be a multiple of the given number for the validation to
   pass.
+* `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.
 
 #### Examples
 
@@ -293,6 +334,20 @@ schema.validate!((4 + 0i))      # => Schemacop::Exceptions::ValidationError: /:
 schema.validate!(BigDecimal(5)) # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "integer".
 ```
 
+With `cast_str` enabled:
+
+```ruby
+# Validates that the input is an even number between 0 and 100 (inclusive)
+schema = Schemacop::Schema3.new(:integer, minimum: 0, maximum: 100, multiple_of: 2, cast_str: true)
+schema.validate!('42')            # => 42
+schema.validate!('43')            # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!('-2')            # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!('102')           # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+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.
+```
+
 ### Number
 
 Type: `:number`\
@@ -327,6 +382,11 @@ With the various available options, validations on the value of the number can b
 * `multiple_of`
   The received number has to be a multiple of the given number for the validation to
   pass.
+* `cast_str`
+  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.
 
 #### Examples
 
@@ -343,6 +403,19 @@ schema.validate!(BigDecimal(5)) # => 0.5e1
 schema.validate!((4 + 0i))      # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "big_decimal" or "float" or "integer" or "rational".
 ```
 
+With `cast_str` enabled:
+
+```ruby
+schema = Schemacop::Schema3.new(:number, cast_str: true, minimum: 0.0, maximum: (50r), multiple_of: BigDecimal('0.5'))
+schema.validate!('42')        # => 42
+schema.validate!('42.2')      # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!('-2')        # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+schema.validate!('51')        # => Schemacop::Exceptions::ValidationError: /: Matches 0 definitions but should match exactly 1.
+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.
+```
+
 ### Symbol
 
 Type: `:symbol`\
@@ -350,15 +423,33 @@ DSL: `sym`
 
 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.
+
 #### Examples
 
 ```ruby
 # Validates that the input is a symbol
 schema = Schemacop::Schema3.new(:symbol)
-schema.validate!(:foo)  # => :foo
-schema.validate!('foo') # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "Symbol".
-schema.validate!(123)   # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "Symbol".
-schema.validate!(false) # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "Symbol".
+schema.validate!(:foo)   # => :foo
+schema.validate!('foo')  # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "Symbol".
+schema.validate!(123)    # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "Symbol".
+schema.validate!(false)  # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "Symbol".
+schema.validate!(:false) # => :false
+```
+
+With `cast_str` enabled:
+
+```ruby
+# Validates that the input is a symbol
+schema = Schemacop::Schema3.new(:symbol, cast_str: true)
+schema.validate!(':foo')   # => :":foo"
+schema.validate!('foo')    # => :foo
+schema.validate!('123')    # => :"123"
+schema.validate!('false')  # => :false
+schema.validate!(':false') # => :":false"
 ```
 
 ### Boolean
@@ -368,6 +459,12 @@ DSL: `boo`
 
 The boolean type is used to validate Ruby booleans, i.e. the `TrueClass` and `FalseClass`
 
+#### 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'`
+
 #### Examples
 
 ```ruby
@@ -380,6 +477,17 @@ schema.validate!('false') # => Schemacop::Exceptions::ValidationError: /: Invali
 schema.validate!(1234)    # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "boolean".
 ```
 
+With `cast_str` enabled:
+
+```ruby
+schema = Schemacop::Schema3.new(:boolean, cast_str: true)
+schema.validate!(true)    # => true
+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.
+```
+
 ### Array
 
 Type: `:array`\

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.9

data/lib/schemacop/v3.rb

@@ -3,6 +3,24 @@ module Schemacop
     def self.register(*args)
       NodeRegistry.register(*args)
     end
+
+    # @private
+    def self.sanitize_exp(exp)
+      return exp if exp.is_a?(String)
+
+      _start_slash, caret, exp, dollar, _end_slash, flags = exp.inspect.match(%r{^(/?)(\^)?(.*?)(\$)?(/?)([ixm]*)?$}).captures
+      flags = flags.split('')
+
+      if flags.delete('i')
+        exp = "(?i)(#{exp})"
+      end
+
+      if flags.any?
+        fail "Flags #{flags.inspect} are not supported by Schemacop."
+      end
+
+      return "#{caret}#{exp}#{dollar}"
+    end
   end
 end
 

data/lib/schemacop/v3/boolean_node.rb

@@ -19,6 +19,10 @@ module Schemacop
           default
         end
       end
+
+      def self.allowed_options
+        super + %i[cast_str]
+      end
     end
   end
 end

data/lib/schemacop/v3/context.rb

@@ -2,13 +2,13 @@ module Schemacop
   module V3
     class Context
       attr_accessor :schemas
-      attr_accessor :examples_keyword
+      attr_accessor :json_format
 
-      DEFAULT_EXAMPLES_KEYWORD = :examples
+      DEFAULT_JSON_FORMAT = :default
 
-      def initialize
+      def initialize(json_format: DEFAULT_JSON_FORMAT)
         @schemas = {}.with_indifferent_access.freeze
-        @examples_keyword = DEFAULT_EXAMPLES_KEYWORD
+        @json_format = json_format
       end
 
       def schema(name, type = :hash, **options, &block)
@@ -16,6 +16,18 @@ module Schemacop
           name => Node.create(type, **options, &block)
         ).freeze
       end
+
+      def with_json_format(json_format)
+        prev_json_format = @json_format
+        @json_format = json_format
+        return yield
+      ensure
+        @json_format = prev_json_format
+      end
+
+      def swagger_json?
+        @json_format == :swagger
+      end
     end
   end
 end

data/lib/schemacop/v3/hash_node.rb

@@ -21,14 +21,6 @@ module Schemacop
         super + NodeRegistry.dsl_methods(true) + %i[dsl_dep dsl_add]
       end
 
-      def self.sanitize_exp(exp)
-        exp = exp.to_s
-        if exp.start_with?('(?-mix:')
-          exp = exp.to_s.gsub(/^\(\?-mix:/, '').gsub(/\)$/, '')
-        end
-        return exp
-      end
-
       def add_child(node)
         unless node.name
           fail Exceptions::InvalidSchemaError, 'Child nodes must have a name.'
@@ -64,7 +56,7 @@ module Schemacop
 
         json = {}
         json[:properties] = Hash[properties.values.map { |p| [p.name, p.as_json] }] if properties.any?
-        json[:patternProperties] = Hash[pattern_properties.values.map { |p| [self.class.sanitize_exp(p.name), p.as_json] }] if pattern_properties.any?
+        json[:patternProperties] = Hash[pattern_properties.values.map { |p| [V3.sanitize_exp(p.name), p.as_json] }] 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

@@ -48,7 +48,7 @@ module Schemacop
       end
 
       def self.allowed_options
-        %i[name required default description examples enum parent options cast_str title as]
+        %i[name required default description examples enum parent options title as]
       end
 
       def self.dsl_methods
@@ -150,6 +150,10 @@ module Schemacop
 
       protected
 
+      def context
+        Schemacop.context
+      end
+
       def item_matches?(item, data)
         item_result = Result.new(self)
         item._validate(data, result: item_result)
@@ -157,12 +161,13 @@ module Schemacop
       end
 
       def process_json(attrs, json)
-        if @schemas.any?
+        if !context.swagger_json? && @schemas.any?
           json[:definitions] = {}
           @schemas.each do |name, subschema|
             json[:definitions][name] = subschema.as_json
           end
         end
+
         attrs.each do |attr|
           if options.include?(attr)
             json[attr.to_s.camelize(:lower).to_sym] = options[attr]
@@ -170,7 +175,7 @@ module Schemacop
         end
 
         json[:title] = @title if @title
-        json[Schemacop.context.examples_keyword] = @examples if @examples
+        json[context.swagger_json? ? :example : :examples] = @examples if @examples
         json[:description] = @description if @description
         json[:default] = @default if @default
         json[:enum] = @enum.to_a if @enum

data/lib/schemacop/v3/numeric_node.rb

@@ -4,14 +4,32 @@ module Schemacop
     class NumericNode < Node
       ATTRIBUTES = %i[
         minimum
-        exclusive_minimum
         maximum
-        exclusive_maximum
         multiple_of
+        exclusive_minimum
+        exclusive_maximum
       ].freeze
 
       def self.allowed_options
-        super + ATTRIBUTES
+        super + ATTRIBUTES + %i[cast_str]
+      end
+
+      def process_json(attrs, json)
+        if context.swagger_json?
+          if options[:exclusive_minimum]
+            json[:minimum] = options[:exclusive_minimum]
+            json[:exclusiveMinimum] = true
+          end
+
+          if options[:exclusive_maximum]
+            json[:maximum] = options[:exclusive_maximum]
+            json[:exclusiveMaximum] = true
+          end
+
+          attrs -= %i[exclusive_minimum exclusive_maximum]
+        end
+
+        super attrs, json
       end
 
       def _validate(data, result:)

data/lib/schemacop/v3/object_node.rb

@@ -5,11 +5,6 @@ module Schemacop
         super + %i[classes strict]
       end
 
-      def self.create(classes, **options, &block)
-        options[:classes] = classes
-        super(**options, &block)
-      end
-
       def as_json
         {} # Not supported by Json Schema
       end

data/lib/schemacop/v3/reference_node.rb

@@ -11,7 +11,11 @@ module Schemacop
       end
 
       def as_json
-        process_json([], '$ref': "#/definitions/#{@path}")
+        if context.swagger_json?
+          process_json([], '$ref': "#/components/schemas/#{@path}")
+        else
+          process_json([], '$ref': "#/definitions/#{@path}")
+        end
       end
 
       def _validate(data, result:)

data/lib/schemacop/v3/string_node.rb

@@ -4,7 +4,6 @@ module Schemacop
       ATTRIBUTES = %i[
         min_length
         max_length
-        pattern
         format
       ].freeze
 
@@ -23,7 +22,7 @@ module Schemacop
       # rubocop:enable Layout/LineLength
 
       def self.allowed_options
-        super + ATTRIBUTES - %i[cast_str] + %i[format_options]
+        super + ATTRIBUTES + %i[format_options pattern allow_blank]
       end
 
       def allowed_types
@@ -31,11 +30,21 @@ module Schemacop
       end
 
       def as_json
-        process_json(ATTRIBUTES, type: :string)
+        json = { type: :string }
+        if options[:pattern]
+          json[:pattern] = V3.sanitize_exp(Regexp.compile(options[:pattern]))
+        end
+        process_json(ATTRIBUTES, json)
       end
 
       def _validate(data, result:)
         super_data = super
+
+        # Validate blank #
+        if options[:allow_blank].is_a?(FalseClass) && super_data.blank?
+          result.error 'String is blank but must not be blank!'
+        end
+
         return if super_data.nil?
 
         # Validate length #
@@ -50,8 +59,14 @@ module Schemacop
         end
 
         # Validate pattern #
-        if options[:pattern] && !super_data.match?(Regexp.compile(options[:pattern]))
-          result.error "String does not match pattern #{options[:pattern].inspect}."
+        if (pattern = options[:pattern])
+          unless options[:pattern].is_a?(Regexp)
+            pattern = Regexp.compile(pattern)
+          end
+
+          unless super_data.match?(pattern)
+            result.error "String does not match pattern #{V3.sanitize_exp(pattern).inspect}."
+          end
         end
 
         # Validate format #
@@ -67,7 +82,7 @@ module Schemacop
       end
 
       def cast(value)
-        if value.present?
+        if !value.nil?
           to_cast = value
         elsif default.present?
           to_cast = default
@@ -121,7 +136,9 @@ module Schemacop
         end
 
         if options[:pattern]
-          fail 'Option "pattern" must be a string.' unless options[:pattern].is_a?(String)
+          unless options[:pattern].is_a?(String) || options[:pattern].is_a?(Regexp)
+            fail 'Option "pattern" must be a string or Regexp.'
+          end
 
           begin
             Regexp.compile(options[:pattern])

data/lib/schemacop/v3/symbol_node.rb

@@ -8,6 +8,10 @@ module Schemacop
       def allowed_types
         { Symbol => 'Symbol' }
       end
+
+      def self.allowed_options
+        super + %i[cast_str]
+      end
     end
   end
 end

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.4 ruby lib
+# stub: schemacop 3.0.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.4"
+  s.version = "3.0.9"
 
   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-02-15"
+  s.date = "2021-02-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.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]

data/test/lib/test_helper.rb

@@ -142,6 +142,13 @@ class V3Test < SchemacopTest
     assert_equal expected_json.as_json, @schema.as_json.as_json
   end
 
+  def assert_swagger_json(expected_json)
+    # TODO: Double "as_json" should not be necessary
+    Schemacop.context.with_json_format(:swagger) do
+      assert_equal expected_json.as_json, @schema.as_json.as_json
+    end
+  end
+
   def assert_match_any(array, exp)
     assert array.any? { |element| element.match?(exp) },
            "Expected any of #{array.inspect} to match #{exp}."

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

@@ -73,8 +73,8 @@ module Schemacop
             hsh { str! :foo }
           end
           any_of do
-            obj(Date)
-            obj(Time)
+            obj classes: Date
+            obj classes: Time
           end
           ary
           boo

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

@@ -136,6 +136,20 @@ module Schemacop
         assert_cast(false, false)
         assert_cast(nil, true)
       end
+
+      def test_cast_str
+        schema :boolean, cast_str: true
+
+        assert_cast('true', true)
+        assert_cast('false', false)
+
+        assert_cast(true, true)
+        assert_cast(false, false)
+
+        assert_validation('1') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+      end
     end
   end
 end

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

@@ -125,6 +125,12 @@ module Schemacop
           exclusiveMinimum: 0
         )
 
+        assert_swagger_json(
+          type:             :integer,
+          minimum:          0,
+          exclusiveMinimum: true
+        )
+
         assert_validation 5
         assert_validation 1
         assert_validation(0) do
@@ -158,6 +164,12 @@ module Schemacop
           exclusiveMaximum: 5
         )
 
+        assert_swagger_json(
+          type:             :integer,
+          maximum:          5,
+          exclusiveMaximum: true
+        )
+
         assert_validation 4
         assert_validation 1
         assert_validation(5) do
@@ -318,6 +330,17 @@ module Schemacop
                       ]
                     })
       end
+
+      def test_cast_str
+        schema :integer, cast_str: true
+
+        assert_cast('1', 1)
+        assert_cast(1, 1)
+
+        assert_validation('true') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+      end
     end
   end
 end

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

@@ -63,6 +63,20 @@ module Schemacop
                     })
       end
 
+      def test_swagger_example
+        schema :string, examples: ['Foo', 'Foo bar']
+
+        assert_json(
+          type:     :string,
+          examples: ['Foo', 'Foo bar']
+        )
+
+        assert_swagger_json(
+          type:    :string,
+          example: ['Foo', 'Foo bar']
+        )
+      end
+
       def test_cast_in_root
         schema :integer, cast_str: true, required: true
 

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

@@ -101,6 +101,12 @@ module Schemacop
           exclusiveMinimum: 0
         )
 
+        assert_swagger_json(
+          type:             :number,
+          minimum:          0,
+          exclusiveMinimum: true
+        )
+
         assert_validation 5
         assert_validation 1
         assert_validation(0) do
@@ -134,6 +140,12 @@ module Schemacop
           exclusiveMaximum: 5
         )
 
+        assert_swagger_json(
+          type:             :number,
+          maximum:          5,
+          exclusiveMaximum: true
+        )
+
         assert_validation 4
         assert_validation 1
         assert_validation(5) do
@@ -287,6 +299,35 @@ module Schemacop
                       ]
                     })
       end
+
+      def test_cast_str
+        schema :number, cast_str: true, minimum: 0.0, maximum: 50r, multiple_of: BigDecimal('0.5')
+
+        assert_cast('1', 1)
+        assert_cast(1, 1)
+
+        assert_cast('1.0', 1.0)
+        assert_cast(1.0, 1.0)
+
+        assert_validation('42')
+        assert_validation('0.5')
+
+        assert_validation('true') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+
+        assert_validation('51') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+
+        assert_validation('-2') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+
+        assert_validation('3.1415') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+      end
     end
   end
 end

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

@@ -59,7 +59,10 @@ module Schemacop
       end
 
       def test_hash
-        schema { obj! :myobj, String }
+        schema do
+          obj! :myobj, classes: String
+        end
+
         assert_json(
           type:                 :object,
           properties:           {
@@ -78,6 +81,16 @@ module Schemacop
         end
       end
 
+      def test_hash_no_class
+        schema do
+          obj! :myobj
+        end
+
+        assert_validation(myobj: 'str')
+        assert_validation(myobj: 123)
+        assert_validation(myobj: Object.new)
+      end
+
       def test_enum_schema
         schema :object, enum: [true, 'foo', :baz, [], { qux: '123' }]
 

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

@@ -80,7 +80,7 @@ module Schemacop
         end
       end
 
-      def test_pattern
+      def test_pattern_as_string
         schema :string, pattern: '^a_.*_z$'
 
         assert_json(type: :string, pattern: '^a_.*_z$')
@@ -95,6 +95,22 @@ module Schemacop
         end
       end
 
+      def test_pattern_as_regexp
+        schema :string, pattern: /^a_.*_z$/i
+
+        assert_json(type: :string, pattern: '^(?i)(a_.*_z)$')
+
+        assert_validation 'a__z'
+        assert_validation 'a__Z'
+        assert_validation 'a_ foo bar _Z'
+        assert_validation '' do
+          error '/', 'String does not match pattern "^(?i)(a_.*_z)$".'
+        end
+        assert_validation 'a_ _zfoo' do
+          error '/', 'String does not match pattern "^(?i)(a_.*_z)$".'
+        end
+      end
+
       def test_format_date
         schema :string, format: :date
 
@@ -314,8 +330,8 @@ module Schemacop
         end
 
         assert_raises_with_message Exceptions::InvalidSchemaError,
-                                   'Option "pattern" must be a string.' do
-          schema :string, pattern: //
+                                   'Option "pattern" must be a string or Regexp.' do
+          schema :string, pattern: 42
         end
 
         assert_raises_with_message Exceptions::InvalidSchemaError,
@@ -384,6 +400,53 @@ module Schemacop
                       ]
                     })
       end
+
+      def test_cast_empty_or_whitespace_string
+        schema :string
+
+        assert_cast(nil, nil)
+        assert_cast('', '')
+        assert_cast('    ', '    ')
+        assert_cast("\n", "\n")
+        assert_cast("\t", "\t")
+      end
+
+      def test_cast_empty_or_whitespace_string_required
+        schema :string, required: true
+
+        assert_validation(nil) do
+          error '/', 'Value must be given.'
+        end
+
+        assert_cast('', '')
+        assert_cast('    ', '    ')
+        assert_cast("\n", "\n")
+        assert_cast("\t", "\t")
+      end
+
+      def test_empty_or_whitespace_string_blank_not_allowed
+        schema :string, allow_blank: false
+
+        assert_validation(nil) do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation('') do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation('   ') do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation("\n") do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation("\t") do
+          error '/', 'String is blank but must not be blank!'
+        end
+      end
     end
   end
 end

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

@@ -70,6 +70,20 @@ module Schemacop
           error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
         end
       end
+
+      # rubocop:disable Lint/BooleanSymbol
+      def test_cast_str
+        schema :symbol, cast_str: true
+
+        assert_cast('true', :true)
+        assert_cast('foo', :foo)
+        assert_cast('1', :'1')
+
+        assert_cast(:true, :true)
+        assert_cast(:foo, :foo)
+        assert_cast(:'1', :'1')
+      end
+      # rubocop:enable Lint/BooleanSymbol
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.9
 platform: ruby
 authors:
 - Sitrox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-02-26 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.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.