jsi 0.6.0 → 0.8.0

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)
@@ -19,8 +19,8 @@ module JSI
               if value.key?(property_name)
                 evaluated_property_names << property_name
                 results[property_name] = result_builder.child_subschema_validate(
+                  property_name,
                   ['properties', property_name],
-                  [property_name],
                 )
               end
             end
@@ -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
@@ -54,8 +54,8 @@ module JSI
                   if value_property_pattern.respond_to?(:to_str) && Regexp.new(value_property_pattern).match(property_name.to_s)
                     evaluated_property_names << property_name
                     results[property_name] = result_builder.child_subschema_validate(
+                      property_name,
                       ['patternProperties', value_property_pattern],
-                      [property_name],
                     )
                   end
                 rescue ::RegexpError
@@ -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)
@@ -83,11 +83,11 @@ module JSI
           result_builder.instance.keys.each do |property_name|
             if !evaluated_property_names.include?(property_name)
               results[property_name] = result_builder.child_subschema_validate(
+                property_name,
                 ['additionalProperties'],
-                [property_name],
               )
             end
-          end.compact
+          end
           result_builder.validate(
             results.values.all?(&:valid?),
             'instance object additional properties are not all valid against `additionalProperties` schema value',

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,11 +6,11 @@ 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)
-          schema_ref = jsi_memoize(:ref) { Schema::Ref.new(value, self) }
+          schema_ref = self.schema_ref('$ref')
 
           if result_builder.visited_refs.include?(schema_ref)
             result_builder.schema_error('self-referential schema structure', '$ref')

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

@@ -2,8 +2,6 @@
 
 module JSI
   module Schema::Validation
-    autoload :Core, 'jsi/schema/validation/core'
-
     autoload :Draft04, 'jsi/schema/validation/draft04'
     autoload :Draft06, 'jsi/schema/validation/draft06'
     autoload :Draft07, 'jsi/schema/validation/draft07'
@@ -15,7 +13,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 +27,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'