Fix typos and add security ontology to build targets

Julien LepillerTue Jan 28 05:16:35+0100 2020

2d6edf8

Fix typos and add security ontology to build targets

Makefile.am

66
SOURCES= \
77
  activitystreams/activitystreams.scm \
88
  activitystreams/ontology.scm \
9+
  http-signature/ontology.scm \
910
  webfinger/webfinger.scm
1011
1112
info_TEXINFOS= doc/guile-fediverse.texi

http-signature/ontology.scm

1515
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1616
;;;; 
1717
18-
(define-module (http-signatures ontology)
18+
(define-module (http-signature ontology)
1919
  #:use-module (activitystreams activitystreams)
2020
  #:use-module (ice-9 match)
2121
  #:use-module (jsonld json)

2828
                        (comment "") (subclass-of '()))
2929
  (make-as-type label #:uri uri #:comment comment #:subclass-of subclass-of))
3030
31-
(define* (make-as-property label domain range
32-
                           #:key (uri (string-append as:vocab label))
31+
(define* (make-sec-property label domain range
32+
                           #:key (uri (string-append sec:vocab label))
3333
                           (functional? #f) (subproperty-of '()) (comment ""))
3434
  (make-as-property label domain range #:uri uri #:functional? functional?
3535
                    #:subproperty-of subproperty-of #:comment comment))
3636
37+
(define date? (@@ (activitystreams ontology) date?))
38+
(define iri? (@@ (activitystreams ontology) iri?))
39+
3740
;; Classes
3841
3942
(define sec:Digest

109112
(define sec:authenticationTag
110113
  (make-sec-property
111114
    "authenticationTag" "EncryptedMessage" string?
112-
    #:coment
115+
    #:comment
113116
    "Not specified"))
114117
115118
(define sec:creator
116119
  (make-sec-property
117120
    "creator" "Signature" iri?
118-
    #:coment
121+
    #:comment
119122
    "Not specified"))
120123
121124
(define sec:cipherAlgorithm

292295
        sec:privateKeyPem sec:publicKey sec:publicKeyPem sec:publicKeyService
293296
        sec:revoked sec:signature sec:signatureValue sec:signatureAlgorithm))
294297
295-
(define (security-ontology (append sec-types sec-properties)))
298+
(define security-ontology (append sec-types sec-properties))