improve error message when a schema that is not a hash is passed to Schema#initialize, use #to_hash

Author: notEthan

lib/json-schema/pointer.rb

@@ -2,6 +2,7 @@
 
 module JSON
   class Schema
+    # a JSON Pointer, as described by RFC 6901 https://tools.ietf.org/html/rfc6901
     class Pointer
       class Error < JSON::Schema::SchemaError
       end
@@ -10,6 +11,15 @@ class PointerSyntaxError < Error
       class ReferenceError < Error
       end
 
+      # parse a fragment to an array of reference tokens
+      #
+      # #/foo/bar
+      #
+      # => ['foo', 'bar']
+      #
+      # #/foo%20bar
+      #
+      # => ['foo bar']
       def self.parse_fragment(fragment)
         fragment = Addressable::URI.unescape(fragment)
         match = fragment.match(/\A#/)
@@ -20,6 +30,15 @@ def self.parse_fragment(fragment)
         end
       end
 
+      # parse a pointer to an array of reference tokens
+      #
+      # /foo
+      #
+      # => ['foo']
+      #
+      # /foo~0bar/baz~1qux
+      #
+      # => ['foo~bar', 'baz/qux']
       def self.parse_pointer(pointer_string)
         tokens = pointer_string.split('/', -1).map! do |piece|
           piece.gsub('~1', '/').gsub('~0', '~')
@@ -33,6 +52,13 @@ def self.parse_pointer(pointer_string)
         end
       end
 
+      # initializes a JSON::Schema::Pointer from the given representation.
+      #
+      # type may be one of:
+      #
+      # - :fragment - the representation is a fragment containing a pointer (starting with #)
+      # - :pointer - the representation is a pointer (starting with /)
+      # - :reference_tokens - the representation is an array of tokens referencing a path in a document
       def initialize(type, representation)
         @type = type
         if type == :reference_tokens
@@ -49,6 +75,8 @@ def initialize(type, representation)
 
       attr_reader :reference_tokens
 
+      # takes a root json document and evaluates this pointer through the document, returning the value
+      # pointed to by this pointer.
       def evaluate(document)
         reference_tokens.inject(document) do |value, token|
           if value.is_a?(Array)

lib/json-schema/schema.rb

@@ -6,7 +6,11 @@ class Schema
     attr_accessor :schema, :uri, :validator
 
     def initialize(schema,uri,parent_validator=nil)
-      @schema = schema
+      unless schema.respond_to?(:to_hash)
+        raise ArgumentError, "schema must be a hash; got: #{schema.inspect}"
+      end
+
+      @schema = schema.to_hash
       @uri = uri
 
       # If there is an ID on this schema, use it to generate the URI