schemacop 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a824c8ccca5369721dff7f7ccebb581cb34685a31aa50126444a92593ee20c
-  data.tar.gz: a336258896003d683a4b9b3d5c8a1a7e5070c1cef06eb4975ba0ba8d872c8f0a
+  metadata.gz: 45a0558e32f2c4a8e4d9db631ac874629ed7e92a378a177266a216b9e35295bd
+  data.tar.gz: fa2da0867bf598a32ba7728b246343f6bf3849aa1ccdddf9093dcd360df2b53e
 SHA512:
-  metadata.gz: f4faf09edddbbd5fa892ee9b7f4dc75a0e551744e625f2b8552fe68678113abfd07dc2b8f3344f0d75c7f37aa84281b7c37195f8dd9aa70b2b89e5742a98452c
-  data.tar.gz: 2f07ee47aba8a6147a6088f7f3fe6e0c35168b9a59ee540c00cd3f8693104b74e74227fa68c96604410098d774ea9774c50f135f20a51448f349b8b297d4a2f1
+  metadata.gz: 557da4f2765fc6a9c081b1b894f57b9acb8f3f16ff72c56589064672d060b1879b4d68a498692aeb4764b78ab1091de9b5b0a8dbd4b0ebc0e8bc401875ff5167
+  data.tar.gz: 54748996bd7ea09dda23163c808e32300e898ceb3910d1decfaa0516d49a268d79afeb9c9292f3a3fbc6d5f128ba8de1470111c66470585772b5903580088cbb

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

data/README_V3.md

@@ -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.
 

data/VERSION

@@ -1 +1 @@
-3.0.13
+3.0.14

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

@@ -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|0|1)$/,
-        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' || to_cast == '1'
+          %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,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.13 ruby lib
+# stub: schemacop 3.0.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.13"
+  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-10-04"
+  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]

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
 

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.13
+  version: 3.0.14
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport