Fix JSON-LD data import adds trailing slashes to IRIs (#1443) by newinnovations · Pull Request #1456 · RDFLib/rdflib (original) (raw)

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation19 Commits5 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

In norm_url leave url alone if it already contains a scheme/protocol.

Fixes #1443

In norm_url leave url alone if it already contains a scheme/protocol.

hi @newinnovations, thanks for the patch, I'm going to try write some tests for this issue just to think of the problem a bit and will hopefully make a pull request against your branch to include them soon.

If you have some capacity please consider reviewing #1436 as some type checking I'm adding to verify your PR is dependent on that and we should ideally get that merged.

@aucampia I was looking at this to add a test and it is unclear how this should be done. My best guess at this point is to add an *-in.jsonld and *-out.nq pair of files to test/jsonld/1.1/toRdf and then add an entry to test/jsonld/1.1/toRdf-manifest.jsonld, but I'm unsure what the convention is for the alphabetic-character prefixes before the test file names like "so" and "tn" and "wf". Please advise.

@dwinston I'm actually just adding these tests:

20211028T204316 iwana@teekai.zoic.eu.org:~/sw/d/github.com/iafork/rdflib
$ cat test/jsonld/test_urls.py 
import unittest
from rdflib.namespace import Namespace
from rdflib.plugins.shared.jsonld.util import norm_url
from rdflib import Graph
from rdflib.term import URIRef


class JsonLDURLTests(unittest.TestCase):
    # @unittest.expectedFailure
    def test_norm_url(self):
        self.assertEqual(norm_url("http://example.com", ""), "http://example.com")

    # @unittest.expectedFailure
    def test_trailing_slash(self):

        json_data = """\
          [
            {
              "@id": "http://example.com/instance/0",
              "http://example.com/vocab#property": [
                {
                  "@id": "http://some.example.com"
                }
              ]
            }
          ]
        """
        g = Graph()
        g.parse(data=json_data, format="json-ld")
        triples = set(g.triples((None, None, None)))
        self.assertEqual(
            triples,
            {
                (
                    URIRef("http://example.com/instance/0"),
                    URIRef("http://example.com/vocab#property"),
                    URIRef("http://some.example.com"),
                )
            },
        )

Other tests are also possible but this is completely fine I guess, but I want to add a bit more type hints also.

cool, I am definitely fine with adding a new test_*.py file to test a particular issue. :)

Actually doctests will also do it probably, will make PR shortly, was just trying to figure out what the situation is with typing, if base could ever be None, and it seems it both can and if it is things will go quite horribly wrong, but that is an issue for another time