Merge pull request #130 from iainbeeston/refactor_slightly

Refactor classes and validator accessor methods

lib/json-schema/attribute.rb

@@ -0,0 +1,27 @@
+require 'json-schema/errors/validation_error'
+
+module JSON
+  class Schema
+    class Attribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      end
+
+      def self.build_fragment(fragments)
+        "#/#{fragments.join('/')}"
+      end
+
+      def self.validation_error(processor, message, fragments, current_schema, failed_attribute, record_errors)
+        error = ValidationError.new(message, fragments, failed_attribute, current_schema)
+        if record_errors
+          processor.validation_error(error)
+        else
+          raise error
+        end
+      end
+
+      def self.validation_errors(validator)
+        validator.validation_errors
+      end
+    end
+  end
+end

lib/json-schema/attributes/additionalitems.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class AdditionalItemsAttribute < Attribute
@@ -20,4 +22,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/additionalproperties.rb

@@ -1,3 +1,4 @@
+require 'json-schema/attribute'
 require 'json-schema/attributes/extends'
 
 module JSON

lib/json-schema/attributes/allof.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class AllOfAttribute < Attribute

lib/json-schema/attributes/anyof.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class AnyOfAttribute < Attribute
@@ -38,4 +40,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/dependencies.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class DependenciesAttribute < Attribute
@@ -27,4 +29,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/dependencies_v4.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class DependenciesV4Attribute < Attribute
@@ -17,4 +19,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/disallow.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class DisallowAttribute < Attribute
@@ -8,4 +10,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/divisibleby.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class DivisibleByAttribute < Attribute
@@ -13,4 +15,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/enum.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class EnumAttribute < Attribute
@@ -21,4 +23,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/extends.rb

@@ -1,3 +1,4 @@
+require 'json-schema/attribute'
 require 'json-schema/attributes/ref'
 
 module JSON

lib/json-schema/attributes/format.rb

@@ -1,3 +1,4 @@
+require 'json-schema/attribute'
 require 'uri'
 
 module JSON

lib/json-schema/attributes/items.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class ItemsAttribute < Attribute
@@ -22,4 +24,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/maxdecimal.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxDecimalAttribute < Attribute
@@ -12,4 +14,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/maximum.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaximumAttribute < Attribute
@@ -12,4 +14,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/maximum_inclusive.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaximumInclusiveAttribute < Attribute

lib/json-schema/attributes/maxitems.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxItemsAttribute < Attribute

lib/json-schema/attributes/maxlength.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxLengthAttribute < Attribute
@@ -11,4 +13,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/maxproperties.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxPropertiesAttribute < Attribute
@@ -9,4 +11,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/minimum.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinimumAttribute < Attribute
@@ -12,4 +14,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/minimum_inclusive.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinimumInclusiveAttribute < Attribute
@@ -12,4 +14,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/minitems.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinItemsAttribute < Attribute
@@ -9,4 +11,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/minlength.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinLengthAttribute < Attribute
@@ -11,4 +13,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/minproperties.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinPropertiesAttribute < Attribute
@@ -9,4 +11,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/multipleof.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MultipleOfAttribute < Attribute
@@ -13,4 +15,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/not.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class NotAttribute < Attribute
@@ -25,4 +27,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/oneof.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class OneOfAttribute < Attribute

lib/json-schema/attributes/pattern.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PatternAttribute < Attribute
@@ -12,4 +14,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/patternproperties.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PatternPropertiesAttribute < Attribute
@@ -20,4 +22,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/properties.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PropertiesAttribute < Attribute

lib/json-schema/attributes/properties_optional.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PropertiesOptionalAttribute < Attribute
@@ -20,4 +22,4 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       end
     end
   end
-end
+end

lib/json-schema/attributes/properties_v4.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PropertiesV4Attribute < Attribute

lib/json-schema/attributes/ref.rb

@@ -1,3 +1,6 @@
+require 'json-schema/attribute'
+require 'json-schema/errors/schema_error'
+
 module JSON
   class Schema
     class RefAttribute < Attribute

lib/json-schema/attributes/required.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class RequiredAttribute < Attribute

lib/json-schema/attributes/type.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class TypeAttribute < Attribute

lib/json-schema/attributes/type_v4.rb

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class TypeV4Attribute < Attribute
@@ -51,4 +53,4 @@ def self.data_valid_for_type?(data, type)
       end
     end
   end
-end
+end