json-schema 2.0.3 → 2.0.4

data/README.textile

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

data/lib/json-schema/attributes/type.rb

@@ -56,13 +56,13 @@ module JSON
           end
         elsif !valid
           if union
-            message = "The property '#{build_fragment(fragments)}' of type #{data.class} did not match one or more of the following types:"
+            message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match one or more of the following types:"
             types.each {|type| message += type.is_a?(String) ? " #{type}," : " (schema)," }
             message.chop!
             validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
             validation_errors(processor).last.sub_errors = union_errors
           else
-            message = "The property '#{build_fragment(fragments)}' of type #{data.class} did not match the following type:"
+            message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match the following type:"
             types.each {|type| message += type.is_a?(String) ? " #{type}," : " (schema)," }
             message.chop!
             validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
@@ -85,6 +85,18 @@ module JSON
         valid_classes = TYPE_CLASS_MAPPINGS.fetch(type) { return true }
         Array(valid_classes).any? { |c| data.is_a?(c) }
       end
+
+      # Lookup Schema type of given class instance
+      def self.type_of_data(data)
+        type, klass = TYPE_CLASS_MAPPINGS.map { |k,v| [k,v] }.sort_by { |i|
+          k,v = i
+          -Array(v).map { |klass| klass.ancestors.size }.max
+        }.find { |i|
+          k,v = i
+          Array(v).any? { |klass| data.kind_of?(klass) }
+        }
+        type
+      end
     end
   end
-end
+end

data/lib/json-schema/schema.rb

@@ -10,7 +10,7 @@ module JSON
       @uri = uri
 
       # If there is an ID on this schema, use it to generate the URI
-      if @schema['id']
+      if @schema['id'] && @schema['id'].kind_of?(String)
         temp_uri = URI.parse(@schema['id'])
         if temp_uri.relative?
           uri = uri.merge(@schema['id'])

data/test/test_schema_type_attribute.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class TestSchemaTypeAttribute < Test::Unit::TestCase
+  def test_type_of_data
+    assert_equal(type_of_data(String.new), 'string')
+    assert_equal(type_of_data(Numeric.new), 'number')
+    assert_equal(type_of_data(1), 'integer')
+    assert_equal(type_of_data(true), 'boolean')
+    assert_equal(type_of_data(false), 'boolean')
+    assert_equal(type_of_data(Hash.new), 'object')
+    assert_equal(type_of_data(nil), 'null')
+    assert_equal(type_of_data(Object.new), 'any')
+  end
+
+  private
+
+  def type_of_data(data)
+    JSON::Schema::TypeAttribute.type_of_data(data)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -78,6 +78,7 @@ files:
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
+- test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
@@ -123,6 +124,7 @@ test_files:
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
+- test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
 - test/data/bad_data_1.json
 - test/data/good_data_1.json