json-ld 2.2.1 → 3.0.0

data/spec/flatten_spec.rb

@@ -18,21 +18,21 @@ describe JSON::LD::API do
             "foaf" => RDF::Vocab::FOAF.to_s
           },
           "@id" => "http://greggkellogg.net/foaf",
-          "@type" => ["foaf:PersonalProfileDocument"],
+          "@type" => "http://xmlns.com/foaf/0.1/PersonalProfileDocument",
           "foaf:primaryTopic" => [{
             "@id" => "http://greggkellogg.net/foaf#me",
-            "@type" => ["foaf:Person"]
+            "@type" => "http://xmlns.com/foaf/0.1/Person"
           }]
         },
         output: [
           {
             "@id" => "http://greggkellogg.net/foaf",
-            "@type" => [RDF::Vocab::FOAF.PersonalProfileDocument.to_s],
-            RDF::Vocab::FOAF.primaryTopic.to_s => [{"@id" => "http://greggkellogg.net/foaf#me"}]
+            "@type" => ["http://xmlns.com/foaf/0.1/PersonalProfileDocument"],
+            "http://xmlns.com/foaf/0.1/primaryTopic" => [{"@id" => "http://greggkellogg.net/foaf#me"}]
           },
           {
             "@id" => "http://greggkellogg.net/foaf#me",
-            "@type" => [RDF::Vocab::FOAF.Person.to_s]
+            "@type" => ["http://xmlns.com/foaf/0.1/Person"]
           }
         ]
       },
@@ -60,7 +60,7 @@ describe JSON::LD::API do
         ]
       },
       "reverse properties" => {
-        input: ::JSON.parse(%([
+        input: %([
           {
             "@id": "http://example.com/people/markus",
             "@reverse": {
@@ -75,8 +75,8 @@ describe JSON::LD::API do
             },
             "http://xmlns.com/foaf/0.1/name": [ { "@value": "Markus Lanthaler" } ]
           }
-        ])),
-        output: ::JSON.parse(%([
+        ]),
+        output: %([
           {
             "@id": "http://example.com/people/dave",
             "http://xmlns.com/foaf/0.1/knows": [
@@ -101,10 +101,10 @@ describe JSON::LD::API do
               }
             ]
           }
-        ]))
+        ])
       },
       "Simple named graph (Wikidata)" => {
-        input: ::JSON.parse(%q({
+        input: %q({
           "@context": {
             "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
             "ex": "http://example.org/",
@@ -133,8 +133,8 @@ describe JSON::LD::API do
               "ex:hasReference": "http://www.wikipedia.org/"
             }
           ]
-        })),
-        output: ::JSON.parse(%q([{
+        }),
+        output: %q([{
           "@id": "http://example.org/ParisFact1",
           "@type": ["http://www.w3.org/1999/02/22-rdf-syntax-ns#Graph"],
           "http://example.org/hasReference": [
@@ -154,10 +154,10 @@ describe JSON::LD::API do
               "@id": "http://example.org/location/Paris#this",
               "http://example.org/hasPopulation": [{"@value": 7000000}]
             }]
-          }])),
+          }]),
       },
       "Test Manifest (shortened)" => {
-        input: ::JSON.parse(%q{
+        input: %q{
           {
             "@id": "",
             "http://example/sequence": {"@list": [
@@ -168,8 +168,8 @@ describe JSON::LD::API do
               }
             ]}
           }
-        }),
-        output: ::JSON.parse(%q{
+        },
+        output: %q{
           [{
             "@id": "",
             "http://example/sequence": [{"@list": [{"@id": "#t0001"}]}]
@@ -178,11 +178,10 @@ describe JSON::LD::API do
             "http://example/input": [{"@id": "error-expand-0001-in.jsonld"}],
             "http://example/name": [{"@value": "Keywords cannot be aliased to other keywords"}]
           }]
-        }),
-        options: {}
+        },
       },
       "@reverse bnode issue (0045)" => {
-        input: ::JSON.parse(%q{
+        input: %q{
           {
             "@context": {
               "foo": "http://example.org/foo",
@@ -191,8 +190,8 @@ describe JSON::LD::API do
             "foo": "Foo",
             "bar": [ "http://example.org/origin", "_:b0" ]
           }
-        }),
-        output: ::JSON.parse(%q{
+        },
+        output: %q{
           [
             {
               "@id": "_:b0",
@@ -207,14 +206,95 @@ describe JSON::LD::API do
               "http://example.org/bar": [ { "@id": "_:b0" } ]
             }
           ]
+        }
+      },
+      "@list with embedded object": {
+        input: %([{
+          "http://example.com/foo": [{
+            "@list": [{
+              "@id": "http://example.com/baz",
+              "http://example.com/bar": "buz"}
+            ]}
+          ]}
+        ]),
+        output: %([
+          {
+            "@id": "_:b0",
+            "http://example.com/foo": [{
+              "@list": [
+                {
+                  "@id": "http://example.com/baz"
+                }
+              ]
+            }]
+          },
+          {
+            "@id": "http://example.com/baz",
+            "http://example.com/bar": [{"@value": "buz"}]
+          }
+        ])
+      },
+      "coerced @list containing an deep list" => {
+        input: %([{
+          "http://example.com/foo": [{"@list": [{"@list": [{"@list": [{"@value": "baz"}]}]}]}]
+        }]),
+        output: %([{
+          "@id": "_:b0",
+          "http://example.com/foo": [{"@list": [{"@list": [{"@list": [{"@value": "baz"}]}]}]}]
+        }]),
+      },
+      "@list containing empty @list" => {
+        input: %({
+          "http://example.com/foo": {"@list": [{"@list": []}]}
+        }),
+        output: %([{
+          "@id": "_:b0",
+          "http://example.com/foo": [{"@list": [{"@list": []}]}]
+        }])
+      },
+      "coerced @list containing mixed list values" => {
+        input: %({
+          "@context": {"foo": {"@id": "http://example.com/foo", "@container": "@list"}},
+          "foo": [
+            [{"@id": "http://example/a", "@type": "http://example/Bar"}],
+            {"@id": "http://example/b", "@type": "http://example/Baz"}]
         }),
-        options: {}
-      }
+        output: %([{
+          "@id": "_:b0",
+          "http://example.com/foo": [{"@list": [
+            {"@list": [{"@id": "http://example/a"}]},
+            {"@id": "http://example/b"}
+          ]}]
+        },
+        {
+          "@id": "http://example/a",
+          "@type": [
+            "http://example/Bar"
+          ]
+        },
+        {
+          "@id": "http://example/b",
+          "@type": [
+            "http://example/Baz"
+          ]
+        }])
+      },
     }.each do |title, params|
-      it title do
-        jld = JSON::LD::API.flatten(params[:input], nil, (params[:options] || {}).merge(logger: logger)) 
-        expect(jld).to produce(params[:output], logger)
-      end
+      it(title) {run_flatten(params)}
+    end
+  end
+
+  def run_flatten(params)
+    input, output, context = params[:input], params[:output], params[:context]
+    input = ::JSON.parse(input) if input.is_a?(String)
+    output = ::JSON.parse(output) if output.is_a?(String)
+    context = ::JSON.parse(context) if context.is_a?(String)
+    pending params.fetch(:pending, "test implementation") unless input
+    if params[:exception]
+      expect {JSON::LD::API.flatten(input, context, params.merge(logger: logger))}.to raise_error(params[:exception])
+    else
+      jld = JSON::LD::API.flatten(input, context, params.merge(logger: logger))
+      expect(jld).to produce(output, logger)
     end
   end
 end

data/spec/frame_spec.rb

@@ -667,7 +667,8 @@ describe JSON::LD::API do
               "name": "Test 0001"
             }]
           }]
-        })
+        }),
+        processingMode: 'json-ld-1.1'
       },
       "library" => {
         frame: %({
@@ -1133,7 +1134,8 @@ describe JSON::LD::API do
               "@type": "Class",
               "preserve": {}
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "Frame default graph if outer @graph is used" => {
           frame: %({
@@ -1160,13 +1162,14 @@ describe JSON::LD::API do
               "@type": "Class",
               "preserve": {
                 "@id": "urn:gr-1",
-                "@graph": [{
+                "@graph": {
                   "@id": "urn:id-2",
                   "term": "data"
-                }]
+                }
               }
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "Merge one graph and preserve another" => {
           frame: %({
@@ -1206,13 +1209,14 @@ describe JSON::LD::API do
               },
               "preserve": {
                 "@id": "urn:graph-1",
-                "@graph": [{
+                "@graph": {
                   "@id": "urn:id-3",
                   "term": "bar"
-                }]
+                }
               }
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "Merge one graph and deep preserve another" => {
           frame: %({
@@ -1255,14 +1259,15 @@ describe JSON::LD::API do
               },
               "preserve": {
                 "deep": {
-                  "@graph": [{
+                  "@graph": {
                     "@id": "urn:id-3",
                     "term": "bar"
-                  }]
+                  }
                 }
               }
             }]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         },
         "library" => {
           frame: %({
@@ -1303,24 +1308,23 @@ describe JSON::LD::API do
                 "name": "Library",
                 "contains": {
                   "@id": "http://example.org/graphs/books",
-                  "@graph": [
-                    {
-                      "@id": "http://example.org/library/the-republic",
-                      "@type": "Book",
-                      "creator": "Plato",
-                      "title": "The Republic",
-                      "contains": {
-                        "@id": "http://example.org/library/the-republic#introduction",
-                        "@type": "Chapter",
-                        "description": "An introductory chapter on The Republic.",
-                        "title": "The Introduction"
-                      }
+                  "@graph": {
+                    "@id": "http://example.org/library/the-republic",
+                    "@type": "Book",
+                    "creator": "Plato",
+                    "title": "The Republic",
+                    "contains": {
+                      "@id": "http://example.org/library/the-republic#introduction",
+                      "@type": "Chapter",
+                      "description": "An introductory chapter on The Republic.",
+                      "title": "The Introduction"
                     }
-                  ]
+                  }
                 }
               }
             ]
-          })
+          }),
+          processingMode: 'json-ld-1.1'
         }
       }.each do |title, params|
         it title do
@@ -1330,8 +1334,8 @@ describe JSON::LD::API do
     end
   end
 
-  describe "pruneBlankNodeIdentifiers" do
-    it "preserves single-use bnode identifiers if option set to false" do
+  describe "prune blank nodes" do
+    it "preserves single-use bnode identifiers if @version 1.0" do
       do_frame(
         input: %({
           "@context": {
@@ -1380,8 +1384,7 @@ describe JSON::LD::API do
               }
             }
           ]
-        }),
-        prune: false
+        })
       )
     end
   end
@@ -1423,7 +1426,7 @@ describe JSON::LD::API do
     end
 
     it "issue #28" do
-      input = JSON.parse %({
+      input = %({
         "@context": {
           "rdfs": "http://www.w3.org/2000/01/rdf-schema#"
         },
@@ -1440,7 +1443,7 @@ describe JSON::LD::API do
           }
         ]
       })
-      frame = JSON.parse %({
+      frame = %({
         "@context": {
           "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
           "talksAbout": {
@@ -1454,7 +1457,7 @@ describe JSON::LD::API do
         },
         "@id": "http://www.myresource/uuid"
       })
-      expected = JSON.parse %({
+      expected = %({
         "@context": {
           "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
           "talksAbout": {
@@ -1478,15 +1481,233 @@ describe JSON::LD::API do
       })
       do_frame(input: input, frame: frame, output: expected)
     end
+
+    it "framing with @version: 1.1 prunes identifiers" do
+      input = %({
+        "@context": {
+          "@version": 1.1,
+          "@vocab": "https://example.com#",
+          "ex": "http://example.org/",
+          "claim": {
+            "@id": "ex:claim",
+            "@container": "@graph"
+          },
+          "id": "@id"
+        },
+        "claim": {
+          "id": "ex:1",
+          "test": "foo"
+        }
+      })
+      frame = %({
+        "@context": {
+          "@version": 1.1,
+          "@vocab": "https://example.com#",
+          "ex": "http://example.org/",
+          "claim": {
+            "@id": "ex:claim",
+            "@container": "@graph"
+          },
+          "id": "@id"
+        },
+        "claim": {}
+      })
+      expected = %({
+        "@context": {
+          "@version": 1.1,
+          "@vocab": "https://example.com#",
+          "ex": "http://example.org/",
+          "claim": {
+            "@id": "ex:claim",
+            "@container": "@graph"
+          },
+          "id": "@id"
+        },
+        "@graph": [
+          {
+            "claim": {
+              "id": "ex:1",
+              "test": "foo"
+            }
+          }
+        ]
+      })
+      do_frame(input: input, frame: frame, output: expected, processingMode: 'json-ld-1.1')
+    end
+
+    it "PR #663" do
+      input = %({
+        "@context": {
+          "@vocab": "http://example.com/",
+          "loves": {
+            "@type": "@id"
+          },
+          "unionOf": {
+            "@type": "@id",
+            "@id": "owl:unionOf",
+            "@container": "@list"
+          },
+          "Class": "owl:Class"
+        },
+        "@graph": [
+          {
+            "@type": "Act",
+            "@graph": [
+              {
+                "@id": "Romeo",
+                "@type": "Person"
+              },
+              {
+                "@id": "Juliet",
+                "@type": "Person"
+              }
+            ]
+          },
+          {
+            "@id": "ActTwo",
+            "@type": "Act",
+            "@graph": [
+              {
+                "@id": "Romeo",
+                "@type": "Person",
+                "loves": "Juliet"
+              },
+              {
+                "@id": "Juliet",
+                "@type": "Person",
+                "loves": "Romeo"
+              }
+            ]
+          },
+          {
+            "@id": "Person",
+            "@type": "Class",
+            "unionOf": {
+              "@list": [
+                {
+                  "@id": "Montague",
+                  "@type": "Class"
+                },
+                {
+                  "@id": "Capulet",
+                  "@type": "Class"
+                }
+              ]
+            }
+          }
+        ]
+      })
+      frame = %({
+        "@context": {
+          "@vocab": "http://example.com/",
+          "loves": {
+            "@type": "@id"
+          },
+          "unionOf": {
+            "@type": "@id",
+            "@id": "owl:unionOf",
+            "@container": "@list"
+          },
+          "Class": "owl:Class"
+        },
+        "@graph": [
+          {
+            "@explicit": false,
+            "@embed": "@last",
+            "@type": [
+              "Act",
+              "Class"
+            ],
+            "@graph": [{
+              "@explicit": true,
+              "@embed": "@always",
+              "@type": "Person",
+              "@id": {},
+              "loves": {"@embed": "@never"}
+            }]
+          }
+        ]
+      })
+      expected = %({
+        "@context": {
+          "@vocab": "http://example.com/",
+          "loves": {
+            "@type": "@id"
+          },
+          "unionOf": {
+            "@type": "@id",
+            "@id": "owl:unionOf",
+            "@container": "@list"
+          },
+          "Class": "owl:Class"
+        },
+        "@graph": [
+          {
+            "@graph": [
+              {
+                "@id": "Juliet",
+                "@type": "Person",
+                "loves": "Romeo"
+              },
+              {
+                "@id": "Romeo",
+                "@type": "Person",
+                "loves": "Juliet"
+              }
+            ],
+            "@id": "ActTwo",
+            "@type": "Act"
+          },
+          {
+            "@id": "Capulet",
+            "@type": "Class"
+          },
+          {
+            "@id": "Montague",
+            "@type": "Class"
+          },
+          {
+            "@id": "Person",
+            "@type": "Class",
+            "unionOf": [
+              {
+                "@id": "Montague",
+                "@type": "Class"
+              },
+              {
+                "@id": "Capulet",
+                "@type": "Class"
+              }
+            ]
+          },
+          {
+            "@graph": [
+              {
+                "@id": "Juliet",
+                "@type": "Person",
+                "loves": null
+              },
+              {
+                "@id": "Romeo",
+                "@type": "Person",
+                "loves": null
+              }
+            ],
+            "@type": "Act"
+          }
+        ]
+      })
+      do_frame(input: input, frame: frame, output: expected, processingMode: 'json-ld-1.1')
+    end
   end
 
   def do_frame(params)
     begin
-      input, frame, output, prune = params[:input], params[:frame], params[:output], params.fetch(:prune, true)
+      input, frame, output, processingMode = params[:input], params[:frame], params[:output], params.fetch(:processingMode, 'json-ld-1.0')
       input = ::JSON.parse(input) if input.is_a?(String)
       frame = ::JSON.parse(frame) if frame.is_a?(String)
       output = ::JSON.parse(output) if output.is_a?(String)
-      jld = JSON::LD::API.frame(input, frame, logger: logger, pruneBlankNodeIdentifiers: prune)
+      jld = JSON::LD::API.frame(input, frame, logger: logger, processingMode: processingMode)
       expect(jld).to produce(output, logger)
     rescue JSON::LD::JsonLdError => e
       fail("#{e.class}: #{e.message}\n" +