json-schema 2.1.8 → 2.1.9

data/README.textile

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

data/lib/json-schema/validator.rb

@@ -112,7 +112,8 @@ module JSON
       :validate_schema => false,
       :record_errors => false,
       :errors_as_objects => false,
-      :insert_defaults => false
+      :insert_defaults => false,
+      :clear_cache => true
     }
     @@validators = {}
     @@default_validator = nil
@@ -168,7 +169,8 @@ module JSON
           if @base_schema.schema["$schema"]
             version_string = @options[:version] = self.class.version_string_for(@base_schema.schema["$schema"])
           end
-          meta_validator = JSON::Validator.new(self.class.metaschema_for(version_string), @base_schema.schema)
+          # Don't clear the cache during metaschema validation!
+          meta_validator = JSON::Validator.new(self.class.metaschema_for(version_string), @base_schema.schema, {:clear_cache => false})
           meta_validator.validate
         rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
           raise $!
@@ -219,14 +221,18 @@ module JSON
     def validate()
       begin
         @base_schema.validate(@data,[],self,@validation_options)
-        Validator.clear_cache
+        if @validation_options[:clear_cache] == true
+          Validator.clear_cache
+        end
         if @options[:errors_as_objects]
           return @errors.map{|e| e.to_hash}
         else
           return @errors.map{|e| e.to_string}
         end
       rescue JSON::Schema::ValidationError
-        Validator.clear_cache
+        if @validation_options[:clear_cache] == true
+          Validator.clear_cache
+        end
         raise $!
       end
     end
@@ -254,17 +260,9 @@ module JSON
       end
 
       if Validator.schemas[uri.to_s].nil?
-        begin
-          schema = JSON::Schema.new(JSON::Validator.parse(open(uri.to_s).read), uri, @options[:version])
-          Validator.add_schema(schema)
-          build_schemas(schema)
-        rescue JSON::ParserError
-          # Don't rescue this error, we want JSON formatting issues to bubble up
-          raise $!
-        rescue Exception
-          # Failures will occur when this URI cannot be referenced yet. Don't worry about it,
-          # the proper error will fall out if the ref isn't ever defined
-        end
+        schema = JSON::Schema.new(JSON::Validator.parse(open(uri.to_s).read), uri, @options[:version])
+        Validator.add_schema(schema)
+        build_schemas(schema)
       end
     end
 
@@ -439,6 +437,7 @@ module JSON
       end
 
       def cache_schemas=(val)
+        warn "[DEPRECATION NOTICE] Schema caching is now a validation option. Schemas will still be cached if this is set to true, but this method will be removed in version >= 3. Please use the :clear_cache validation option instead."
         @@cache_schemas = val == true ? true : false
       end
 

data/test/test_bad_schema_ref.rb

@@ -0,0 +1,33 @@
+require 'test/unit'
+require 'socket'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class BadSchemaRefTest < Test::Unit::TestCase
+
+  def test_bad_uri_ref
+    schema = {
+        "$schema" => "http://json-schema.org/draft-04/schema#",
+        "type" => "array",
+        "items" => { "$ref" => "../google.json"}
+    }
+
+    data = [1,2,3]
+    assert_raise(URI::BadURIError) do
+      JSON::Validator.validate(schema,data)
+    end
+  end
+
+  def test_bad_host_ref
+    schema = {
+        "$schema" => "http://json-schema.org/draft-04/schema#",
+        "type" => "array",
+        "items" => { "$ref" => "http://ppcheesecheseunicornnuuuurrrrr.com/json.schema"}
+    }
+
+    data = [1,2,3]
+    assert_raise(SocketError) do
+      JSON::Validator.validate(schema,data)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -74,6 +74,7 @@ files:
 - LICENSE.md
 - test/test_all_of_ref_schema.rb
 - test/test_any_of_ref_schema.rb
+- test/test_bad_schema_ref.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb
@@ -138,6 +139,7 @@ summary: Ruby JSON Schema Validator
 test_files:
 - test/test_all_of_ref_schema.rb
 - test/test_any_of_ref_schema.rb
+- test/test_bad_schema_ref.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb