fix mk keys url compat

Author: majidaldo

src/json2rdf/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "71" # shoud equal `git rev-list --count master`
+__version__ = "72" # shoud equal `git rev-list --count master`
                    # can roll back to 0 if errors
 from .json2rdf import json2rdf, j2r

src/json2rdf/json2rdf.py

@@ -46,7 +46,7 @@ class anonID(ID): ...
         # subject_key = subject_keys[0] 
         # @classproperty 'deprecated'
         # def subject_key
-        object_keys = {'refid',}
+        object_keys = {'refid', 'idref' }
 
         class list:
             key =   '__rdftype__'
@@ -202,16 +202,21 @@ def __str__(self) -> str:
                 _ = _ + super().__str__()
                 return _
 
+        from urllib.parse import quote as uq
         @classmethod
         def triple(cls, s, p, o):
             m = {True: 'true', False:'false', None: '\"null\"'} # not rdf:nil which is specific to a rdf:List
             from types import NoneType
             # SUBJECT
             assert(isinstance(s, Identification.ID))
             if type(s) is Identification.ID:
+                s = str(s)
+                s = cls.uq(s)
                 s = f'{cls.list.id_prefix}:{s}'
             else:
                 assert(type(s) is Identification.anonID)
+                s = str(s)
+                s = cls.uq(s)
                 s = f'_:{s}'
             # special list/seq handling
             if p == Identification.list.key and o == Identification.list.value:
@@ -223,10 +228,7 @@ def triple(cls, s, p, o):
                 p = f'rdf:_{p}'
             else:
                 assert(isinstance(p, str))
-                p = p.replace(' ', '_')
-                # create legal by dropping non alpha num
-                # url encodeing?
-                p = ''.join(c for c in p if c.isalnum() or c == '_')
+                p = cls.uq(p)
                 p = f'{cls.list.key_prefix}:{p}'
 
             # OBJECT
@@ -250,9 +252,13 @@ def triple(cls, s, p, o):
                 o = m[o]
             elif isinstance(o, Identification.ID):
                 if type(o) is Identification.ID:
+                    o = str(o)
+                    o = cls.uq(o)
                     o = f'{cls.list.id_prefix}:{o}'
                 else:
                     assert(type(o) is Identification.anonID)
+                    o = str(o)
+                    o = cls.uq(o)
                     o = f'_:{o}'
             else:
                 o = str(o)

test/test.py

@@ -11,6 +11,13 @@ def json():
         'dwid': {
             'id': 33,
             'k': 'v'
+        },
+        'dwbadid': {
+            'id':    "sdfsdf \" : ! @ # ",
+            'refid': "sdfsdf \" : ! @ # ",
+            "horrible key @ *$ \" ": "!@#$ sdf  ",
+            "key_w_us": "has nice key",
+            "CamelCase": "has nice key",
         }
     }
 

test/test/.gitignore

@@ -1,28 +1,33 @@
 prefix rdf:                   <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
 prefix id:      <urn:example:id:>     
 prefix prefix:     <urn:example:prefix:>    
-prefix meta:    <urn:example:meta:>   
 
-_:2380581804288 prefix:k _:2380627818112.
-_:2380616502144 rdf:_0 _:2380627815424.
-_:2380616502144 rdf:type rdf:Seq.
-_:2380627776832 prefix:dwid id:33.
-_:2380627776832 prefix:ed _:2380627818880.
-_:2380627776832 prefix:el _:2380627818944.
-_:2380627776832 prefix:k _:2380616502144.
-_:2380627776832 prefix:kk _:2380581804288.
-_:2380627776832 prefix:l _:2380627819072.
-_:2380627815424 prefix:k 3.
-_:2380627815424 prefix:kk "dil".
-_:2380627815424 prefix:kkk true.
-_:2380627818112 prefix:k "did".
-_:2380627818944 rdf:type rdf:Seq.
-_:2380627819072 rdf:_0 1.
-_:2380627819072 rdf:_1 2.
-_:2380627819072 rdf:_2 3.
-_:2380627819072 rdf:_3 "a".
-_:2380627819072 rdf:_4 "b".
-_:2380627819072 rdf:_5 "c".
-_:2380627819072 rdf:type rdf:Seq.
+_:2406051654912 prefix:dwbadid id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20.
+_:2406051654912 prefix:dwid id:33.
+_:2406051654912 prefix:ed _:2406089670336.
+_:2406051654912 prefix:el _:2406089670400.
+_:2406051654912 prefix:k _:2406089764352.
+_:2406051654912 prefix:kk _:2406052732160.
+_:2406051654912 prefix:l _:2406089670528.
+_:2406052732160 prefix:k _:2406089530496.
+_:2406089530496 prefix:k "did".
+_:2406089670400 rdf:type rdf:Seq.
+_:2406089670528 rdf:_0 1.
+_:2406089670528 rdf:_1 2.
+_:2406089670528 rdf:_2 3.
+_:2406089670528 rdf:_3 "a".
+_:2406089670528 rdf:_4 "b".
+_:2406089670528 rdf:_5 "c".
+_:2406089670528 rdf:type rdf:Seq.
+_:2406089764352 rdf:_0 _:2406089764416.
+_:2406089764352 rdf:type rdf:Seq.
+_:2406089764416 prefix:k 3.
+_:2406089764416 prefix:kk "dil".
+_:2406089764416 prefix:kkk true.
 id:33 prefix:id 33.
-id:33 prefix:k "v".
+id:33 prefix:k "v".
+id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20 prefix:CamelCase "has nice key".
+id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20 prefix:horrible%20key%20%40%20%2A%24%20%22%20 "!@#$ sdf  ".
+id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20 prefix:id "sdfsdf \" : ! @ # ".
+id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20 prefix:key_w_us "has nice key".
+id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20 prefix:refid id:sdfsdf%20%22%20%3A%20%21%20%40%20%23%20.