jschema 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27963957079b8a36781b058fbfcc5a65d05bc982
-  data.tar.gz: a095f424265697a18c1ba7b27359a4352393d06c
+  metadata.gz: d590fc0ec0125af0eddda1de53da9dacae3531ed
+  data.tar.gz: fac78348f9d9bc7a044b109e1c0402a6b572cf78
 SHA512:
-  metadata.gz: 9868e28a5802ba5102e443adfdcdd1342371157a5aa77a7a6a0adfe84a6ed56024436c5ee9a232524f4c36d15a16a2a25fb53f51fb68067dfbaae85144c7138a
-  data.tar.gz: 2455390ded90bb4a99f6f64cdc48a7bc29d2d4b55a3763b0e052fdb3b71555c092a3aeca3e068404763128893e39263b329182c2427c3856d779b0fc52571c03
+  metadata.gz: 3622b6dca13c53afe5454d08fead0af4aebcb3103f86f6d75c9119f79131ea2f6a7704d8f85f9da111adaa3b8d27328383a0663082d844073aaa7497bc4aed10
+  data.tar.gz: 744703a630e62f1aae528778c01332709fb83ea8383f4fbfe0a6c8346d6d5346a24c47eac6e45130b5a0eec3245a5d153bcc0e14793964ba3d593c3fc7f68c30

data/lib/jschema/simple_validator.rb

@@ -28,7 +28,7 @@ module JSchema
     end
 
     def validate(instance)
-      if !applicable_types || applicable_types.include?(instance.class)
+      if !applicable_types || applicable_types.any? { |type| type === instance }
         validate_instance(instance)
       end
     end

data/lib/jschema/validator/maximum.rb

@@ -24,7 +24,7 @@ module JSchema
       end
 
       def applicable_types
-        [Fixnum, Bignum, Float, BigDecimal]
+        [Numeric]
       end
     end
   end

data/lib/jschema/validator/minimum.rb

@@ -24,7 +24,7 @@ module JSchema
       end
 
       def applicable_types
-        [Fixnum, Bignum, Float, BigDecimal]
+        [Numeric]
       end
     end
   end

data/lib/jschema/validator/multiple_of.rb

@@ -26,7 +26,7 @@ module JSchema
       end
 
       def applicable_types
-        [Fixnum, Bignum, Float, BigDecimal]
+        [Numeric]
       end
     end
   end

data/lib/jschema/validator/required.rb

@@ -18,11 +18,11 @@ module JSchema
       end
 
       def validate_instance(instance)
-        @required.each do |required_property|
-          unless instance.key?(required_property)
-            return "#{instance} must have property `#{required_property}`"
-          end
-        end and nil
+        missing_keys = @required - instance.keys
+        unless missing_keys.empty?
+          keys = missing_keys.map(&:inspect).join(', ')
+          "#{instance} must contain #{keys}"
+        end
       end
 
       def valid_required?(required)

data/lib/jschema/validator/type.rb

@@ -17,11 +17,11 @@ module JSchema
         @json_types = Array(type)
         @ruby_classes = @json_types.map do |json_type|
           json_type_to_ruby_class(json_type)
-        end.flatten.compact
+        end
       end
 
       def validate_instance(instance)
-        unless @ruby_classes.one? { |type| instance.is_a?(type) }
+        unless @ruby_classes.one? { |type| type === instance }
           error_message(instance)
         end
       end
@@ -31,10 +31,10 @@ module JSchema
         when 'object'  then Hash
         when 'null'    then NilClass
         when 'string'  then String
-        when 'integer' then [Fixnum, Bignum]
+        when 'integer' then Integer
         when 'array'   then Array
-        when 'boolean' then [TrueClass, FalseClass]
-        when 'number'  then [Fixnum, Float, BigDecimal, Bignum]
+        when 'boolean' then Boolean
+        when 'number'  then Numeric
         else invalid_schema('type', json_type)
         end
       end
@@ -52,6 +52,14 @@ module JSchema
 
         "#{instance.inspect} must be a #{types}"
       end
+
+      module Boolean
+        class << self
+          def ===(other)
+            other == true || other == false || super
+          end
+        end
+      end
     end
   end
 end

data/test/test_schema.rb

@@ -82,6 +82,16 @@ class TestSchema < Minitest::Test
     assert_equal schema_def_uri, definition.uri
   end
 
+  # TODO: Make it isolated.
+  def test_definitions
+    schema = JSchema::Schema.build(
+      'definitions' => { 'schema1' => {} },
+      '$ref' => '#/definitions/schema1'
+    )
+
+    schema.valid?('')
+  end
+
   def test_that_exception_is_raised_when_schema_version_is_not_supported
     assert_raises(JSchema::InvalidSchema) do
       JSchema::Schema.build('$schema' => 'unsupported')

data/test/validator/test_simple_validator.rb

@@ -76,12 +76,19 @@ class TestSimpleValidator < Minitest::Test
     end
   end
 
-  def test_applicable_types
+  def test_failing_validation_when_validator_is_applicable
     stub_validator [Fixnum], false do |vdr|
       refute vdr.valid?(0)
     end
   end
 
+  def test_failing_validation_when_instance_is_descendant_of_applicable_types
+    stub_validator [Hash], false do |vdr|
+      descendant_type = Class.new(Hash)
+      refute vdr.valid?(descendant_type.new)
+    end
+  end
+
   private
 
   def stub_validator(applicable_types, valid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jschema
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Konstantin Papkovskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies: []
 description: Implementation of JSON Schema Draft 4
 email: konstantin@papkovskiy.com