jschema 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4b107701aecdbf3da8a1f497e1ea5464005b5f
-  data.tar.gz: 7f37df5b104add21c85fb491925d932b4c708212
+  metadata.gz: 32ddf45ff9ed3c8f8922bd23962d932ec921d42c
+  data.tar.gz: ec0efce314be4969803f3cdec809099011af6495
 SHA512:
-  metadata.gz: 40ec990c33022c4983b23aaeb1e1859da7f8e260138a981c02b732dcdeb7fcb1a643acc0a4b7048c0e8e5b7716bf0b774e07471d43adccdc07600bfd2945912e
-  data.tar.gz: e0240a32c0769dee642d98f5fffbe599b94c316dab0c1ecba68e8dd4cbca6b71695c46e7328ab4ce8a76bcf6228418a6a213f5e0b56e546483526ca203404e91
+  metadata.gz: eee310162f1b3484ecd1541e80cfc40b3f837f6d2fc56d88bdb3d3446ce0cf4ed271685845e7357bae000b073a4192d8af9f89db0fb756ceb1f31141797ba4ce
+  data.tar.gz: 3cff14eacb201b794b15372d62abd997dcbba14659a7332e9c0a6d44e38aacd1a435856e24acd5cab2c504993f8cf6e12ed0862f06e26204d8e710c773f95515

data/lib/jschema/json_reference.rb

@@ -65,8 +65,8 @@ module JSchema
         schema_data = JSON.parse download_schema(uri)
         parent_schema = schema && schema.parent
         Schema.build(schema_data, parent_schema, uri.to_s)
-      rescue JSON::ParserError, Timeout::Error, Errno::ECONNREFUSED
-        raise InvalidSchema, "Failed to download external schema: #{uri}"
+      rescue JSON::ParserError, Timeout::Error, Errno::ECONNREFUSED, Net::HTTPBadResponse => e
+        raise InvalidSchema, "Failed to download external schema #{uri}. #{e.class}: #{e.message}"
       end
 
       def valid_external_uri?(uri)
@@ -74,24 +74,30 @@ module JSchema
       end
 
       def download_schema(uri)
-        request = Net::HTTP::Get.new(uri.to_s)
-        request['Accept'] = 'application/json+schema'
-
-        http = Net::HTTP.new(uri.hostname, uri.port)
-        http.read_timeout = 3
-        http.open_timeout = 2
-        http.continue_timeout = 1
-
-        http.request(request).body
+        3.times do
+          request = Net::HTTP::Get.new(uri.to_s)
+          request['Accept'] = 'application/json+schema'
+
+          http = Net::HTTP.new(uri.hostname, uri.port)
+          http.read_timeout = 3
+          http.open_timeout = 2
+          http.continue_timeout = 1
+          response = http.request(request)
+          if ["301", "302"].include?(response.code)
+            uri = URI.parse(response.header['location'])
+          else
+            return response.body
+          end
+        end
+        raise Net::HTTPBadResponse, "Too many redirects -- last location header was #{uri}"
       end
 
       def key(uri, schema)
         if schema
           root_schema = root(schema)
-          "#{root_schema.object_id}:#{uri}"
-        else
-          uri.to_s
+          return "#{root_schema.object_id}:#{uri}"
         end
+        uri.to_s
       end
 
       def root(schema)

data/lib/jschema/schema.rb

@@ -42,6 +42,13 @@ module JSchema
 
     attr_reader :uri, :parent
 
+    def initialize(schema, uri, parent)
+      @uri = uri
+      @parent = parent
+      @schema = schema
+      @validators = Validator.build(schema, self)
+    end
+
     def valid?(instance)
       validate(instance).empty?
     end
@@ -59,13 +66,5 @@ module JSchema
     def to_s
       uri.to_s
     end
-
-    private
-
-    def initialize(schema, uri, parent)
-      @uri = uri
-      @parent = parent
-      @validators = Validator.build(schema, self)
-    end
   end
 end

data/lib/jschema/simple_validator.rb

@@ -49,7 +49,7 @@ module JSchema
     end
 
     def integer?(value)
-      value.is_a?(Fixnum) || value.is_a?(Bignum)
+      value.is_a?(Integer)
     end
 
     def greater_or_equal_to?(value, limit)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jschema
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Konstantin Papkovskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies: []
 description: Implementation of JSON Schema Draft 4
 email: konstantin@papkovskiy.com
@@ -47,7 +47,7 @@ files:
 - lib/jschema/validator/required.rb
 - lib/jschema/validator/type.rb
 - lib/jschema/validator/unique_items.rb
-homepage: http://github.com/Soylent/jschema
+homepage: https://github.com/Soylent/jschema
 licenses:
 - MIT
 metadata: {}
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: JSON Schema implementation