jsi 0.6.0 → 0.7.0

data/lib/jsi/schema/validation/const.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Const
     # @private
     def internal_validate_const(result_builder)
-      if schema_content.key?('const')
+      if keyword?('const')
         value = schema_content['const']
         # The value of this keyword MAY be of any type, including null.
         # An instance validates successfully against this keyword if its value is equal to the value of

data/lib/jsi/schema/validation/contains.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Contains
     # @private
     def internal_validate_contains(result_builder)
-      if schema_content.key?('contains')
+      if keyword?('contains')
         # An array instance is valid against "contains" if at least one of its elements is valid against
         # the given schema.
         if result_builder.instance.respond_to?(:to_ary)

data/lib/jsi/schema/validation/dependencies.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Dependencies
     # @private
     def internal_validate_dependencies(result_builder)
-      if schema_content.key?('dependencies')
+      if keyword?('dependencies')
         value = schema_content['dependencies']
         # This keyword's value MUST be an object. Each property specifies a dependency.  Each dependency
         # value MUST be an array or a valid JSON Schema.

data/lib/jsi/schema/validation/draft04/minmax.rb

@@ -4,18 +4,18 @@ module JSI
   module Schema::Validation::Draft04::MinMax
     # @private
     def internal_validate_maximum(result_builder)
-      if schema_content.key?('exclusiveMaximum')
+      if keyword?('exclusiveMaximum')
         value = schema_content['exclusiveMaximum']
         # The value of "exclusiveMaximum" MUST be a boolean.
         unless [true, false].include?(value)
           result_builder.schema_error('`exclusiveMaximum` is not true or false', 'exclusiveMaximum')
         end
-        if !schema_content.key?('maximum')
+        if !keyword?('maximum')
           result_builder.schema_error('`exclusiveMaximum` has no effect without adjacent `maximum` keyword', 'exclusiveMaximum')
         end
       end
 
-      if schema_content.key?('maximum')
+      if keyword?('maximum')
         value = schema_content['maximum']
         # The value of "maximum" MUST be a JSON number.
         if value.is_a?(Numeric)
@@ -47,18 +47,18 @@ module JSI
 
     # @private
     def internal_validate_minimum(result_builder)
-      if schema_content.key?('exclusiveMinimum')
+      if keyword?('exclusiveMinimum')
         value = schema_content['exclusiveMinimum']
         # The value of "exclusiveMinimum" MUST be a boolean.
         unless [true, false].include?(value)
           result_builder.schema_error('`exclusiveMinimum` is not true or false', 'exclusiveMinimum')
         end
-        if !schema_content.key?('minimum')
+        if !keyword?('minimum')
           result_builder.schema_error('`exclusiveMinimum` has no effect without adjacent `minimum` keyword', 'exclusiveMinimum')
         end
       end
 
-      if schema_content.key?('minimum')
+      if keyword?('minimum')
         value = schema_content['minimum']
         # The value of "minimum" MUST be a JSON number.
         if value.is_a?(Numeric)

data/lib/jsi/schema/validation/enum.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Enum
     # @private
     def internal_validate_enum(result_builder)
-      if schema_content.key?('enum')
+      if keyword?('enum')
         value = schema_content['enum']
         # The value of this keyword MUST be an array. This array SHOULD have at least one element.
         # Elements in the array SHOULD be unique.

data/lib/jsi/schema/validation/ifthenelse.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::IfThenElse
     # @private
     def internal_validate_ifthenelse(result_builder)
-      if schema_content.key?('if')
+      if keyword?('if')
         # This keyword's value MUST be a valid JSON Schema.
         # This validation outcome of this keyword's subschema has no direct effect on the overall validation
         # result. Rather, it controls which of the "then" or "else" keywords are evaluated.
@@ -13,7 +13,7 @@ module JSI
         result_builder.merge_schema_issues(if_result)
 
         if if_result.valid?
-          if schema_content.key?('then')
+          if keyword?('then')
             then_result = result_builder.inplace_subschema_validate(['then'])
             result_builder.validate(
               then_result.valid?,
@@ -23,7 +23,7 @@ module JSI
             )
           end
         else
-          if schema_content.key?('else')
+          if keyword?('else')
             else_result = result_builder.inplace_subschema_validate(['else'])
             result_builder.validate(
               else_result.valid?,
@@ -34,10 +34,10 @@ module JSI
           end
         end
       else
-        if schema_content.key?('then')
+        if keyword?('then')
           result_builder.schema_warning('`then` has no effect without adjacent `if` keyword', 'then')
         end
-        if schema_content.key?('else')
+        if keyword?('else')
           result_builder.schema_warning('`else` has no effect without adjacent `if` keyword', 'else')
         end
       end

data/lib/jsi/schema/validation/items.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Items
     # @private
     def internal_validate_items(result_builder)
-      if schema_content.key?('items')
+      if keyword?('items')
         value = schema_content['items']
         # The value of "items" MUST be either a valid JSON Schema or an array of valid JSON Schemas.
         if value.respond_to?(:to_ary)
@@ -15,7 +15,7 @@ module JSI
             result_builder.instance.each_index do |i|
               if i < value.size
                 results[i] = result_builder.child_subschema_validate(['items', i], [i])
-              elsif schema_content.key?('additionalItems')
+              elsif keyword?('additionalItems')
                 results[i] = result_builder.child_subschema_validate(['additionalItems'], [i])
               end
             end
@@ -40,12 +40,12 @@ module JSI
               results: results,
             )
           end
-          if schema_content.key?('additionalItems')
+          if keyword?('additionalItems')
             result_builder.schema_warning('`additionalItems` has no effect when adjacent `items` keyword is not an array', 'items')
           end
         end
       else
-        if schema_content.key?('additionalItems')
+        if keyword?('additionalItems')
           result_builder.schema_warning('`additionalItems` has no effect without adjacent `items` keyword', 'items')
         end
       end

data/lib/jsi/schema/validation/not.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Not
     # @private
     def internal_validate_not(result_builder)
-      if schema_content.key?('not')
+      if keyword?('not')
         # This keyword's value MUST be a valid JSON Schema.
         # An instance is valid against this keyword if it fails to validate successfully against the schema
         # defined by this keyword.

data/lib/jsi/schema/validation/numeric.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::MultipleOf
     # @private
     def internal_validate_multipleOf(result_builder)
-      if schema_content.key?('multipleOf')
+      if keyword?('multipleOf')
         value = schema_content['multipleOf']
         # The value of "multipleOf" MUST be a number, strictly greater than 0.
         if value.is_a?(Numeric) && value > 0
@@ -36,7 +36,7 @@ module JSI
   module Schema::Validation::MinMax
     # @private
     def internal_validate_maximum(result_builder)
-      if schema_content.key?('maximum')
+      if keyword?('maximum')
         value = schema_content['maximum']
         # The value of "maximum" MUST be a number, representing an inclusive upper limit for a numeric instance.
         if value.is_a?(Numeric)
@@ -57,7 +57,7 @@ module JSI
 
     # @private
     def internal_validate_exclusiveMaximum(result_builder)
-      if schema_content.key?('exclusiveMaximum')
+      if keyword?('exclusiveMaximum')
         value = schema_content['exclusiveMaximum']
         # The value of "exclusiveMaximum" MUST be number, representing an exclusive upper limit for a numeric instance.
         if value.is_a?(Numeric)
@@ -78,7 +78,7 @@ module JSI
 
     # @private
     def internal_validate_minimum(result_builder)
-      if schema_content.key?('minimum')
+      if keyword?('minimum')
         value = schema_content['minimum']
         # The value of "minimum" MUST be a number, representing an inclusive lower limit for a numeric instance.
         if value.is_a?(Numeric)
@@ -99,7 +99,7 @@ module JSI
 
     # @private
     def internal_validate_exclusiveMinimum(result_builder)
-      if schema_content.key?('exclusiveMinimum')
+      if keyword?('exclusiveMinimum')
         value = schema_content['exclusiveMinimum']
         # The value of "exclusiveMinimum" MUST be number, representing an exclusive lower limit for a numeric instance.
         if value.is_a?(Numeric)

data/lib/jsi/schema/validation/object.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::MinMaxProperties
     # @private
     def internal_validate_maxProperties(result_builder)
-      if schema_content.key?('maxProperties')
+      if keyword?('maxProperties')
         value = schema_content['maxProperties']
         # The value of this keyword MUST be a non-negative integer.
         if internal_integer?(value) && value >= 0
@@ -24,7 +24,7 @@ module JSI
 
     # @private
     def internal_validate_minProperties(result_builder)
-      if schema_content.key?('minProperties')
+      if keyword?('minProperties')
         value = schema_content['minProperties']
         # The value of this keyword MUST be a non-negative integer.
         if internal_integer?(value) && value >= 0

data/lib/jsi/schema/validation/pattern.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Pattern
     # @private
     def internal_validate_pattern(result_builder)
-      if schema_content.key?('pattern')
+      if keyword?('pattern')
         value = schema_content['pattern']
         # The value of this keyword MUST be a string.
         if value.respond_to?(:to_str)

data/lib/jsi/schema/validation/properties.rb

@@ -6,7 +6,7 @@ module JSI
     def internal_validate_properties(result_builder)
       evaluated_property_names = Set[]
 
-      if schema_content.key?('properties')
+      if keyword?('properties')
         value = schema_content['properties']
         # The value of "properties" MUST be an object. Each value of this object MUST be a valid JSON Schema.
         if value.respond_to?(:to_hash)
@@ -36,7 +36,7 @@ module JSI
         end
       end
 
-      if schema_content.key?('patternProperties')
+      if keyword?('patternProperties')
         value = schema_content['patternProperties']
         # The value of "patternProperties" MUST be an object. Each property name of this object SHOULD be a
         # valid regular expression, according to the ECMA 262 regular expression dialect. Each property value
@@ -75,7 +75,7 @@ module JSI
         end
       end
 
-      if schema_content.key?('additionalProperties')
+      if keyword?('additionalProperties')
         value = schema_content['additionalProperties']
         # The value of "additionalProperties" MUST be a valid JSON Schema.
         if result_builder.instance.respond_to?(:to_hash)

data/lib/jsi/schema/validation/property_names.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::PropertyNames
     # @private
     def internal_validate_propertyNames(result_builder)
-      if schema_content.key?('propertyNames')
+      if keyword?('propertyNames')
         # The value of "propertyNames" MUST be a valid JSON Schema.
         #
         # If the instance is an object, this keyword validates if every property name in the instance

data/lib/jsi/schema/validation/ref.rb

@@ -6,7 +6,7 @@ module JSI
     # @param throw_result [Boolean] if a $ref is present, whether to throw the result being built after
     #   validating the $ref, bypassing subsequent keyword validation
     def internal_validate_ref(result_builder, throw_result: false)
-      if schema_content.key?('$ref')
+      if keyword?('$ref')
         value = schema_content['$ref']
 
         if value.respond_to?(:to_str)

data/lib/jsi/schema/validation/required.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Required
     # @private
     def internal_validate_required(result_builder)
-      if schema_content.key?('required')
+      if keyword?('required')
         value = schema_content['required']
         # The value of this keyword MUST be an array. Elements of this array, if any, MUST be strings, and MUST be unique.
         if value.respond_to?(:to_ary)

data/lib/jsi/schema/validation/someof.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::AllOf
     # @private
     def internal_validate_allOf(result_builder)
-      if schema_content.key?('allOf')
+      if keyword?('allOf')
         value = schema_content['allOf']
         # This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema.
         if value.respond_to?(:to_ary)
@@ -29,7 +29,7 @@ module JSI
   module Schema::Validation::AnyOf
     # @private
     def internal_validate_anyOf(result_builder)
-      if schema_content.key?('anyOf')
+      if keyword?('anyOf')
         value = schema_content['anyOf']
         # This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema.
         if value.respond_to?(:to_ary)
@@ -56,7 +56,7 @@ module JSI
   module Schema::Validation::OneOf
     # @private
     def internal_validate_oneOf(result_builder)
-      if schema_content.key?('oneOf')
+      if keyword?('oneOf')
         value = schema_content['oneOf']
         # This keyword's value MUST be a non-empty array. Each item of the array MUST be a valid JSON Schema.
         if value.respond_to?(:to_ary)

data/lib/jsi/schema/validation/string.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::StringLength
     # @private
     def internal_validate_maxLength(result_builder)
-      if schema_content.key?('maxLength')
+      if keyword?('maxLength')
         value = schema_content['maxLength']
         # The value of this keyword MUST be a non-negative integer.
         if internal_integer?(value) && value >= 0
@@ -25,7 +25,7 @@ module JSI
 
     # @private
     def internal_validate_minLength(result_builder)
-      if schema_content.key?('minLength')
+      if keyword?('minLength')
         value = schema_content['minLength']
         # The value of this keyword MUST be a non-negative integer.
         if internal_integer?(value) && value >= 0

data/lib/jsi/schema/validation/type.rb

@@ -4,7 +4,7 @@ module JSI
   module Schema::Validation::Type
     # @private
     def internal_validate_type(result_builder)
-      if schema_content.key?('type')
+      if keyword?('type')
         value = schema_content['type']
         instance = result_builder.instance
         # The value of this keyword MUST be either a string or an array. If it is an array, elements of

data/lib/jsi/schema/validation.rb

@@ -15,7 +15,6 @@ module JSI
     autoload :AllOf, 'jsi/schema/validation/someof'
     autoload :AnyOf, 'jsi/schema/validation/someof'
     autoload :OneOf, 'jsi/schema/validation/someof'
-    autoload :Not,  'jsi/schema/validation/not'
     autoload :IfThenElse, 'jsi/schema/validation/ifthenelse'
 
     # child subschema application
@@ -30,6 +29,7 @@ module JSI
     autoload :Type, 'jsi/schema/validation/type'
     autoload :Enum, 'jsi/schema/validation/enum'
     autoload :Const, 'jsi/schema/validation/const'
+    autoload :Not,  'jsi/schema/validation/not'
 
     # object validation
     autoload :Required,    'jsi/schema/validation/required'