json_schema 0.0.17 → 0.0.18

data/lib/commands/validate_schema.rb

@@ -40,7 +40,7 @@ module Commands
             return false
           end
 
-          if !(schema = @store.lookup_uri(schema_uri))
+          if !(schema = @store.lookup_schema(schema_uri))
             @errors = ["#{data_file}: Unknown $schema, try specifying one with -s."]
             return false
           end
@@ -66,7 +66,7 @@ module Commands
         if !(extra_schema = parse(extra_schema))
           return false
         end
-        @store.add_uri_reference(extra_schema.uri, extra_schema)
+        @store.add_schema(extra_schema)
       end
       true
     end

data/lib/json_schema/document_store.rb

@@ -10,16 +10,16 @@ module JsonSchema
       @schema_map = {}
     end
 
-    def add_uri_reference(uri, schema)
-      raise "can't add nil URI" if uri.nil?
-      @schema_map[uri] = schema
+    def add_schema(schema)
+      raise "can't add nil URI" if schema.uri.nil?
+      @schema_map[schema.uri] = schema
     end
 
     def each
       @schema_map.each { |k, v| yield(k, v) }
     end
 
-    def lookup_uri(uri)
+    def lookup_schema(uri)
       @schema_map[uri]
     end
   end

data/lib/json_schema/reference_expander.rb

@@ -43,9 +43,9 @@ module JsonSchema
     def add_reference(schema)
       uri = URI.parse(schema.uri)
       if uri.absolute?
-        @store.add_uri_reference(schema.uri, schema)
+        @store.add_schema(schema)
       else
-        @local_store.add_uri_reference(schema.uri, schema)
+        @local_store.add_schema(schema)
       end
     end
 
@@ -113,9 +113,9 @@ module JsonSchema
 
     def lookup_reference(uri)
       if uri.absolute?
-        @store.lookup_uri(uri.to_s)
+        @store.lookup_schema(uri.to_s)
       else
-        @local_store.lookup_uri(uri.to_s)
+        @local_store.lookup_schema(uri.to_s)
       end
     end
 
@@ -154,7 +154,7 @@ module JsonSchema
         scheme = uri.scheme || "http"
         # allow resolution if something we've already parsed has claimed the
         # full URL
-        if @store.lookup_uri(uri.to_s)
+        if @store.lookup_schema(uri.to_s)
           resolve_uri(ref_schema, uri)
         else
           message =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors: