Make sure list members don't have annotations.

Author: gkellogg

lib/json/ld/expand.rb

@@ -49,7 +49,13 @@ def expand(input, active_property, context,
             log_depth: log_depth.to_i + 1)
 
           # If the active property is @list or its container mapping is set to @list and v is an array, change it to a list object
-          v = {"@list" => v} if is_list && v.is_a?(Array)
+          if is_list && v.is_a?(Array)
+            # Make sure that no member of v contains an annotation object
+            raise JsonLdError::InvalidAnnotation,
+              "A list element must not contain @annotation." if
+              v.any? {|n| n.is_a?(Hash) && n.key?('@annotation')}
+            v = {"@list" => v}
+          end
 
           case v
           when nil then nil
@@ -486,6 +492,11 @@ def expand_object(input, active_property, context, output_object,
             # Spec FIXME: need to be sure that result is an array
             value = as_array(value)
 
+            # Make sure that no member of value contains an annotation object
+            raise JsonLdError::InvalidAnnotation,
+              "A list element must not contain @annotation." if
+              value.any? {|n| n.is_a?(Hash) && n.key?('@annotation')}
+
             value
           when '@set'
             # If expanded property is @set, set expanded value to the result of using this algorithm recursively, passing active context, active property, and value for element.

script/tc

@@ -98,7 +98,7 @@ def run_tc(man, tc, options)
       expected = JSON.load(tc.expect) if tc.evaluationTest? && tc.positiveTest?
       compare_results(tc, output, expected)
     when 'jld:FromRDFTest'
-      repo = RDF::Repository.load(tc.input_loc, format: :nquads)
+      repo = RDF::Repository.load(tc.input_loc, format: :nquads, rdfstar: tc.options[:rdfstar])
       output = if options[:stream]
         JSON.parse(JSON::LD::Writer.buffer(stream: true, validate: true, **tc.options) {|w| w << repo})
       else
@@ -129,11 +129,11 @@ def run_tc(man, tc, options)
             # toRdf/e075 is hard to test, but verified manually
             output == tc.expect ? 'passed' : (tc.input_loc.include?('e075') ? 'passed' : 'failed')
           else
-            expected = RDF::Repository.new << RDF::NQuads::Reader.new(tc.expect, validate: false, logger: [])
+            expected = RDF::Repository.new << RDF::NQuads::Reader.new(tc.expect, rdfstar: tc.options[:rdfstar], validate: false, logger: [])
             output.isomorphic?(expected) ? 'passed' : 'failed'
           end
         rescue RDF::ReaderError, JSON::LD::JsonLdError
-          quads = JSON::LD::API.toRdf(tc.input_loc, tc.options.merge(validate: false)).map do |statement|
+          quads = JSON::LD::API.toRdf(tc.input_loc, rdfstar: tc.options[:rdfstar], **tc.options.merge(validate: false)).map do |statement|
             # Not really RDF, try different test method
             tc.to_quad(statement)
           end
@@ -254,7 +254,10 @@ else
   %w(expand compact flatten fromRdf html remote-doc toRdf).map do |man|
     "#{Fixtures::SuiteTest::SUITE}#{man}-manifest.jsonld"
   end +
-    ["#{Fixtures::SuiteTest::FRAME_SUITE}frame-manifest.jsonld"]
+  ["#{Fixtures::SuiteTest::FRAME_SUITE}frame-manifest.jsonld"] +
+  %w{expand compact flatten fromRdf toRdf}.map do |man|
+    "#{Fixtures::SuiteTest::STAR_SUITE}#{man}-manifest.jsonld"
+  end
 end
 
 earl_preamble(options) if options[:earl]

spec/expand_spec.rb

@@ -3798,7 +3798,7 @@
             "@id": "ex:bob",
             "ex:knows": {
               "@list": [{"@id": "ex:fred"}],
-              "@annotation": "value2"
+              "@annotation": {"ex:prop": "value2"}
             }
           }),
           exception: JSON::LD::JsonLdError::InvalidSetOrListObject
@@ -3810,7 +3810,7 @@
               "@list": [
                 {
                   "@id": "ex:fred",
-                  "@annotation": "value2"
+                  "@annotation": {"ex:prop": "value2"}
                 }
               ]
             }

spec/suite_helper.rb

@@ -203,8 +203,8 @@ def run(rspec_example = nil)
         logger.info "frame: #{frame}" if frame_loc
 
         options = self.options
-        unless options[:specVersion] == "json-ld-1.1"
-          skip "not a 1.1 test" 
+        if options[:specVersion] == "json-ld-1.0"
+          skip "1.0 test" 
           return
         end
 
@@ -225,7 +225,7 @@ def run(rspec_example = nil)
               JSON::LD::API.frame(input_loc, frame_loc, logger: logger, **options)
             when "jld:FromRDFTest"
               # Use an array, to preserve input order
-              repo = RDF::NQuads::Reader.open(input_loc) do |reader|
+              repo = RDF::NQuads::Reader.open(input_loc, rdfstar: options[:rdfstar]) do |reader|
                 reader.each_statement.to_a
               end.to_a.uniq.extend(RDF::Enumerable)
               logger.info "repo: #{repo.dump(self.id == '#t0012' ? :nquads : :trig)}"
@@ -258,7 +258,7 @@ def run(rspec_example = nil)
             end
             if evaluationTest?
               if testType == "jld:ToRDFTest"
-                expected = RDF::Repository.new << RDF::NQuads::Reader.new(expect, logger: [])
+                expected = RDF::Repository.new << RDF::NQuads::Reader.new(expect, rdfstar: options[:rdfstar], logger: [])
                 rspec_example.instance_eval {
                   expect(result).to be_equivalent_graph(expected, logger)
                 }
@@ -314,7 +314,7 @@ def run(rspec_example = nil)
                 when "jld:FrameTest"
                   JSON::LD::API.frame(t.input_loc, t.frame_loc, logger: logger, **options)
                 when "jld:FromRDFTest"
-                  repo = RDF::Repository.load(t.input_loc)
+                  repo = RDF::Repository.load(t.input_loc, rdfstar: options[:rdfstar])
                   logger.info "repo: #{repo.dump(t.id == '#t0012' ? :nquads : :trig)}"
                   JSON::LD::API.fromRdf(repo, logger: logger, **options)
                 when "jld:HttpTest"