json_schema 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e133f10b740fb801f9d68f99786eb8a962c68e
-  data.tar.gz: db3e9c45d1e48174461c60a64c197c3bba9a8a47
+  metadata.gz: fbb33080285902b1c199cf2bcab85f200c0eb901
+  data.tar.gz: a07dd64354f889be4cd37b0aefd5b31fe504ed2c
 SHA512:
-  metadata.gz: 41e3b1d109b966851a98e11a429eee1d56f575e776ddcea43f7bf22cb563519a3723b8fdd6783b7abe11fa4ed7ca93afa8e47b1d6de99de9db9e28536367d75e
-  data.tar.gz: 150a068538075160b41ab16fadc2345b1c4b2704a48e82310c9c196af6e11f7f178911c389752c9daee5c3aa171b23c7fb708eb23e899486b0f4d2ecc249b790
+  metadata.gz: 4ab3e28e2872a54c2177ff6e0d6d0b47494fb2f8baad25b6e26a0aa9bba0adee5b87cc02bcc4d8689be633eb9ca8f400617205af7c156238a46f2917a363a359
+  data.tar.gz: 8370b05b74dcbfbb59d5d64b90d7211dcf3bc7f516f0a3dfd87b18efb04c05f92dae9abb545e763ba71ae81dbd40a9b1726222c43a1ae365530a483b41e5b3c6

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2015 Brandur and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/json_schema/schema_error.rb

@@ -34,4 +34,29 @@ module JsonSchema
       "#{pointer}: failed schema #{schema.pointer}: #{message}"
     end
   end
+
+  module ErrorFormatter
+    def to_list(list)
+      words_connector     = ', '
+      two_words_connector = ' or '
+      last_word_connector = ', or '
+
+      length = list.length
+      joined_list = case length
+                    when 1
+                      list[0]
+                    when 2
+                      "#{list[0]}#{two_words_connector}#{list[1]}"
+                     else
+                      "#{list[0...-1].join(words_connector)}#{last_word_connector}#{list[-1]}"
+                    end
+
+      if joined_list[0] =~ /^[aeiou]/
+        "an #{joined_list}"
+      else
+        "a #{joined_list}"
+      end
+    end
+    module_function :to_list
+  end
 end

data/lib/json_schema/validator.rb

@@ -506,7 +506,7 @@ module JsonSchema
       if valid_types.any? { |t| data.is_a?(t) }
         true
       else
-        message = %{#{data.inspect} is not a #{schema.type.join("/")}.}
+        message = %{#{data.inspect} is not #{ErrorFormatter.to_list(schema.type)}.}
         errors << ValidationError.new(schema, path, message, :invalid_type)
         false
       end

data/test/json_schema/validator_test.rb

@@ -40,7 +40,33 @@ describe JsonSchema::Validator do
     )
     @data_sample = 4
     refute validate
-    assert_includes error_messages, %{4 is not a object.}
+    assert_includes error_messages, %{4 is not an object.}
+    assert_includes error_types, :invalid_type
+  end
+
+  it "provides accurate error messages for multiple type errors" do
+    pointer("#/definitions/app").merge!(
+      "type" => ["string"]
+    )
+    @data_sample = 4
+    refute validate
+    assert_includes error_messages, %{4 is not a string.}
+    assert_includes error_types, :invalid_type
+
+    pointer("#/definitions/app").merge!(
+      "type" => ["string", "null"]
+    )
+    @data_sample = 4
+    refute validate
+    assert_includes error_messages, %{4 is not a string or null.}
+    assert_includes error_types, :invalid_type
+
+    pointer("#/definitions/app").merge!(
+      "type" => ["object", "null", "string"]
+    )
+    @data_sample = 4
+    refute validate
+    assert_includes error_messages, %{4 is not an object, null, or string.}
     assert_includes error_types, :invalid_type
   end
 
@@ -420,7 +446,7 @@ describe JsonSchema::Validator do
       "KEY" => 456
     }
     refute validate
-    assert_includes error_messages, %{456 is not a null/string.}
+    assert_includes error_messages, %{456 is not a null or string.}
     assert_includes error_types, :invalid_type
   end
 
@@ -774,7 +800,6 @@ describe JsonSchema::Validator do
 
   def validate
     @schema = JsonSchema.parse!(schema_sample)
-puts @schema.inspect
     @schema.expand_references!
     @schema = @schema.definitions["app"]
     @validator = JsonSchema::Validator.new(@schema)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator
@@ -60,6 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - bin/validate-schema
 - lib/commands/validate_schema.rb
@@ -111,4 +112,3 @@ signing_key:
 specification_version: 4
 summary: A JSON Schema V4 and Hyperschema V4 parser and validator.
 test_files: []
-has_rdoc: