json-schema 2.2.4 → 2.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTFiZGMyMzcwNTE3MmZlNzliZjQ1MTZkOGY5NjcxMGM4NjhhNjZkYQ==
+    ZWEyNDAyZWRhMzlhYTFjZjdhNDA0NTFkOGE5NmY3OWVmN2JlYjFmOA==
   data.tar.gz: !binary |-
-    Yzc3NTEwMjg3MzdlOGJkOTJlNWVmMGQzYjFhMjRhNzZjZjY3NzI3Mg==
+    NDg2MjAzYWUxZjYzM2JlNTVkNTY0YTcyNjUwYjk4MDI3OWQyZjVmOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTk3ZjM3YWY4MTExOGI0OGFlOTdhNjc0Y2U1YjdiNzBhNzJiNzM4NjcyMjM4
-    NDcwOGM4ZWMxOTgyM2U0NjY4MGZjMmYyMmQ2MDAyZDg4NzdjY2RjZWE0YmY5
-    MjJlMjk0MGJlNmViM2VjOGU1NDAxNWYzZWVhMTNkOWIzOTdhZWY=
+    YmNjZDBkNjg0MTVmMmU0NDdkZmI0NjcyODgwNjZmMDIzMTBiMmJkYzUwZDYx
+    NGI3NTY5ZDFmNTI3NmIxMTQyOTVjODNjNWNjOWMyY2E1YmUyMzY5YjJhMmIz
+    MWUwNmJmOGE5YzMxOTNhMjU2ZjIwNjYzNGE1ODgzYzc4NWRkYWI=
   data.tar.gz: !binary |-
-    NGExNmQzMDMxZWVjODhiZWQxMzY1MTZkOWZkMjU0ZDczZGY0ZDA3MjMxYzE2
-    MDNiNDZkOTg5ZDE3ZmZlNTQxMjQwNTQ5ZmQ2ODUyOWEwNDg1YTFmNTUyMmFk
-    N2Y3NzE2NzE2YzA5Y2Y5MDg3N2I1NDBlNTM5YjJmMDcyNDNiMTI=
+    YzQ0NTQ1NmNiOWUwNDZjNzIzNTY0OGIzMzM3MzRkYzFhNzQxMTVkYjdmYjQ1
+    OGRmYjUzNjhjZjlmMjc3ZGUyODlhYzU0ZjcwMGQ2YjU1NDU0NmYxMGRiNGZj
+    M2E5ZWIwMmMwMDJkNzhlNDQ2YzI0NTJjMDg1YWVkOTBjMjgwNDQ=

data/README.textile

@@ -24,7 +24,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.2.4.gem
+$ gem install json-schema-2.2.5.gem
 </pre>
 
 
@@ -78,7 +78,7 @@ JSON::Validator.validate('user.json', data, :list => true)
 
 h3. Strictly validate an object's properties
 
-With the <code>:strict</code>code> option, validation fails when an object contains properties that are not defined in the schema's property list or doesn't match the <code>additionalProperties</code> property. Furthermore, all properties are treated as <code>required</code> by default.
+With the <code>:strict</code> option, validation fails when an object contains properties that are not defined in the schema's property list or doesn't match the <code>additionalProperties</code> property. Furthermore, all properties are treated as <code>required</code> by default.
 
 <pre>
 require 'rubygems'

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

@@ -107,7 +107,7 @@ module JSON
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a valid URI"
             begin
-              URI.parse(data)
+              URI.parse(URI.escape(data))
             rescue URI::InvalidURIError
               validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
             end

data/test/test_jsonschema_draft3.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/json-schema'
 
@@ -1092,6 +1093,7 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
   def test_format_uri
     data1 = {"a" => "http://gitbuh.com"}
     data2 = {"a" => "::boo"}
+    data3 = {"a" => "http://ja.wikipedia.org/wiki/メインページ"}
 
     schema = {
         "$schema" => "http://json-schema.org/draft-03/schema#",
@@ -1101,6 +1103,7 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
 
     assert(JSON::Validator.validate(schema,data1))
     assert(!JSON::Validator.validate(schema,data2))
+    assert(JSON::Validator.validate(schema,data3))
   end
 
 

data/test/test_jsonschema_draft4.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/json-schema'
 
@@ -1011,6 +1012,7 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
   def test_format_uri
     data1 = {"a" => "http://gitbuh.com"}
     data2 = {"a" => "::boo"}
+    data3 = {"a" => "http://ja.wikipedia.org/wiki/メインページ"}
 
     schema = {
         "$schema" => "http://json-schema.org/draft-04/schema#",
@@ -1020,6 +1022,7 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
 
     assert(JSON::Validator.validate(schema,data1))
     assert(!JSON::Validator.validate(schema,data2))
+    assert(JSON::Validator.validate(schema,data3))
   end
 
 

data/test/test_suite.rb

@@ -0,0 +1,71 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class SuiteTest < Test::Unit::TestCase
+  def test_draft_4
+  	print "\n\nDRAFT-04 SUITE TESTS\n"
+  	print     "--------------------\n"
+  	tests = 0
+  	passes = 0
+  	Dir.glob(File.dirname(__FILE__) + "/suite/tests/draft4/*.json").each do |file_path|
+  		data = JSON.parse(File.read(file_path))
+  		data.each do |test_desc|
+  			puts "Suite Test: #{test_desc["description"]}"
+  			test_desc["tests"].each do |test|
+  				tests = tests + 1
+  				print " - #{test["description"]}: "
+  				begin
+						if JSON::Validator.validate(test_desc["schema"], test["data"], :version => :draft4) == test["valid"]
+							puts green("pass")
+							passes = passes + 1
+			  		else
+			  			puts "#{red("fail")} - expected #{test["valid"]}, got #{JSON::Validator.validate(test_desc["schema"], test["data"], :version => :draft4)}"
+			  		end
+			  	rescue
+			  			puts "#{red("fail")} - exception thrown"
+			  	end
+	  		end
+  		end
+  	end
+  end
+
+  def test_draft_3
+  	print "\n\nDRAFT-03 SUITE TESTS\n"
+  	print     "--------------------\n"
+
+  	tests = 0
+  	passes = 0
+  	Dir.glob(File.dirname(__FILE__) + "/suite/tests/draft3/*.json").each do |file_path|
+  		data = JSON.parse(File.read(file_path))
+  		data.each do |test_desc|
+  			puts "Suite Test: #{test_desc["description"]}"
+  			test_desc["tests"].each do |test|
+  				tests = tests + 1
+  				print " - #{test["description"]}: "
+  				begin
+						if JSON::Validator.validate(test_desc["schema"], test["data"], :version => :draft3) == test["valid"]
+							puts green("pass")
+							passes = passes + 1
+			  		else
+			  			puts "#{red("fail")} - expected #{test["valid"]}, got #{JSON::Validator.validate(test_desc["schema"], test["data"], :version => :draft3)}"
+			  		end
+			  	rescue
+			  			puts "#{red("fail")} - exception thrown"
+			  	end
+	  		end
+  		end
+  	end
+  end
+
+  def colorize(color_code,text)
+    "\e[#{color_code}m#{text}\e[0m"
+  end
+
+  def red(text)
+    colorize(31,text)
+  end
+
+  def green(text)
+    colorize(32,text)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -88,6 +88,7 @@ files:
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/test_suite.rb
 - test/data/all_of_ref_data.json
 - test/data/any_of_ref_data.json
 - test/data/bad_data_1.json
@@ -153,6 +154,7 @@ test_files:
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/test_suite.rb
 - test/data/all_of_ref_data.json
 - test/data/any_of_ref_data.json
 - test/data/bad_data_1.json