Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make string operations on URIRefs return URIRefs #258

Closed
wants to merge 2 commits into from
Closed

Make string operations on URIRefs return URIRefs #258

wants to merge 2 commits into from

Conversation

dgerber
Copy link

@dgerber dgerber commented Mar 28, 2013

Currently, concatenation, formatting or %-substitution demote URIRefs to unicode. It would be nice if they behaved like this instead:

In [13]: u = URIRef('/books/{book}/chapters/{chapter}')

In [14]: u.format(book='123', chapter=3)
Out[14]: rdflib.term.URIRef(u'/books/123/chapters/3')

In [15]: 'http://example.org' + _ + '#frag'
Out[15]: rdflib.term.URIRef(u'http://example.org/books/123/chapters/3#frag')

In [16]: URIRef('/books/%s/chapters/%s') % (23, 45)
Out[16]: rdflib.term.URIRef(u'/books/23/chapters/45')

Implementation:

class URIRef(Identifier):

def __add__(self, other):
    return self.__class__(unicode(self) + other)

def __radd__(self, other):
    return self.__class__(other + unicode(self))

def format(self, *args, **kwargs):
    return self.__class__(unicode(self).format(*args, **kwargs))

def __mod__(self, other):
    return self.__class__(unicode(self) % other)

This __mod__ conflicts with property paths unary operators *, ? and + in rdflib_sparql. These could be expressed with (*, __mul__, same precedence as %) or (**, __pow__, higher precedence) instead.

@gromgull gromgull closed this May 1, 2013
@dgerber
Copy link
Author

dgerber commented May 1, 2013

Am I missing any disadvantage of using * for property path quantifiers, and assigning to % the same meaning as it has in the unicode superclass?

@gromgull
Copy link
Member

gromgull commented May 2, 2013

dgerber: I am very sorry I have no idea why I closed this - I tried to close something else :)

I'll make the changes soon!

@gromgull
Copy link
Member

gromgull commented May 2, 2013

Now where is the "reopen pull request button" ...

@gromgull
Copy link
Member

gromgull commented May 2, 2013

Merged! Thanks for the contribution - really sorry that I just closed without a word :)

@uholzer
Copy link
Contributor

uholzer commented May 2, 2013

Wait! Doesn't this conflict with #266? Most template strings for format are invalid URIs, since they contain characters like <, > and {, }. As a consequence, the example from dgerber fails:

>>> import rdflib
>>> rdflib.URIRef('/books/{book}/chapters/{chapter}')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/home/urs/.local/lib/python3.2/site-packages/rdflib/term.py", line 198, in __new__
    raise Exception('%s does not look like a valid URI, perhaps you want to urlencode it?')
Exception: %s does not look like a valid URI, perhaps you want to urlencode it?

I think it is better to not implement format on URIRefs and instead use

f = '/books/{book}/chapters/{chapter}'
URIRef(f.format('a','b'))

@gromgull
Copy link
Member

gromgull commented May 2, 2013

Hmm - good point - I only tested it with "%d" - which is fine.

Shame, since I quite like generating URIs by formatting.

Maybe a better solution is to add this to the namespace class - for some reason I do not understand namespace subclasses URIRef, this causes lots of problems. If you remove the subclassing and add formatting to namespace?

>>> Namespace("http://example.org/persons/{id}/resource") % 32

??

@dgerber
Copy link
Author

dgerber commented May 2, 2013

%-substitution won't play well either with %-encoding...

So if URIRef is to be more restrictive, I agree that the Namespace solution (or some URIPattern class) is better.

The only feature I'm actually using is + to build hierarchical uris:

>>> b = URIRef('http://example.org/books/1984')
>>> chapter = b + '/chapters/1'

gromgull added a commit that referenced this pull request May 3, 2013
@gromgull
Copy link
Member

gromgull commented May 3, 2013

How about this?

I removed the format method from URIRef, and made a new URIpattern class (see 249912e)

mamash pushed a commit to TritonDataCenter/pkgsrc-wip that referenced this pull request Feb 15, 2014
	2013/12/31 RELEASE 4.1
======================

This is a new minor version RDFLib, which includes a handful of new features:

* A TriG parser was added (we already had a serializer) - it is
  up-to-date wrt. to the newest spec from: http://www.w3.org/TR/trig/

* The Turtle parser was made up to date wrt. to the latest Turtle spec.

* Many more tests have been added - RDFLib now has over 2000
  (passing!) tests. This is mainly thanks to the NT, Turtle, TriG,
  NQuads and SPARQL test-suites from W3C. This also included many
  fixes to the nt and nquad parsers.

* ```ConjunctiveGraph``` and ```Dataset``` now support directly adding/removing
  quads with ```add/addN/remove``` methods.

* ```rdfpipe``` command now supports datasets, and reading/writing context
  sensitive formats.

* Optional graph-tracking was added to the Store interface, allowing
  empty graphs to be tracked for Datasets. The DataSet class also saw
  a general clean-up, see: RDFLib/rdflib#309

* After long deprecation, ```BackwardCompatibleGraph``` was removed.

Minor enhancements/bugs fixed:
------------------------------

* Many code samples in the documentation were fixed thanks to @PuckCh

* The new ```IOMemory``` store was optimised a bit

* ```SPARQL(Update)Store``` has been made more generic.

* MD5 sums were never reinitialized in ```rdflib.compare```

* Correct default value for empty prefix in N3
  [#312]RDFLib/rdflib#312

* Fixed tests when running in a non UTF-8 locale
  [#344]RDFLib/rdflib#344

* Prefix in the original turtle have an impact on SPARQL query
  resolution
  [#313]RDFLib/rdflib#313

* Duplicate BNode IDs from N3 Parser
  [#305]RDFLib/rdflib#305

* Use QNames for TriG graph names
  [#330]RDFLib/rdflib#330

* \uXXXX escapes in Turtle/N3 were fixed
  [#335]RDFLib/rdflib#335

* A way to limit the number of triples retrieved from the
  ```SPARQLStore``` was added
  [#346]RDFLib/rdflib#346

* Dots in localnames in Turtle
  [#345]RDFLib/rdflib#345
  [#336]RDFLib/rdflib#336

* ```BNode``` as Graph's public ID
  [#300]RDFLib/rdflib#300

* Introduced ordering of ```QuotedGraphs```
  [#291]RDFLib/rdflib#291

2013/05/22 RELEASE 4.0.1
========================

Following RDFLib tradition, some bugs snuck into the 4.0 release.
This is a bug-fixing release:

* the new URI validation caused lots of problems, but is
  nescessary to avoid ''RDF injection'' vulnerabilities. In the
  spirit of ''be liberal in what you accept, but conservative in
  what you produce", we moved validation to serialisation time.

* the   ```rdflib.tools```   package    was   missing   from   the
  ```setup.py```  script, and  was therefore  not included  in the
  PYPI tarballs.

* RDF parser choked on empty namespace URI
  [#288](RDFLib/rdflib#288)

* Parsing from ```sys.stdin``` was broken
  [#285](RDFLib/rdflib#285)

* The new IO store had problems with concurrent modifications if
  several graphs used the same store
  [#286](RDFLib/rdflib#286)

* Moved HTML5Lib dependency to the recently released 1.0b1 which
  support python3

2013/05/16 RELEASE 4.0
======================

This release includes several major changes:

* The new SPARQL 1.1 engine (rdflib-sparql) has been included in
  the core distribution. SPARQL 1.1 queries and updates should
  work out of the box.

  * SPARQL paths are exposed as operators on ```URIRefs```, these can
    then be be used with graph.triples and friends:

    ```py
    # List names of friends of Bob:
    g.triples(( bob, FOAF.knows/FOAF.name , None ))

    # All super-classes:
    g.triples(( cls, RDFS.subClassOf * '+', None ))
    ```

      * a new ```graph.update``` method will apply SPARQL update statements

* Several RDF 1.1 features are available:
  * A new ```DataSet``` class
  * ```XMLLiteral``` and ```HTMLLiterals```
  * ```BNode``` (de)skolemization is supported through ```BNode.skolemize```,
    ```URIRef.de_skolemize```, ```Graph.skolemize``` and ```Graph.de_skolemize```

* Handled of Literal equality was split into lexical comparison
  (for normal ```==``` operator) and value space (using new ```Node.eq```
  methods). This introduces some slight backwards incomaptible
  changes, but was necessary, as the old version had
  inconsisten hash and equality methods that could lead the
  literals not working correctly in dicts/sets.
  The new way is more in line with how SPARQL 1.1 works.
  For the full details, see:

  https://github.com/RDFLib/rdflib/wiki/Literal-reworking

* Iterating over ```QueryResults``` will generate ```ResultRow``` objects,
  these allow access to variable bindings as attributes or as a
  dict. I.e.

  ```py
  for row in graph.query('select ... ') :
     print row.age, row["name"]
  ```

* "Slicing" of Graphs and Resources as syntactic sugar:
  ([#271](RDFLib/rdflib#271))

  ```py
  graph[bob : FOAF.knows/FOAF.name]
            -> generator over the names of Bobs friends
  ```

* The ```SPARQLStore``` and ```SPARQLUpdateStore``` are now included
  in the RDFLib core

* The documentation has been given a major overhaul, and examples
  for most features have been added.


Minor Changes:
--------------

* String operations on URIRefs return new URIRefs: ([#258](RDFLib/rdflib#258))
  ```py
  >>> URIRef('http://example.org/')+'test
  rdflib.term.URIRef('http://example.org/test')
  ```

* Parser/Serializer plugins are also found by mime-type, not just
  by plugin name:  ([#277](RDFLib/rdflib#277))
* ```Namespace``` is no longer a subclass of ```URIRef```
* URIRefs and Literal language tags are validated on construction,
  avoiding some "RDF-injection" issues ([#266](RDFLib/rdflib#266))
* A new memory store needs much less memory when loading large
  graphs ([#268](RDFLib/rdflib#268))
* Turtle/N3 serializer now supports the base keyword correctly ([#248](RDFLib/rdflib#248))
* py2exe support was fixed ([#257](RDFLib/rdflib#257))
* Several bugs in the TriG serializer were fixed
* Several bugs in the NQuads parser were fixed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants