json-ld 3.0.0 → 3.0.1

data/spec/matchers.rb

@@ -0,0 +1,20 @@
+require 'rspec/matchers' # @see http://rubygems.org/gems/rspec
+require_relative 'support/extensions'
+
+RSpec::Matchers.define :produce_jsonld do |expected, logger|
+  match do |actual|
+    expect(actual).to be_equivalent_jsonld expected
+  end
+
+  failure_message do |actual|
+    "Expected: #{expected.is_a?(String) ? expected : expected.to_json(JSON_STATE) rescue 'malformed json'}\n" +
+    "Actual  : #{actual.is_a?(String) ? actual : actual.to_json(JSON_STATE) rescue 'malformed json'}\n" +
+    "\nDebug:\n#{logger}"
+  end
+
+  failure_message_when_negated do |actual|
+    "Expected not to produce the following:\n" + 
+    "Actual  : #{actual.is_a?(String) ? actual : actual.to_json(JSON_STATE) rescue 'malformed json'}\n" +
+    "\nDebug:\n#{logger}"
+  end
+end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ require 'rdf/trig'
 require 'rdf/vocab'
 require 'rdf/spec'
 require 'rdf/spec/matchers'
+require_relative 'matchers'
 require 'yaml'
 begin
   require 'simplecov'

data/spec/streaming_writer_spec.rb

@@ -17,7 +17,7 @@ describe JSON::LD::StreamingWriter do
       input = %(<http://a/b> <http://a/c> <http://a/d> .)
       obj = serialize(input)
       expect(parse(obj.to_json, format: :jsonld)).to be_equivalent_graph(parse(input), logger: logger)
-      expect(obj).to produce([{
+      expect(obj).to produce_jsonld([{
         '@id'         => "http://a/b",
         "http://a/c"  => [{"@id" => "http://a/d"}]
       }], logger)

data/spec/suite_compact_spec.rb

@@ -7,7 +7,13 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}compact-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          t.run self
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
           t.run self
         end
       end

data/spec/suite_expand_spec.rb

@@ -7,7 +7,13 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}expand-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          t.run self
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
           t.run self
         end
       end

data/spec/suite_flatten_spec.rb

@@ -7,8 +7,13 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}flatten-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
-          pending "context corner-case" if t.input_loc.end_with?('flatten-0044-in.jsonld')
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          t.run self
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
           t.run self
         end
       end

data/spec/suite_frame_spec.rb

@@ -7,10 +7,16 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::FRAME_SUITE}frame-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          t.run self
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
           t.run self
         end
       end
     end
   end
-end unless ENV['CI'] || true
+end unless ENV['CI']

data/spec/suite_from_rdf_spec.rb

@@ -7,7 +7,13 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}fromRdf-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          t.run self
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
           t.run self
         end
       end

data/spec/suite_helper.rb

@@ -1,5 +1,4 @@
 require 'json/ld'
-require_relative 'support/extensions'
 
 # For now, override RDF::Utils::File.open_file to look for the file locally before attempting to retrieve it
 module RDF::Util
@@ -72,37 +71,50 @@ module Fixtures
     FRAME_SUITE = RDF::URI("https://w3c.github.io/json-ld-framing/tests/")
 
     class Manifest < JSON::LD::Resource
+      attr_accessor :manifest_url
+
       def self.open(file)
         RDF::Util::File.open_file(file) do |remote|
           json = JSON.parse(remote.read)
           if block_given?
-            yield self.from_jsonld(json)
+            yield self.from_jsonld(json, manifest_url: RDF::URI(file))
           else
-            self.from_jsonld(json)
+            self.from_jsonld(json, manifest_url: RDF::URI(file))
           end
         end
       end
 
+      def initialize(json, manifest_url:)
+        @manifest_url = manifest_url
+        super
+      end
+
       # @param [Hash] json framed JSON-LD
       # @return [Array<Manifest>]
-      def self.from_jsonld(json)
-        Manifest.new(json)
+      def self.from_jsonld(json, manifest_url: )
+        Manifest.new(json, manifest_url: manifest_url)
       end
 
       def entries
         # Map entries to resources
         attributes['sequence'].map do |e|
-          e.is_a?(String) ? Manifest.open("#{SUITE}#{e}") : Entry.new(e)
+          e.is_a?(String) ? Manifest.open(manifest_url.join(e).to_s) : Entry.new(e, manifest_url: manifest_url)
         end
       end
     end
 
     class Entry < JSON::LD::Resource
       attr_accessor :logger
+      attr_accessor :manifest_url
+
+      def initialize(json, manifest_url:)
+        @manifest_url = manifest_url
+        super
+      end
 
       # Base is expanded input file
       def base
-        options.fetch('base', "#{SUITE}#{property('input')}")
+        options.fetch('base', manifest_url.join(property('input')).to_s)
       end
 
       def options
@@ -138,7 +150,7 @@ module Fixtures
             file = options[:redirectTo]
           end
 
-          property(m) && "#{SUITE}#{file}"
+          property(m) && manifest_url.join(file).to_s
         end
 
         define_method("#{m}_json".to_sym) do
@@ -155,7 +167,7 @@ module Fixtures
       end
 
       def positiveTest?
-        property('@type').include?('jld:PositiveEvaluationTest')
+        property('@type').to_s.include?('Positive')
       end
       
 
@@ -214,9 +226,27 @@ module Fixtures
                 }
               else
                 expected = JSON.load(expect)
-                rspec_example.instance_eval {
-                  expect(result).to produce(expected, logger)
-                }
+                if options[:ordered]
+                  # Compare without transformation
+                  rspec_example.instance_eval {
+                    expect(result).to produce(expected, logger)
+                  }
+                else
+                  # Without key ordering, reorder result and expected embedded array values and compare
+                  # If results are compacted, expand both, reorder and re-compare
+                  rspec_example.instance_eval {
+                    expect(result).to produce_jsonld(expected, logger)
+                  }
+
+                  # If results are compacted, expand both, reorder and re-compare
+                  if result.to_s.include?('@context')
+                    exp_expected = JSON::LD::API.expand(expected, **options)
+                    exp_result = JSON::LD::API.expand(result, **options)
+                    rspec_example.instance_eval {
+                      expect(exp_result).to produce_jsonld(exp_expected, logger)
+                    }
+                  end
+                end
               end
             else
               rspec_example.instance_eval {

data/spec/suite_remote_doc_spec.rb

@@ -7,7 +7,13 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}remote-doc-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+        specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = false
+          t.run self
+        end
+
+        specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
+          t.options[:ordered] = true
           t.run self
         end
       end

data/spec/support/extensions.rb

@@ -1,4 +1,18 @@
+class Object
+  def equivalent_jsonld?(other, ordered: false)
+    self == other
+  end
+end
+
 class Hash
+  def equivalent_jsonld?(other, ordered: false)
+    return false unless other.is_a?(Hash) && other.length == length
+    all? do |key, value|
+      # List values are still ordered
+      value.equivalent_jsonld?(other[key], ordered: key == '@list')
+    end
+  end
+
   def diff(other)
     self.keys.inject({}) do |memo, key|
       unless self[key] == other[key]
@@ -7,4 +21,20 @@ class Hash
       memo
     end
   end
-end
+end
+
+class Array
+  def equivalent_jsonld?(other, ordered: false)
+    return false unless other.is_a?(Array) && other.length == length
+    if ordered
+      b = other.dup
+      # All elements must match in order
+      all? {|av| av.equivalent_jsonld?(b.shift)}
+    else
+      # Look for any element which matches
+      all? do |av|
+        other.any? {|bv| av.equivalent_jsonld?(bv)}
+      end
+    end
+  end
+end

data/spec/writer_spec.rb

@@ -29,7 +29,7 @@ describe JSON::LD::Writer do
   context "simple tests" do
     it "should use full URIs without base" do
       input = %(<http://a/b> <http://a/c> <http://a/d> .)
-      expect(serialize(input)).to produce([{
+      expect(serialize(input)).to produce_jsonld([{
         '@id'         => "http://a/b",
         "http://a/c"  => [{"@id" => "http://a/d"}]
       }], logger)
@@ -37,7 +37,7 @@ describe JSON::LD::Writer do
 
     it "should use qname URIs with standard prefix" do
       input = %(<http://xmlns.com/foaf/0.1/b> <http://xmlns.com/foaf/0.1/c> <http://xmlns.com/foaf/0.1/d> .)
-      expect(serialize(input, standard_prefixes: true)).to produce({
+      expect(serialize(input, standard_prefixes: true)).to produce_jsonld({
         '@context' => {
           "foaf"  => "http://xmlns.com/foaf/0.1/",
         },
@@ -57,7 +57,7 @@ describe JSON::LD::Writer do
         dc:    "http://purl.org/dc/terms/",
         frbr:  "http://vocab.org/frbr/core#",
         senet: "https://senet.org/ns#",
-      })).to produce({
+      })).to produce_jsonld({
         '@context' => {
           "dc" => "http://purl.org/dc/terms/",
           "frbr" => "http://vocab.org/frbr/core#",
@@ -75,7 +75,7 @@ describe JSON::LD::Writer do
       input = %(<http://xmlns.com/foaf/0.1/b> <http://xmlns.com/foaf/0.1/c> <http://xmlns.com/foaf/0.1/d> .)
       begin
         expect(serialize(input, prefixes: { "" => RDF::Vocab::FOAF})).
-        to produce({
+        to produce_jsonld({
           "@context" => {
             "" => "http://xmlns.com/foaf/0.1/"
           },
@@ -92,7 +92,7 @@ describe JSON::LD::Writer do
     it "should not use terms if no suffix" do
       input = %(<http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> .)
       expect(serialize(input, standard_prefixes: true)).
-      not_to produce({
+      not_to produce_jsonld({
         "@context" => {"foaf" => "http://xmlns.com/foaf/0.1/"},
         '@id'   => "foaf",
         "foaf"   => {"@id" => "foaf"}
@@ -109,7 +109,7 @@ describe JSON::LD::Writer do
       expect(serialize(input, prefixes: {
           "db" => RDF::URI("http://dbpedia.org/resource/"),
           "dbo" => RDF::URI("http://dbpedia.org/ontology/")})).
-      to produce({
+      to produce_jsonld({
         "@context" => {
           "db"    => "http://dbpedia.org/resource/",
           "dbo"   => "http://dbpedia.org/ontology/"
@@ -133,7 +133,7 @@ describe JSON::LD::Writer do
         <http://example.com/test-cases/0002> a :TestCase .
       )
       expect(serialize(input, prefixes: {"" => "http://www.w3.org/2006/03/test-description#"})).
-      to produce({
+      to produce_jsonld({
         '@context'     => {
           "" => "http://www.w3.org/2006/03/test-description#",
           "dc" => RDF::Vocab::DC.to_s 
@@ -164,7 +164,7 @@ describe JSON::LD::Writer do
         rdfs: "http://www.w3.org/2000/01/rdf-schema#",
         xsd:  "http://www.w3.org/2001/XMLSchema#"
       })).
-      to produce({
+      to produce_jsonld({
         '@context'     => {
           "owl"  => "http://www.w3.org/2002/07/owl#",
           "rdf"  => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -286,6 +286,7 @@ files:
 - spec/format_spec.rb
 - spec/frame_spec.rb
 - spec/from_rdf_spec.rb
+- spec/matchers.rb
 - spec/reader_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
@@ -376,6 +377,7 @@ specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
 - spec/spec_helper.rb
+- spec/matchers.rb
 - spec/api_spec.rb
 - spec/suite_from_rdf_spec.rb
 - spec/context_spec.rb