namespace updates

2 files changed, 64 insertions, 57 deletions

diff --git a/tagit/apps/port-schema.nt b/tagit/apps/port-schema.nt
index 7569052..2e70cad 100644
--- a/tagit/apps/port-schema.nt
+++ b/tagit/apps/port-schema.nt
@@ -5,57 +5,59 @@ prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix schema: <http://schema.org/>
 
 # common bsfs prefixes
-prefix bsfs: <http://bsfs.ai/schema/>
-prefix bse: <http://bsfs.ai/schema/Entity#>
-prefix bst: <http://bsfs.ai/schema/Tag#>
-prefix bsg: <http://bsfs.ai/schema/Group#>
-prefix bsp: <http://bsfs.ai/schema/Preview#>
+prefix bsfs: <https://schema.bsfs.io/core/>
+prefix bsl: <https://schema.bsfs.io/core/Literal/>
+prefix bsn: <https://schema.bsfs.io/ie/Node/>
+prefix bse: <https://schema.bsfs.io/ie/Node/Entity#>
+prefix bst: <https://schema.bsfs.io/ie/Node/Tag#>
+prefix bsg: <https://schema.bsfs.io/ie/Node/Group#>
+prefix bsp: <https://schema.bsfs.io/ie/Node/Preview#>
 
 # essential nodes
-bsfs:Entity rdfs:subClassOf bsfs:Node .
-bsfs:Preview rdfs:subClassOf bsfs:Node .
-bsfs:File rdfs:subClassOf bsfs:Entity .
-bsfs:Tag rdfs:subClassOf bsfs:Node .
-bsfs:Group rdfs:subClassOf bsfs:Node .
+bsn:Entity rdfs:subClassOf bsfs:Node .
+bsn:Preview rdfs:subClassOf bsfs:Node .
+bsn:Tag rdfs:subClassOf bsfs:Node .
+bsn:Group rdfs:subClassOf bsfs:Node .
 
 # common definitions
-bsfs:BinaryBlob rdfs:subClassOf bsfs:Literal .
-bsfs:URI rdfs:subClassOf bsfs:Literal .
-bsfs:Number rdfs:subClassOf bsfs:Literal .
-bsfs:Time rdfs:subClassOf bsfs:Literal .
-bsfs:JPEG rdfs:subClassOf bsfs:BinaryBlob .
+bsl:BinaryBlob rdfs:subClassOf bsfs:Literal .
+bsl:URI rdfs:subClassOf bsfs:Literal .
+bsl:Number rdfs:subClassOf bsfs:Literal .
+bsl:Time rdfs:subClassOf bsfs:Literal .
+<https://schema.bsfs.io/ie/Literal/BinaryBlob/JPEG> rdfs:subClassOf bsl:BinaryBlob .
 xsd:string rdfs:subClassOf bsfs:Literal .
-xsd:integer rdfs:subClassOf bsfs:Number .
+xsd:integer rdfs:subClassOf bsl:Number .
+xsd:float rdfs:subClassOf bsl:Number .
 
 bse:filename rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:File ;
+    rdfs:domain bsn:Entity ;
     rdfs:range xsd:string ;
     rdfs:label "File name"^^xsd:string ;
     schema:description "Filename of entity in some filesystem."^^xsd:string ;
     bsfs:unique "true"^^xsd:boolean .
 
 bse:filesize rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:File ;
+    rdfs:domain bsn:Entity ;
     rdfs:range xsd:integer ;
     rdfs:label "File size"^^xsd:string ;
     schema:description "File size of entity in some filesystem."^^xsd:string ;
     bsfs:unique "true"^^xsd:boolean .
 
 bse:mime rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:File ;
+    rdfs:domain bsn:Entity ;
     rdfs:range xsd:string ;
     bsfs:unique "true"^^xsd:boolean .
 
 bse:preview rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Entity ;
-    rdfs:range bsfs:Preview .
+    rdfs:domain bsn:Entity ;
+    rdfs:range bsn:Preview .
 
 bse:tag rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:File ;
-    rdfs:range bsfs:Tag .
+    rdfs:domain bsn:Entity ;
+    rdfs:range bsn:Tag .
 
 bst:label rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Tag ;
+    rdfs:domain bsn:Tag ;
     rdfs:range xsd:string ;
     bsfs:unique "true"^^xsd:boolean .
 
@@ -64,45 +66,50 @@ bse:comment rdfs:subClassOf bsfs:Predicate ;
     rdfs:range xsd:string .
 
 bse:group rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Entity ;
-    rdfs:range bsfs:Group .
+    rdfs:domain bsn:Entity ;
+    rdfs:range bsn:Group .
+
+bsg:label rdfs:subClassOf bsfs:Predicate ;
+    rdfs:domain bsn:Group ;
+    rdfs:range xsd:string ;
+    bsfs:unique "true"^^xsd:boolean .
 
 bsg:represented_by rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Group ;
-    rdfs:range bsfs:File ;
+    rdfs:domain bsn:Group ;
+    rdfs:range bsn:Entity ;
     bsfs:unique "true"^^xsd:boolean .
 
 bse:longitude rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:File ;
-    rdfs:range xsd:integer ;
+    rdfs:domain bsn:Entity ;
+    rdfs:range xsd:float ;
     bsfs:unique "true"^^xsd:boolean .
 
 bse:latitude rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:File ;
-    rdfs:range xsd:integer ;
+    rdfs:domain bsn:Entity ;
+    rdfs:range xsd:float ;
     bsfs:unique "true"^^xsd:boolean .
 
 
 ## preview nodes
 
 bsp:width rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Preview ;
+    rdfs:domain bsn:Preview ;
     rdfs:range xsd:integer ;
     bsfs:unique "true"^^xsd:boolean .
 
 bsp:height rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Preview ;
+    rdfs:domain bsn:Preview ;
     rdfs:range xsd:integer ;
     bsfs:unique "true"^^xsd:boolean .
 
 bsp:orientation rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Preview ;
+    rdfs:domain bsn:Preview ;
     rdfs:range xsd:integer ;
     bsfs:unique "true"^^xsd:boolean .
 
 bsp:asset rdfs:subClassOf bsfs:Predicate ;
-    rdfs:domain bsfs:Preview ;
-    rdfs:range bsfs:JPEG ;
+    rdfs:domain bsn:Preview ;
+    rdfs:range <https://schema.bsfs.io/ie/Literal/BinaryBlob/JPEG> ;
     bsfs:unique "true"^^xsd:boolean .
 
 
diff --git a/tagit/apps/port_data.py b/tagit/apps/port_data.py
index fc11b4d..11faaef 100644
--- a/tagit/apps/port_data.py
+++ b/tagit/apps/port_data.py
@@ -16,42 +16,42 @@ def add_port_data(store):
 
 def add_port_data2(store):
         # tags
-        t_hello = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#hello')) \
+        t_hello = store.node(ns.bsn.Tag, URI('http://example.com/me/tag#hello')) \
                 .set(ns.bst.label, 'hello')
-        t_world = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#world')) \
+        t_world = store.node(ns.bsn.Tag, URI('http://example.com/me/tag#world')) \
                 .set(ns.bst.label, 'world')
-        t_foobar = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#foobar')) \
+        t_foobar = store.node(ns.bsn.Tag, URI('http://example.com/me/tag#foobar')) \
                 .set(ns.bst.label, 'foobar')
 
         # entities
-        n0 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#01')) \
+        n0 = store.node(ns.bsn.Entity, URI('http://example.com/me/entity#01')) \
                 .set(ns.bse.filename, 'textfile.t') \
                 .set(ns.bse.filesize, 100) \
                 .set(ns.bse.tag, t_hello) \
                 .set(ns.bse.tag, t_foobar) \
                 .set(ns.bse.latitude, 47.374444) \
                 .set(ns.bse.longitude, 8.541111)
-        n1 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#02')) \
+        n1 = store.node(ns.bsn.Entity, URI('http://example.com/me/entity#02')) \
                 .set(ns.bse.filename, 'document.pdf') \
                 .set(ns.bse.filesize, 200) \
                 .set(ns.bse.tag, t_world) \
                 .set(ns.bse.tag, t_foobar)
-        n2 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#03')) \
+        n2 = store.node(ns.bsn.Entity, URI('http://example.com/me/entity#03')) \
                 .set(ns.bse.filename, 'document.odt') \
                 .set(ns.bse.filesize, 300) \
                 .set(ns.bse.tag, t_world)
-        n3 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#04')) \
+        n3 = store.node(ns.bsn.Entity, URI('http://example.com/me/entity#04')) \
                 .set(ns.bse.filename, 'image.jpg') \
                 .set(ns.bse.comment, 'some image') \
                 .set(ns.bse.tag, t_hello) \
                 .set(ns.bse.tag, t_foobar)
-        n4 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#05')) \
+        n4 = store.node(ns.bsn.Entity, URI('http://example.com/me/entity#05')) \
                 .set(ns.bse.filename, 'image.png') \
                 .set(ns.bse.comment, 'another image') \
                 .set(ns.bse.tag, t_hello)
 
         # groups
-        grp = store.node(ns.bsfs.Group, URI('http://example.com/me/group#1234'))
+        grp = store.node(ns.bsn.Group, URI('http://example.com/me/group#1234'))
         grp.set(ns.bsg.represented_by, n0)
         n0.set(ns.bse.group, grp)
         n1.set(ns.bse.group, grp)
@@ -60,77 +60,77 @@ def add_port_data2(store):
         # previews
         base = os.path.join(os.path.dirname(__file__), 'port-data')
         n0.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent01_w100_h100')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent01_w100_h100')) \
                 .set(ns.bsp.width, 100) \
                 .set(ns.bsp.height, 100) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w100_h100.jpg'), 'rb').read())
                 )
         n0.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, str('http://example.com/me/preview#ent01_w400_h200')) \
+            store.node(ns.bsn.Preview, str('http://example.com/me/preview#ent01_w400_h200')) \
                 .set(ns.bsp.width, 200) \
                 .set(ns.bsp.height, 400) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w400_h200.jpg'), 'rb').read())
                 )
         n0.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent01_w400_h400')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent01_w400_h400')) \
                 .set(ns.bsp.width, 400) \
                 .set(ns.bsp.height, 400) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w400_h400.jpg'), 'rb').read())
                 )
         n1.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent02_w100_h100')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent02_w100_h100')) \
                 .set(ns.bsp.width, 100) \
                 .set(ns.bsp.height, 100) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent02_w100_h100.jpg'), 'rb').read())
                 )
         n1.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent02_w400_h200')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent02_w400_h200')) \
                 .set(ns.bsp.width, 200) \
                 .set(ns.bsp.height, 400) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent02_w400_h200.jpg'), 'rb').read())
                 )
         n2.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent03_w100_h100')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent03_w100_h100')) \
                 .set(ns.bsp.width, 100) \
                 .set(ns.bsp.height, 100) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent03_w100_h100.jpg'), 'rb').read())
                 )
         n2.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent03_w400_h200')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent03_w400_h200')) \
                 .set(ns.bsp.width, 200) \
                 .set(ns.bsp.height, 400) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent03_w400_h200.jpg'), 'rb').read())
                 )
         n3.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent04_w100_h100')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent04_w100_h100')) \
                 .set(ns.bsp.width, 100) \
                 .set(ns.bsp.height, 100) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent04_w100_h100.png'), 'rb').read())
                 )
         n3.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent04_w400_h200')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent04_w400_h200')) \
                 .set(ns.bsp.width, 200) \
                 .set(ns.bsp.height, 400) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent04_w400_h200.png'), 'rb').read())
                 )
         n4.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent05_w100_h100')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent05_w100_h100')) \
                 .set(ns.bsp.width, 100) \
                 .set(ns.bsp.height, 100) \
                 .set(ns.bsp.orientation, 1) \
                 .set(ns.bsp.asset, open(os.path.join(base, 'ent05_w100_h100.jpg'), 'rb').read())
                 )
         n4.set(ns.bse.preview,
-            store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent05_w400_h200')) \
+            store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent05_w400_h200')) \
                 .set(ns.bsp.width, 200) \
                 .set(ns.bsp.height, 400) \
                 .set(ns.bsp.orientation, 1) \