json_schema 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4699ec08cb42382077750ca85baa91aa4f60732e
-  data.tar.gz: 8574657b774444006927dc7df56fdae92f13b2f9
+  metadata.gz: 1fd4983a9632b29cb79ed96ceba036d590e74719
+  data.tar.gz: 5a819846b5ef11f8be6a5e5e330be6e0de2bc5d9
 SHA512:
-  metadata.gz: 6754b7820652d126bf225614bf740ad017a31b3ecf73f62262df3f1763eb8186bda0c5273bf0941dc82887d695fac47d3bc332a130103c4b9c2e94af918c35d5
-  data.tar.gz: e36ea2ce6d723b7f244e4a18565ce3b5159203ea4ecb0ba2e24d6bdbc0ff04953cf7130e25345a455527fcccb213a04f0b69a9d7d976a453f8d94f2152e45c49
+  metadata.gz: f61c5a056f07c791252e663b82973468b11b72a6dc9b7e2998c236c0bf3babe49865e8c4a081c29d9a6e79082c12c3c4e62dda67ebed2c4c5c494a95e31b2361
+  data.tar.gz: 742206a63613cc097969f0a3ef429c7c3d5cdc22305e0115e8bb9ff1d90062a5ba605474361184eea2edf058bdb1ae65997cda3a5425b42781bafaca9fd14558

data/lib/json_schema/parser.rb

@@ -4,6 +4,7 @@ module JsonSchema
   class Parser
     ALLOWED_TYPES = %w{any array boolean integer number null object string}
     BOOLEAN = [FalseClass, TrueClass]
+    FORMATS = %w{date date-time email hostname ipv4 ipv6 regex uri uuid}
     FRIENDLY_TYPES = {
       Array      => "array",
       FalseClass => "boolean",
@@ -287,6 +288,7 @@ module JsonSchema
       schema.min_length = validate_type(schema, [Integer], "minLength")
       schema.pattern    = validate_type(schema, [String], "pattern")
       schema.pattern    = Regexp.new(schema.pattern) if schema.pattern
+      validate_format(schema, schema.format) if schema.format
 
       # hyperschema
       schema.links      = validate_type(schema, [Array], "links")
@@ -331,5 +333,12 @@ module JsonSchema
         value
       end
     end
+
+    def validate_format(schema, format)
+      return if FORMATS.include?(format)
+
+      message = %{#{format.inspect} is not a valid format, must be one of #{FORMATS.join(', ')}.}
+      @errors << SchemaError.new(schema, message, :unknown_format)
+    end
   end
 end

data/lib/json_schema/validator.rb

@@ -177,6 +177,8 @@ module JsonSchema
     def validate_format(schema, data, errors, path)
       return true unless schema.format
       valid = case schema.format
+      when "date"
+        data =~ DATE_PATTERN
       when "date-time"
         data =~ DATE_TIME_PATTERN
       when "email"
@@ -510,6 +512,8 @@ module JsonSchema
 
     HOSTNAME_PATTERN = /^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/
 
+    DATE_PATTERN = /^[0-9]{4}-[0-9]{2}-[0-9]{2}$/
+
     DATE_TIME_PATTERN = /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-2][0-9]:[0-5][0-9]:[0-5][0-9](\.[0-9]+)?(Z|[\-+][0-9]{2}:[0-5][0-9])$/
 
     # from: http://stackoverflow.com/a/17871737

data/test/json_schema/parser_test.rb

@@ -257,6 +257,15 @@ describe JsonSchema::Parser do
     assert_includes error_types, :unknown_type
   end
 
+  it "errors on unknown formats" do
+    schema_sample["format"] = "obscure-thing"
+    refute parse
+    assert_includes error_messages, '"obscure-thing" is not a valid format, ' \
+                                    'must be one of date, date-time, email, ' \
+                                    'hostname, ipv4, ipv6, regex, uri, uuid.'
+    assert_includes error_types, :unknown_format
+  end
+
   def error_messages
     @parser.errors.map { |e| e.message }
   end

data/test/json_schema/validator_test.rb

@@ -506,6 +506,22 @@ describe JsonSchema::Validator do
     assert_includes error_types, :not_failed
   end
 
+  it "validates date format successfully" do
+    pointer("#/definitions/app/definitions/owner").merge!(
+      "format" => "date"
+    )
+    data_sample["owner"] = "2014-05-13"
+    assert validate
+  end
+
+  it "validates date format unsuccessfully" do
+    pointer("#/definitions/app/definitions/owner").merge!(
+      "format" => "date"
+    )
+    data_sample["owner"] = "13/05/2014"
+    refute validate
+  end
+
   it "validates date-time format successfully" do
     pointer("#/definitions/app/definitions/owner").merge!(
       "format" => "date-time"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest