json_schema 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99a8e1142fc7a9629bb3c8af18b4f257b85e278
-  data.tar.gz: 7f6d730a5d32c5326b79c69e1184e893aa03a890
+  metadata.gz: c09e98d77f8312b241a686e9754c64868f3168cd
+  data.tar.gz: 37c8aa03c7b3c20f1297521e1ad028450ef1dbe9
 SHA512:
-  metadata.gz: 575c4b1b0d0b59315128b01bf6659aa4619276686747389623bcc28f917579f409c46662d14c940aa3ef6561f0abe03dcd6a713817e35fa5da280ce92a82f38b
-  data.tar.gz: 99eea0dd8d3d826ff55d2dae235aacebebaba6a03486dd7f9b4368f752a55f3a632e8fb2dd783a54aeb072295d46b20d410bccbe279ccff267584fb8fd13081d
+  metadata.gz: c4eaccae952cb463de80492d3e5903e0f597dfed795ccdd2929c253ba4efd27a4b97b07527f6eef6b9f4ba3a0c943ab6c305ada987586f4d52c9a47d8adfb9b4
+  data.tar.gz: c126e71608055b4747d7556548a268021ba388fbccf77893408e5b6e166d9c9d53ca25a1e4da4a78416a4893f6797bf81a56c73795097302a776528679cae2ca

data/lib/commands/validate_schema.rb

@@ -41,7 +41,6 @@ module Commands
           end
 
           if !(schema = @store.lookup_schema(schema_uri))
-puts schema_uri
             @errors = ["#{data_file}: Unknown $schema, try specifying one with -s."]
             return false
           end

data/lib/json_schema/parser.rb

@@ -175,6 +175,7 @@ module JsonSchema
           link.method      = l["method"] ? l["method"].downcase.to_sym : nil
           link.rel         = l["rel"]
           link.title       = l["title"]
+          link.media_type  = l["mediaType"]
 
           if l["schema"]
             link.schema = parse_data(l["schema"], schema, "links/#{i}/schema")

data/lib/json_schema/schema.rb

@@ -261,14 +261,6 @@ module JsonSchema
       !clones.include?(self)
     end
 
-    def depth
-      if parent
-        parent.depth + 1
-      else
-        0
-      end
-    end
-
     def pointer
       if parent
         parent.pointer + "/" + fragment
@@ -297,6 +289,7 @@ module JsonSchema
       attr_accessor :href
       attr_accessor :method
       attr_accessor :rel
+      attr_accessor :media_type
       attr_accessor :schema
       attr_accessor :target_schema
       attr_accessor :title
@@ -304,6 +297,10 @@ module JsonSchema
       def enc_type
         @enc_type || "application/json"
       end
+
+      def media_type
+        @media_type || "application/json"
+      end
     end
 
     # Media type subobject for a hyperschema.

data/lib/json_schema/schema_error.rb

@@ -30,8 +30,7 @@ module JsonSchema
     end
 
     def to_s
-      uri = schema.uri || ""
-      "#{pointer}: failed schema #{uri}#{schema.pointer}: #{message}"
+      "#{pointer}: failed schema #{schema.pointer}: #{message}"
     end
   end
 end

data/test/json_schema/parser_test.rb

@@ -160,6 +160,7 @@ describe JsonSchema::Parser do
         "href" => "/apps",
         "method" => "POST",
         "rel" => "create",
+        "mediaType" => "application/json",
         "schema" => {
           "properties" => {
             "name" => {
@@ -180,6 +181,7 @@ describe JsonSchema::Parser do
     assert_equal "/apps", link.href
     assert_equal :post, link.method
     assert_equal "create", link.rel
+    assert_equal "application/json", link.media_type
     assert_equal "#/definitions/app/definitions/name",
       link.schema.properties["name"].reference.pointer
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest