jschema 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d590fc0ec0125af0eddda1de53da9dacae3531ed
-  data.tar.gz: fac78348f9d9bc7a044b109e1c0402a6b572cf78
+  metadata.gz: a5975d1ffb59b9a5adaaaa4155bfa277ee36c18d
+  data.tar.gz: b159e075f06114b2beebfdafd78e4e991600bd6b
 SHA512:
-  metadata.gz: 3622b6dca13c53afe5454d08fead0af4aebcb3103f86f6d75c9119f79131ea2f6a7704d8f85f9da111adaa3b8d27328383a0663082d844073aaa7497bc4aed10
-  data.tar.gz: 744703a630e62f1aae528778c01332709fb83ea8383f4fbfe0a6c8346d6d5346a24c47eac6e45130b5a0eec3245a5d153bcc0e14793964ba3d593c3fc7f68c30
+  metadata.gz: 5d363449dfdeba0d314bec5da9229c230d5d5b23d52552983218f92e9792c75cda7369fa201b80b5085d2273cf572955742b709d9d5f230bbbf7fe5312df6246
+  data.tar.gz: 063973f04bed0d87bd855d5111160817122c701f1465bb838bd0448881ad293aa4114df1b8d0e9767096ba175c8daf465617a6c48daac27310a9acad5d9c53cb

data/lib/jschema/json_reference.rb

@@ -65,7 +65,7 @@ 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
+      rescue JSON::ParserError, Timeout::Error, Errno::ECONNREFUSED
         raise InvalidSchema, "Failed to download external schema: #{uri}"
       end
 

data/lib/jschema/schema_uri.rb

@@ -1,3 +1,5 @@
+require 'webrick/httputils'
+
 module JSchema
   class SchemaURI
     class << self
@@ -29,8 +31,10 @@ module JSchema
 
       def uri(uri_string)
         # NOTE: We need to escape % because URI class does not allow such
-        # characters within URI fragment (which is wrong).
-        URI(URI.escape(uri_string, '%'))
+        # characters within URI fragment (which is wrong). Originally I used
+        # URI.escape(str, '%'), but this method has become obsolete.
+        escaped_uri = WEBrick::HTTPUtils._escape(uri_string, /([%])/)
+        URI(escaped_uri)
       end
     end
   end

data/lib/jschema/simple_validator.rb

@@ -6,7 +6,7 @@ module JSchema
         new(*args, parent) unless args.compact.empty?
       end
 
-      protected
+      private
 
       attr_accessor :keywords
     end
@@ -28,7 +28,7 @@ module JSchema
     end
 
     def validate(instance)
-      if !applicable_types || applicable_types.any? { |type| type === instance }
+      if !applicable_type || instance.is_a?(applicable_type)
         validate_instance(instance)
       end
     end
@@ -36,7 +36,7 @@ module JSchema
     private
 
     # Hook method
-    def applicable_types; end
+    def applicable_type; end
 
     def invalid_schema(keyword, value)
       fail InvalidSchema, "Invalid `#{keyword}` value: #{value.inspect}"

data/lib/jschema/string_length_validator.rb

@@ -6,8 +6,8 @@ module JSchema
       @length_limit = length_limit
     end
 
-    def applicable_types
-      [String]
+    def applicable_type
+      String
     end
 
     def valid_length_limit?(length_limit, min_length_limit)

data/lib/jschema/validator/dependencies.rb

@@ -55,8 +55,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Hash]
+      def applicable_type
+        Hash
       end
     end
   end

data/lib/jschema/validator/format.rb

@@ -1,4 +1,6 @@
+require 'date'
 require 'ipaddr'
+require 'webrick/httputils'
 
 module JSchema
   module Validator
@@ -28,8 +30,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [String]
+      def applicable_type
+        String
       end
 
       def date_time(instance)
@@ -66,7 +68,9 @@ module JSchema
       end
 
       def uri(instance)
-        URI.parse instance
+        # NOTE: Since URI.escape is obsolete I had to use
+        # WEBrick::HTTPUtils.escape
+        URI.parse WEBrick::HTTPUtils.escape(instance)
       rescue URI::InvalidURIError
         false
       end

data/lib/jschema/validator/items.rb

@@ -71,8 +71,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Array]
+      def applicable_type
+        Array
       end
     end
   end

data/lib/jschema/validator/max_items.rb

@@ -20,8 +20,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Array]
+      def applicable_type
+        Array
       end
     end
   end

data/lib/jschema/validator/max_properties.rb

@@ -17,8 +17,8 @@ module JSchema
         @max_properties = max_properties
       end
 
-      def applicable_types
-        [Hash]
+      def applicable_type
+        Hash
       end
 
       def validate_instance(instance)

data/lib/jschema/validator/maximum.rb

@@ -23,8 +23,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Numeric]
+      def applicable_type
+        Numeric
       end
     end
   end

data/lib/jschema/validator/min_items.rb

@@ -20,8 +20,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Array]
+      def applicable_type
+        Array
       end
     end
   end

data/lib/jschema/validator/min_properties.rb

@@ -17,8 +17,8 @@ module JSchema
         @min_properties = min_properties
       end
 
-      def applicable_types
-        [Hash]
+      def applicable_type
+        Hash
       end
 
       def validate_instance(instance)

data/lib/jschema/validator/minimum.rb

@@ -23,8 +23,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Numeric]
+      def applicable_type
+        Numeric
       end
     end
   end

data/lib/jschema/validator/multiple_of.rb

@@ -25,8 +25,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Numeric]
+      def applicable_type
+        Numeric
       end
     end
   end

data/lib/jschema/validator/pattern.rb

@@ -28,8 +28,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [String]
+      def applicable_type
+        String
       end
     end
   end

data/lib/jschema/validator/properties.rb

@@ -53,8 +53,8 @@ module JSchema
         @pattern_properties = pattern_properties
       end
 
-      def applicable_types
-        [Hash]
+      def applicable_type
+        Hash
       end
 
       def validate_instance(instance)

data/lib/jschema/validator/required.rb

@@ -13,8 +13,8 @@ module JSchema
         @required = required
       end
 
-      def applicable_types
-        [Hash]
+      def applicable_type
+        Hash
       end
 
       def validate_instance(instance)

data/lib/jschema/validator/unique_items.rb

@@ -19,8 +19,8 @@ module JSchema
         end
       end
 
-      def applicable_types
-        [Array]
+      def applicable_type
+        Array
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jschema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Konstantin Papkovskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies: []
 description: Implementation of JSON Schema Draft 4
 email: konstantin@papkovskiy.com
@@ -47,43 +47,6 @@ files:
 - lib/jschema/validator/required.rb
 - lib/jschema/validator/type.rb
 - lib/jschema/validator/unique_items.rb
-- test/assert_received.rb
-- test/string_length_validator_tests.rb
-- test/test_assert_received.rb
-- test/test_integration.rb
-- test/test_json_reference.rb
-- test/test_schema.rb
-- test/test_schema_ref.rb
-- test/test_schema_uri.rb
-- test/test_validator.rb
-- test/validator/argument_is_array_of_schemas_tests.rb
-- test/validator/assertions.rb
-- test/validator/properties_limit_tests.rb
-- test/validator/schema_validation_helpers.rb
-- test/validator/test_all_of.rb
-- test/validator/test_any_of.rb
-- test/validator/test_dependencies.rb
-- test/validator/test_enum.rb
-- test/validator/test_format.rb
-- test/validator/test_items.rb
-- test/validator/test_max_items.rb
-- test/validator/test_max_length.rb
-- test/validator/test_max_properties.rb
-- test/validator/test_maximum.rb
-- test/validator/test_min_items.rb
-- test/validator/test_min_length.rb
-- test/validator/test_min_properties.rb
-- test/validator/test_minimum.rb
-- test/validator/test_multiple_of.rb
-- test/validator/test_not.rb
-- test/validator/test_one_of.rb
-- test/validator/test_pattern.rb
-- test/validator/test_properties.rb
-- test/validator/test_required.rb
-- test/validator/test_simple_validator.rb
-- test/validator/test_type.rb
-- test/validator/test_unique_items.rb
-- test/validator/validation_against_schemas_tests.rb
 homepage: http://github.com/Soylent/jschema
 licenses:
 - MIT
@@ -104,45 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: JSON Schema implementation
-test_files:
-- test/assert_received.rb
-- test/string_length_validator_tests.rb
-- test/test_assert_received.rb
-- test/test_integration.rb
-- test/test_json_reference.rb
-- test/test_schema.rb
-- test/test_schema_ref.rb
-- test/test_schema_uri.rb
-- test/test_validator.rb
-- test/validator/argument_is_array_of_schemas_tests.rb
-- test/validator/assertions.rb
-- test/validator/properties_limit_tests.rb
-- test/validator/schema_validation_helpers.rb
-- test/validator/test_all_of.rb
-- test/validator/test_any_of.rb
-- test/validator/test_dependencies.rb
-- test/validator/test_enum.rb
-- test/validator/test_format.rb
-- test/validator/test_items.rb
-- test/validator/test_max_items.rb
-- test/validator/test_max_length.rb
-- test/validator/test_max_properties.rb
-- test/validator/test_maximum.rb
-- test/validator/test_min_items.rb
-- test/validator/test_min_length.rb
-- test/validator/test_min_properties.rb
-- test/validator/test_minimum.rb
-- test/validator/test_multiple_of.rb
-- test/validator/test_not.rb
-- test/validator/test_one_of.rb
-- test/validator/test_pattern.rb
-- test/validator/test_properties.rb
-- test/validator/test_required.rb
-- test/validator/test_simple_validator.rb
-- test/validator/test_type.rb
-- test/validator/test_unique_items.rb
-- test/validator/validation_against_schemas_tests.rb
+test_files: []

data/test/assert_received.rb

@@ -1,15 +0,0 @@
-module MiniTest
-  module Assertions
-    def assert_received(receiver, message, args = [])
-      mock = MiniTest::Mock.new
-      mock.expect(message, nil, args)
-      receiver_stub = ->(*arg) { mock.__send__ message, *arg }
-
-      receiver.stub message, receiver_stub do
-        yield if block_given?
-      end
-
-      mock.verify
-    end
-  end
-end

data/test/string_length_validator_tests.rb

@@ -1,18 +0,0 @@
-module StringLengthValidatorTests
-  def test_that_argument_can_be_big_integer
-    validator(2**64)
-  end
-
-  def test_that_argument_is_integer
-    assert_raises(JSchema::InvalidSchema) { validator('invalid') }
-  end
-
-  def test_that_argument_is_not_null
-    assert_raises(JSchema::InvalidSchema) { validator(nil) }
-  end
-
-  def test_that_validation_always_passes_for_non_string_instances
-    assert validator(1).valid?(nil)
-    assert validator(1).valid?([1, 2])
-  end
-end

data/test/test_assert_received.rb

@@ -1,39 +0,0 @@
-require 'minitest/autorun'
-require_relative 'assert_received'
-
-class TestAssertReceived < Minitest::Test
-  def test_message_sending_without_params
-    assert_received(Object, :class) do
-      Object.class
-    end
-  end
-
-  def test_message_sending_with_params
-    assert_received(String, :==, [Fixnum]) do
-      String == Fixnum
-    end
-  end
-
-  def test_assertion_failure_when_message_is_not_received
-    assert_raises(MockExpectationError) do
-      assert_received(String, :class) do
-      end
-    end
-  end
-
-  def test_assertion_failure_when_unexpected_message_is_received
-    assert_raises(MockExpectationError) do
-      assert_received(String, :class) do
-        String.name
-      end
-    end
-  end
-
-  def test_assertion_failure_when_unexpected_params_are_received
-    assert_raises(MockExpectationError) do
-      assert_received(String, :==, [Fixnum]) do
-        String == Bignum
-      end
-    end
-  end
-end