simple_json_schema 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba091bad31957536ee21fd439a1841fd62bfe9de3183fb5cfdf5e77cfb78d750
-  data.tar.gz: 3b3d9cae644a8d60c00ebc4329168e7de3f69eae71ebf1523cfe11a0edcea7fc
+  metadata.gz: ddf8b00b377c44e276b281a67ee6daf52bb254dec9cea0f2ef277e835cb5c7e1
+  data.tar.gz: b8bd835175f4559692c4858ba4735c74afca34dd39c2aa609e9a2a05c5a36ed4
 SHA512:
-  metadata.gz: fca0fe9bd46eb26ed08ec4bb1be70abf8514b455f783799405a472d09b789555bc823f4329f75daa6dc96365161ed9158a2c386f66be1d17ea9cf6fa4813c31a
-  data.tar.gz: e626dd58a40c94ef679e93f36951d66dfb1d18f0c3a5308240cde33ba6cbe06c4e20fde2649f0cb27dd15732652c02ff52cdb7effdf24f9e38e1f84ca493d324
+  metadata.gz: 454cdba35466ad60e6177c1e621c789776d2080b9780b7133cb355c99124f4d7f779f61e178bddf7c73bcf2db4da3b754d414630d726796f26189c2115f725e9
+  data.tar.gz: 6d4e0d386ab1aae6147f1fd8ce278b421b2f18da7c58ff5d07a1d55c323b1edc9d79b32f193e9426295349d903a16e35921e2b89e179961bb2d7b650474e9d50

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/.rubocop.yml

@@ -26,3 +26,7 @@ Metrics/BlockLength:
   Exclude:
     - simple_json_schema.gemspec
     - spec/**/*.rb
+
+Metrics/ModuleLength:
+  Exclude:
+    - lib/simple_json_schema/custom_draft7.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_json_schema (0.1.5)
+    simple_json_schema (0.1.6)
       activesupport (~> 6.0)
       addressable (~> 2.7)
       ecma-re-validator (~> 0.3)
@@ -26,7 +26,7 @@ GEM
     docile (1.3.3)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.2)

data/README.md

@@ -73,9 +73,9 @@ Some extra implementations on types (THIS IS NOT ON THE DRAFT7 DEFINITION!)
 
 | Type | Attribute | Description | Allowed values |
 | ---- | --------- | ----------- | -------------- |
-| string | required | Will evaluate the `blank?` concept on the string | true/false |
-| integer | required | Will enforce value != 0 | true/false |
-| number | required | Will enforce value != 0.0 | true/false |
+| string | not_blank | Will evaluate the `blank?` concept on the string | true/false |
+| integer | not_zero | Will enforce value != 0 | true/false |
+| number | not_zero | Will enforce value != 0.0 | true/false |
 
 ## Development
 

data/draft-07-schema

@@ -0,0 +1,270 @@
+{
+  "$schema": "https://gitlab.com/vliper/simple_json_schema/-/raw/master/draft-07-schema#",
+  "$id": "https://gitlab.com/vliper/simple_json_schema/-/raw/master/draft-07-schema#",
+  "title": "Simple JSON Schema meta-schema",
+  "definitions": {
+    "schemaArray": {
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "$ref": "#"
+      }
+    },
+    "nonNegativeInteger": {
+      "type": "integer",
+      "minimum": 0
+    },
+    "nonNegativeIntegerDefault0": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/nonNegativeInteger"
+        },
+        {
+          "default": 0
+        }
+      ]
+    },
+    "simpleTypes": {
+      "enum": [
+        "array",
+        "boolean",
+        "integer",
+        "null",
+        "number",
+        "object",
+        "string"
+      ]
+    },
+    "stringArray": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "uniqueItems": true,
+      "default": [
+
+      ]
+    }
+  },
+  "type": [
+    "object",
+    "boolean"
+  ],
+  "properties": {
+    "$id": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$schema": {
+      "type": "string",
+      "format": "uri"
+    },
+    "$ref": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$comment": {
+      "type": "string"
+    },
+    "title": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "default": true,
+    "readOnly": {
+      "type": "boolean",
+      "default": false
+    },
+    "writeOnly": {
+      "type": "boolean",
+      "default": false
+    },
+    "examples": {
+      "type": "array",
+      "items": true
+    },
+    "multipleOf": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "maximum": {
+      "type": "number"
+    },
+    "exclusiveMaximum": {
+      "type": "number"
+    },
+    "minimum": {
+      "type": "number"
+    },
+    "exclusiveMinimum": {
+      "type": "number"
+    },
+    "maxLength": {
+      "$ref": "#/definitions/nonNegativeInteger"
+    },
+    "minLength": {
+      "$ref": "#/definitions/nonNegativeIntegerDefault0"
+    },
+    "pattern": {
+      "type": "string",
+      "format": "regex"
+    },
+    "additionalItems": {
+      "$ref": "#"
+    },
+    "items": {
+      "anyOf": [
+        {
+          "$ref": "#"
+        },
+        {
+          "$ref": "#/definitions/schemaArray"
+        }
+      ],
+      "default": true
+    },
+    "maxItems": {
+      "$ref": "#/definitions/nonNegativeInteger"
+    },
+    "minItems": {
+      "$ref": "#/definitions/nonNegativeIntegerDefault0"
+    },
+    "uniqueItems": {
+      "type": "boolean",
+      "default": false
+    },
+    "contains": {
+      "$ref": "#"
+    },
+    "maxProperties": {
+      "$ref": "#/definitions/nonNegativeInteger"
+    },
+    "minProperties": {
+      "$ref": "#/definitions/nonNegativeIntegerDefault0"
+    },
+    "required": {
+      "$ref": "#/definitions/stringArray"
+    },
+    "additionalProperties": {
+      "$ref": "#"
+    },
+    "definitions": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#"
+      },
+      "default": {
+      }
+    },
+    "properties": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#"
+      },
+      "default": {
+      }
+    },
+    "patternProperties": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#"
+      },
+      "propertyNames": {
+        "format": "regex"
+      },
+      "default": {
+      }
+    },
+    "dependencies": {
+      "type": "object",
+      "additionalProperties": {
+        "anyOf": [
+          {
+            "$ref": "#"
+          },
+          {
+            "$ref": "#/definitions/stringArray"
+          }
+        ]
+      }
+    },
+    "propertyNames": {
+      "$ref": "#"
+    },
+    "const": true,
+    "enum": {
+      "type": "array",
+      "items": true,
+      "minItems": 1,
+      "uniqueItems": true
+    },
+    "type": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/simpleTypes"
+        },
+        {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/simpleTypes"
+          },
+          "minItems": 1,
+          "uniqueItems": true
+        }
+      ]
+    },
+    "format": {
+      "type": "string",
+      "enum": [
+        "date-time",
+        "date",
+        "time",
+        "email",
+        "idn-email",
+        "hostname",
+        "idn-hostname",
+        "ipv4",
+        "ipv6",
+        "uri",
+        "uri-reference",
+        "iri",
+        "iri-reference",
+        "json-pointer",
+        "relative-json-pointer",
+        "regex"
+      ]
+    },
+    "if": {
+      "$ref": "#"
+    },
+    "then": {
+      "$ref": "#"
+    },
+    "else": {
+      "$ref": "#"
+    },
+    "allOf": {
+      "$ref": "#/definitions/schemaArray"
+    },
+    "anyOf": {
+      "$ref": "#/definitions/schemaArray"
+    },
+    "oneOf": {
+      "$ref": "#/definitions/schemaArray"
+    },
+    "not": {
+      "$ref": "#"
+    },
+    "not_blank": {
+      "type": "boolean",
+      "default": false
+    },
+    "not_zero": {
+      "type": "boolean",
+      "default": false
+    }
+  },
+  "default": true
+}

data/lib/simple_json_schema.rb

@@ -28,16 +28,18 @@ require 'simple_json_schema/regex_helper'
 require 'simple_json_schema/ref_helper'
 require 'simple_json_schema/scope'
 require 'simple_json_schema/validator'
+require 'simple_json_schema/custom_draft7'
 
 module SimpleJSONSchema
   class UnsupportedMetaSchema < StandardError; end
 
+  DEFAULT_SCHEMA = 'https://gitlab.com/vliper/simple_json_schema/-/raw/master/draft-07-schema#'
   DRAFT_BY_SCHEMA = {
-    'http://json-schema.org/draft-07/schema#' => :draft7
+    DEFAULT_SCHEMA => :draft7,
+    'http://json-schema.org/draft-07/schema#' => :draft
   }.freeze
 
   NET_HTTP_REF_RESOLVER = proc { |uri| JSON.parse(Net::HTTP.get(uri)) }
-  DEFAULT_SCHEMA = 'http://json-schema.org/draft-07/schema#'
 
   class << self
     def valid?(data, schema, options = nil)
@@ -51,6 +53,8 @@ module SimpleJSONSchema
         options ||= schema.delete(:options)
       end
 
+      options = options.with_indifferent_access if options.is_a?(Hash)
+
       scope = Scope.new(data: data, schema: schema, draft: draft_class(schema), options: options)
       Validator.validate(scope)
       scope.errors

data/lib/simple_json_schema/checker.rb

@@ -9,12 +9,12 @@ module SimpleJSONSchema
     class << self
       def at_value(scope, check, operation)
         over = scope[check]
-        scope.error(check, fail_on: "#{operation} #{over}") if over && scope.value&.public_send(operation, over)
+        scope.error(check, count: over) if over && scope.value&.public_send(operation, over)
       end
 
       def at_size(scope, check, operation)
         over = scope[check]
-        scope.error(check, fail_on: "#{operation} #{over}") if over && scope.value&.size&.public_send(operation, over)
+        scope.error(check, count: over) if over && scope.value&.size&.public_send(operation, over)
       end
 
       def required_keys(scope)

data/lib/simple_json_schema/custom_draft7.rb

@@ -0,0 +1,207 @@
+# frozen_string_literal: true
+
+module SimpleJSONSchema
+  # Draft-7 whit custom settings.
+  CUSTOM_DRAFT7 = {
+    '$schema' => 'https://gitlab.com/vliper/simple_json_schema/-/raw/master/draft-07-schema#',
+    '$id' => 'https://gitlab.com/vliper/simple_json_schema/-/raw/master/draft-07-schema#',
+    'title' => 'Simple JSON Schema meta-schema',
+    'definitions' => {
+      'schemaArray' => {
+        'type' => 'array',
+        'minItems' => 1,
+        'items' => { '$ref' => '#' }
+      },
+      'nonNegativeInteger' => {
+        'type' => 'integer',
+        'minimum' => 0
+      },
+      'nonNegativeIntegerDefault0' => {
+        'allOf' => [
+          { '$ref' => '#/definitions/nonNegativeInteger' },
+          { 'default' => 0 }
+        ]
+      },
+      'simpleTypes' => {
+        'enum' => %w[
+          array
+          boolean
+          integer
+          null
+          number
+          object
+          string
+        ]
+      },
+      'stringArray' => {
+        'type' => 'array',
+        'items' => { 'type' => 'string' },
+        'uniqueItems' => true,
+        'default' => []
+      }
+    },
+    'type' => %w[object boolean],
+    'properties' => {
+      '$id' => {
+        'type' => 'string',
+        'format' => 'uri-reference'
+      },
+      '$schema' => {
+        'type' => 'string',
+        'format' => 'uri'
+      },
+      '$ref' => {
+        'type' => 'string',
+        'format' => 'uri-reference'
+      },
+      '$comment' => {
+        'type' => 'string'
+      },
+      'title' => {
+        'type' => 'string'
+      },
+      'description' => {
+        'type' => 'string'
+      },
+      'default' => true,
+      'readOnly' => {
+        'type' => 'boolean',
+        'default' => false
+      },
+      'writeOnly' => {
+        'type' => 'boolean',
+        'default' => false
+      },
+      'examples' => {
+        'type' => 'array',
+        'items' => true
+      },
+      'multipleOf' => {
+        'type' => 'number',
+        'exclusiveMinimum' => 0
+      },
+      'maximum' => {
+        'type' => 'number'
+      },
+      'exclusiveMaximum' => {
+        'type' => 'number'
+      },
+      'minimum' => {
+        'type' => 'number'
+      },
+      'exclusiveMinimum' => {
+        'type' => 'number'
+      },
+      'maxLength' => { '$ref' =>  '#/definitions/nonNegativeInteger' },
+      'minLength' => { '$ref' =>  '#/definitions/nonNegativeIntegerDefault0' },
+      'pattern' => {
+        'type' => 'string',
+        'format' => 'regex'
+      },
+      'additionalItems' => { '$ref' => '#' },
+      'items' => {
+        'anyOf' => [
+          { '$ref' => '#' },
+          { '$ref' => '#/definitions/schemaArray' }
+        ],
+        'default' => true
+      },
+      'maxItems' => { '$ref' =>  '#/definitions/nonNegativeInteger' },
+      'minItems' => { '$ref' =>  '#/definitions/nonNegativeIntegerDefault0' },
+      'uniqueItems' => {
+        'type' => 'boolean',
+        'default' => false
+      },
+      'contains' => { '$ref' => '#' },
+      'maxProperties' => { '$ref' =>  '#/definitions/nonNegativeInteger' },
+      'minProperties' => { '$ref' =>  '#/definitions/nonNegativeIntegerDefault0' },
+      'required' => { '$ref' => '#/definitions/stringArray' },
+      'additionalProperties' => { '$ref' => '#' },
+      'definitions' => {
+        'type' => 'object',
+        'additionalProperties' => { '$ref' => '#' },
+        'default' => {}
+      },
+      'properties' => {
+        'type' => 'object',
+        'additionalProperties' => { '$ref' => '#' },
+        'default' => {}
+      },
+      'patternProperties' => {
+        'type' => 'object',
+        'additionalProperties' => { '$ref' => '#' },
+        'propertyNames' => { 'format' => 'regex' },
+        'default' => {}
+      },
+      'dependencies' => {
+        'type' => 'object',
+        'additionalProperties' => {
+          'anyOf' => [
+            { '$ref' => '#' },
+            { '$ref' => '#/definitions/stringArray' }
+          ]
+        }
+      },
+      'propertyNames' => { '$ref' => '#' },
+      'const' => true,
+      'enum' => {
+        'type' => 'array',
+        'items' => true,
+        'minItems' => 1,
+        'uniqueItems' => true
+      },
+      'type' => {
+        'anyOf' => [
+          { '$ref' => '#/definitions/simpleTypes' },
+          {
+            'type' => 'array',
+            'items' => { '$ref' => '#/definitions/simpleTypes' },
+            'minItems' => 1,
+            'uniqueItems' => true
+          }
+        ]
+      },
+      'format' => {
+        'type' => 'string',
+        # uri-template, was removed from `enum` to not be supported
+        'enum' => %w[
+          date-time
+          date
+          time
+          email
+          idn-email
+          hostname
+          idn-hostname
+          ipv4
+          ipv6
+          uri
+          uri-reference
+          iri
+          iri-reference
+          json-pointer
+          relative-json-pointer
+          regex
+        ]
+      },
+      # 'contentMediaType' => { 'type' => 'string' }, # not supported
+      # 'contentEncoding' => { 'type' => 'string' }, # not supported
+      'if' => { '$ref' => '#' },
+      'then' => { '$ref' => '#' },
+      'else' => { '$ref' => '#' },
+      'allOf' => { '$ref' => '#/definitions/schemaArray' },
+      'anyOf' => { '$ref' => '#/definitions/schemaArray' },
+      'oneOf' => { '$ref' => '#/definitions/schemaArray' },
+      'not' => { '$ref' => '#' },
+      # Custom.
+      'not_blank' => {
+        'type' => 'boolean',
+        'default' => false
+      },
+      'not_zero' => {
+        'type' => 'boolean',
+        'default' => false
+      }
+    },
+    'default' => true
+  }.freeze
+end

data/lib/simple_json_schema/scope.rb

@@ -63,8 +63,8 @@ module SimpleJSONSchema
       errors.push(error)
     end
 
-    def only_cache
-      self.options = { cache: cache }
+    def no_hooks
+      self.options = options.except(:before_property_validation, :after_property_validation)
       self
     end
 

data/lib/simple_json_schema/validator.rb

@@ -27,7 +27,7 @@ module SimpleJSONSchema
       def validate?(scope)
         scope.errors = []
 
-        validate(scope.only_cache)
+        validate(scope.no_hooks)
         scope.errors.none?
       end
 
@@ -51,7 +51,7 @@ module SimpleJSONSchema
 
       def validate_all_of(scope)
         scope[:allOf]&.each_index do |index|
-          validate(scope.path_to(schema_path: [:allOf, index]).only_cache)
+          validate(scope.path_to(schema_path: [:allOf, index]).no_hooks)
         end
       end
 
@@ -60,7 +60,7 @@ module SimpleJSONSchema
         return if any_of.nil?
         return if any_of.each_index.any? { |index| validate?(scope.path_to(schema_path: [:anyOf, index])) }
 
-        any_of.each_index { |index| validate(scope.path_to(schema_path: [:anyOf, index]).only_cache) }
+        any_of.each_index { |index| validate(scope.path_to(schema_path: [:anyOf, index]).no_hooks) }
       end
 
       def validate_one_of(scope)
@@ -72,7 +72,7 @@ module SimpleJSONSchema
         if valid_count > 1
           scope.error(:oneOf)
         elsif valid_count.zero?
-          one_of.each_index { |index| validate(scope.path_to(schema_path: [:oneOf, index]).only_cache) }
+          one_of.each_index { |index| validate(scope.path_to(schema_path: [:oneOf, index]).no_hooks) }
         end
       end
 

data/lib/simple_json_schema/validators/integer.rb

@@ -9,7 +9,7 @@ module SimpleJSONSchema
         value = scope.value
 
         return scope.error(:integer) if !value.is_a?(::Numeric) || (!value.is_a?(::Integer) && value.floor != value)
-        return scope.error(:zero_not_allowed) if scope[:required] == true && value.zero?
+        return scope.error(:zero_not_allowed) if scope[:not_zero] == true && value.zero?
 
         super
       end

data/lib/simple_json_schema/validators/number.rb

@@ -9,7 +9,7 @@ module SimpleJSONSchema
         value = scope.value
 
         return scope.error(:number) unless value.is_a?(::Numeric)
-        return scope.error(:zero_not_allowed) if scope[:required] == true && value.zero?
+        return scope.error(:zero_not_allowed) if scope[:not_zero] == true && value.zero?
 
         super
       end

data/lib/simple_json_schema/validators/string.rb

@@ -9,7 +9,7 @@ module SimpleJSONSchema
         value = scope.value
 
         return scope.error(:string) unless value.is_a?(::String)
-        return scope.error(:blank) if scope[:required] == true && value.blank?
+        return scope.error(:blank) if scope[:not_blank] == true && value.blank?
 
         Checker.at_size(scope, :maxLength, :>)
         Checker.at_size(scope, :minLength, :<)

data/lib/simple_json_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleJSONSchema
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/update_draft7_schema

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'simple_json_schema'
+require 'json'
+
+json = JSON.pretty_generate(SimpleJSONSchema::CUSTOM_DRAFT7)
+File.write('draft-07-schema', json)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Georgeo Rocco
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -188,10 +188,12 @@ files:
 - bin/console
 - bin/setup
 - bin/simple_json_schema
+- draft-07-schema
 - lib/simple_json_schema.rb
 - lib/simple_json_schema/cache.rb
 - lib/simple_json_schema/checker.rb
 - lib/simple_json_schema/concerns/hash_acessor.rb
+- lib/simple_json_schema/custom_draft7.rb
 - lib/simple_json_schema/items_helper.rb
 - lib/simple_json_schema/properties_helper.rb
 - lib/simple_json_schema/ref_helper.rb
@@ -209,6 +211,7 @@ files:
 - lib/simple_json_schema/validators/string.rb
 - lib/simple_json_schema/version.rb
 - simple_json_schema.gemspec
+- update_draft7_schema
 homepage: https://gitlab.com/vliper/simple_json_schema
 licenses:
 - MIT