json-schema 2.1.7 → 2.1.8

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.1.7.gem
+$ gem install json-schema-2.1.8.gem
 </pre>
 
 

data/lib/json-schema/attributes/format.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module JSON
   class Schema
     class FormatAttribute < Attribute
@@ -8,7 +10,6 @@ module JSON
         when 'date-time'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a date/time in the ISO-8601 format of YYYY-MM-DDThh:mm:ssZ or YYYY-MM-DDThh:mm:ss.ssZ"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^\d\d\d\d-\d\d-\d\dT(\d\d):(\d\d):(\d\d)([\.,]\d+)?(Z|[+-](\d\d)(:?\d\d)?)?$')
             if (m = r.match(data))
               parts = data.split("T")
@@ -31,12 +32,10 @@ module JSON
               return
             end
           end
-
         # Date in the format of YYYY-MM-DD
         when 'date'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a date in the format of YYYY-MM-DD"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^\d\d\d\d-\d\d-\d\d$')
             if (m = r.match(data))
               begin
@@ -55,7 +54,6 @@ module JSON
         when 'time'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a time in the format of hh:mm:ss"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^(\d\d):(\d\d):(\d\d)$')
             if (m = r.match(data))
               validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[1].to_i > 23
@@ -71,7 +69,6 @@ module JSON
         when 'ip-address', 'ipv4'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv4 address"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^(\d+){1,3}\.(\d+){1,3}\.(\d+){1,3}\.(\d+){1,3}$')
             if (m = r.match(data))
               1.upto(4) do |x|
@@ -87,7 +84,6 @@ module JSON
         when 'ipv6'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv6 address"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^[a-f0-9:]+$')
             if (m = r.match(data))
               # All characters are valid, now validate structure
@@ -106,8 +102,22 @@ module JSON
               return
             end
           end
+
+        when 'uri'
+          if data.is_a?(String)
+            error_message = "The property '#{build_fragment(fragments)}' must be a valid URI"
+            begin
+              URI.parse(data)
+            rescue URI::InvalidURIError
+              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
+            end
+          end
+
+        when 'hostname'
+
+        when 'email'
         end
       end
     end
   end
-end
+end

data/test/test_jsonschema_draft3.rb

@@ -1006,8 +1006,22 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
       "type" => "object",
       "properties" => { "a" => {"type" => ["string","null"], "format" => "ip-address"}}
     }
-    assert(!JSON::Validator.validate(schema,data1,:version => :draft3))
-    assert(JSON::Validator.validate(schema,data2,:version => :draft3))
+    assert(!JSON::Validator.validate(schema,data1))
+    assert(JSON::Validator.validate(schema,data2))
+  end
+
+  def test_format_uri
+    data1 = {"a" => "http://gitbuh.com"}
+    data2 = {"a" => "::boo"}
+
+    schema = {
+        "$schema" => "http://json-schema.org/draft-03/schema#",
+        "type" => "object",
+        "properties" => { "a" => {"type" => "string", "format" => "uri"}}
+    }
+
+    assert(JSON::Validator.validate(schema,data1))
+    assert(!JSON::Validator.validate(schema,data2))
   end
 
 

data/test/test_jsonschema_draft4.rb

@@ -930,6 +930,20 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data))
   end
 
+  def test_format_uri
+    data1 = {"a" => "http://gitbuh.com"}
+    data2 = {"a" => "::boo"}
+
+    schema = {
+        "$schema" => "http://json-schema.org/draft-04/schema#",
+        "type" => "object",
+        "properties" => { "a" => {"type" => "string", "format" => "uri"}}
+    }
+
+    assert(JSON::Validator.validate(schema,data1))
+    assert(!JSON::Validator.validate(schema,data2))
+  end
+
 
   def test_format_union
     data1 = {"a" => "boo"}
@@ -940,8 +954,8 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
       "type" => "object",
       "properties" => { "a" => {"type" => ["string","null"], "format" => "ip-address"}}
     }
-    assert(!JSON::Validator.validate(schema,data1,:version => :draft3))
-    assert(JSON::Validator.validate(schema,data2,:version => :draft3))
+    assert(!JSON::Validator.validate(schema,data1))
+    assert(JSON::Validator.validate(schema,data2))
   end
 
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
+  prerelease: 
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -112,26 +113,27 @@ files:
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files:
 - test/test_all_of_ref_schema.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDk3NjY1MWJhZWMwMDk0MGFjMWZlNzNmNzNmYzE5MWM4Y2I4MWYyNg==
-  data.tar.gz: !binary |-
-    YTUyMTAyNTdiZmE3YWI0YzM0Y2ZmYmQ5YTZjMTdiYjYzZWNjMWEzNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDNjOTI5ZWNlYmVlYWI4MTQ0ZTdhOWFlMjlmODZmZmZhMGI4NTZjNTkwMjg3
-    NGQ0MjQ4NWMyYjdiNzc0ZmZiZGQ1MDQzMjQzNDMwNmZiZDk2ZTQwZTY0NDdi
-    NGM1ODA4NTEzNjE1N2JlNWQyMTdlODA2ZjdkMGZlOGExZjA3NmE=
-  data.tar.gz: !binary |-
-    NDVkY2E4MWM0NGZlYjgyNTEwOGM0ZDIzNDIzYWNmMzMzZTMxMDhhMGQ4NDk0
-    MzI3ZWY1NjJlNzIxNDc3N2IyZWJlMWYyYTkwODA5YjAwMmM5NGYyYTUwOGE4
-    ZDA0ZDhhMTZmODU1YmRmODBkNWNlZjhmYTQyYjI5YzRlM2Y1NTM=