From 5e718406627578036e2d4a695b3309ae524b2cf7 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Mon, 7 Aug 2023 08:34:39 +0200 Subject: [PATCH] rename --- project.clj | 4 ++-- .../{activity_pub_poc => fed_poc}/activitystreams2.cljc | 8 ++++---- .../{activity_pub_poc => fed_poc}/core.cljc | 4 ++-- .../{activity_pub_poc => fed_poc}/owl.cljc | 4 ++-- .../{activity_pub_poc => fed_poc}/predicates.cljc | 2 +- .../{activity_pub_poc => fed_poc}/spec_helper.cljc | 2 +- .../{activity_pub_poc => fed_poc}/xsd.cljc | 4 ++-- .../activitystreams2_test.cljc | 6 +++--- .../{activity_pub_poc => fed_poc}/core_test.cljc | 8 +++----- .../{activity_pub_poc => fed_poc}/owl_test.cljc | 4 ++-- .../{activity_pub_poc => fed_poc}/spec_helper_test.cljc | 6 +++--- .../{activity_pub_poc => fed_poc}/xsd_test.cljc | 4 ++-- .../activity_pub_poc/activitystreams2_legacy.clj | 6 +++--- .../domaindrivenarchitecture/activity_pub_poc/common.clj | 2 +- .../domaindrivenarchitecture/activity_pub_poc/core.clj | 4 ++-- .../activity_pub_poc/core_test.clj | 4 ++-- .../domaindrivenarchitecture/activity_pub_poc/parser.clj | 4 ++-- .../activity_pub_poc/parser_test.clj | 4 ++-- 18 files changed, 39 insertions(+), 41 deletions(-) rename src/main/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/activitystreams2.cljc (91%) rename src/main/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/core.cljc (87%) rename src/main/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/owl.cljc (89%) rename src/main/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/predicates.cljc (71%) rename src/main/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/spec_helper.cljc (91%) rename src/main/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/xsd.cljc (51%) rename src/test/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/activitystreams2_test.cljc (95%) rename src/test/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/core_test.cljc (85%) rename src/test/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/owl_test.cljc (85%) rename src/test/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/spec_helper_test.cljc (51%) rename src/test/cljc/org/domaindrivenarchitecture/{activity_pub_poc => fed_poc}/xsd_test.cljc (52%) diff --git a/project.clj b/project.clj index 4084f5e..2f290d4 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject activity-pub-poc "0.1.0-SNAPSHOT" +(defproject fed-poc "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :license {:name "Apache License, Version 2.0" @@ -24,7 +24,7 @@ [clj-turtle "0.1.3"] [org.clojars.quoll/raphael "0.1.6"] [instaparse "1.4.12"]] - :main ^:skip-aot org.domaindrivenarchitecture.activity-pub-poc.core + :main ^:skip-aot org.domaindrivenarchitecture.fed-poc.core :profiles {:test {:test-paths ["src/test/cljc" "src/test/clj"] :resource-paths ["src/test/resources"] diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/activitystreams2.cljc similarity index 91% rename from src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc rename to src/main/cljc/org/domaindrivenarchitecture/fed_poc/activitystreams2.cljc index 6c92dd7..c33859f 100644 --- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc +++ b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/activitystreams2.cljc @@ -1,9 +1,9 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 +(ns org.domaindrivenarchitecture.fed-poc.activitystreams2 (:require [clojure.spec.alpha :as s] [orchestra.core :refer [defn-spec]] - [org.domaindrivenarchitecture.activity-pub-poc.spec-helper :as sh] - [org.domaindrivenarchitecture.activity-pub-poc.owl :as owl] - [org.domaindrivenarchitecture.activity-pub-poc.xsd :as xsd])) + [org.domaindrivenarchitecture.fed-poc.spec-helper :as sh] + [org.domaindrivenarchitecture.fed-poc.owl :as owl] + [org.domaindrivenarchitecture.fed-poc.xsd :as xsd])) diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/core.cljc b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/core.cljc similarity index 87% rename from src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/core.cljc rename to src/main/cljc/org/domaindrivenarchitecture/fed_poc/core.cljc index c48480f..bf1031a 100644 --- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/core.cljc +++ b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/core.cljc @@ -1,8 +1,8 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.core +(ns org.domaindrivenarchitecture.fed-poc.core (:require [clojure.spec.alpha :as s] [clojure.walk :as walk] [orchestra.core :refer [defn-spec]] - [org.domaindrivenarchitecture.activity-pub-poc.spec-helper :as sh] + [org.domaindrivenarchitecture.fed-poc.spec-helper :as sh] [clojure.data.json :as json])) (declare normalize-functional-property) diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl.cljc b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/owl.cljc similarity index 89% rename from src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl.cljc rename to src/main/cljc/org/domaindrivenarchitecture/fed_poc/owl.cljc index b3acfe6..507e3ce 100644 --- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl.cljc +++ b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/owl.cljc @@ -1,9 +1,9 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.owl +(ns org.domaindrivenarchitecture.fed-poc.owl "A swallow spec translation implementation of owl. Inheritance of FunctionalProperty is realized in deep implemented." (:require [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.predicates :as p] + [org.domaindrivenarchitecture.fed-poc.predicates :as p] [orchestra.core :refer [defn-spec]])) ; Properties:https://www.w3.org/TR/owl-ref/#Property diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/predicates.cljc b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/predicates.cljc similarity index 71% rename from src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/predicates.cljc rename to src/main/cljc/org/domaindrivenarchitecture/fed_poc/predicates.cljc index 1f82363..3bf0f7a 100644 --- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/predicates.cljc +++ b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/predicates.cljc @@ -1,4 +1,4 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.predicates +(ns org.domaindrivenarchitecture.fed-poc.predicates (:require [clojure.string :as str] [lambdaisland.uri :as uri])) diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/spec_helper.cljc b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/spec_helper.cljc similarity index 91% rename from src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/spec_helper.cljc rename to src/main/cljc/org/domaindrivenarchitecture/fed_poc/spec_helper.cljc index da44614..13880fa 100644 --- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/spec_helper.cljc +++ b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/spec_helper.cljc @@ -1,4 +1,4 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.spec-helper +(ns org.domaindrivenarchitecture.fed-poc.spec-helper "A swallow spec translation implementation of owl. Inheritance of FunctionalProperty is realized in deep implemented." (:require diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/xsd.cljc b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/xsd.cljc similarity index 51% rename from src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/xsd.cljc rename to src/main/cljc/org/domaindrivenarchitecture/fed_poc/xsd.cljc index 578afab..980921d 100644 --- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/xsd.cljc +++ b/src/main/cljc/org/domaindrivenarchitecture/fed_poc/xsd.cljc @@ -1,7 +1,7 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.xsd +(ns org.domaindrivenarchitecture.fed-poc.xsd "A spec translation implementation of xsd. Predicates are implemented fully functional." (:require [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.predicates :as p])) + [org.domaindrivenarchitecture.fed-poc.predicates :as p])) ;https://www.w3.org/TR/xmlschema11-2/#anyURI (s/def ::anyURI p/uri-string?) \ No newline at end of file diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.cljc b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/activitystreams2_test.cljc similarity index 95% rename from src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.cljc rename to src/test/cljc/org/domaindrivenarchitecture/fed_poc/activitystreams2_test.cljc index bd1096d..071f237 100644 --- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.cljc +++ b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/activitystreams2_test.cljc @@ -1,8 +1,8 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.activitystreams2-test +(ns org.domaindrivenarchitecture.fed-poc.activitystreams2-test (:require [clojure.test :refer [deftest is are testing run-tests]] [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as sut])) + [org.domaindrivenarchitecture.fed-poc.activitystreams2 :as sut])) (deftest id-test (is (s/valid? ::sut/id "https://social.bla/alyssa/status/RANDOMHASH")) @@ -16,7 +16,7 @@ (deftest type-test (is (s/valid? ::sut/type "https://social.bla/alyssa/status/RANDOMHASH")) (is (s/valid? ::sut/type "Activity")) - (is (s/valid? ::sut/type "Activity")) + (is (s/valid? ::sut/type [ "Activity"])) (is (s/valid? ::sut/type ["https://social.bla/alyssa/status/RANDOMHASH", "https://social.bla/alyssa/status/RANDOMHASH2"])) (is (not (s/valid? ::sut/type nil))) (is (not (s/valid? ::sut/type []))) diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/core_test.cljc b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/core_test.cljc similarity index 85% rename from src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/core_test.cljc rename to src/test/cljc/org/domaindrivenarchitecture/fed_poc/core_test.cljc index f91920d..9a51ff1 100644 --- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/core_test.cljc +++ b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/core_test.cljc @@ -1,12 +1,10 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.core-test +(ns org.domaindrivenarchitecture.fed-poc.core-test (:require [clojure.test :refer [deftest is are testing run-tests]] [clojure.spec.alpha :as s] [clojure.string :as str] - [org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as as] - [org.domaindrivenarchitecture.activity-pub-poc.core :as sut])) - -(def tmp ) + [org.domaindrivenarchitecture.fed-poc.activitystreams2 :as as] + [org.domaindrivenarchitecture.fed-poc.core :as sut])) (deftest should-normalize (is (= {::as/id "http://example.org/likes/1" diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/owl_test.cljc similarity index 85% rename from src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc rename to src/test/cljc/org/domaindrivenarchitecture/fed_poc/owl_test.cljc index 8ff6e63..641bb2b 100644 --- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc +++ b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/owl_test.cljc @@ -1,9 +1,9 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.owl-test +(ns org.domaindrivenarchitecture.fed-poc.owl-test (:require [clojure.test :refer [deftest is are testing run-tests]] [clojure.spec.test.alpha :as st] [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.owl :as sut])) + [org.domaindrivenarchitecture.fed-poc.owl :as sut])) (deftest functional-predicate (is (sut/functional? "str")) diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/spec_helper_test.cljc b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/spec_helper_test.cljc similarity index 51% rename from src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/spec_helper_test.cljc rename to src/test/cljc/org/domaindrivenarchitecture/fed_poc/spec_helper_test.cljc index 6d572e7..3c4f50f 100644 --- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/spec_helper_test.cljc +++ b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/spec_helper_test.cljc @@ -1,10 +1,10 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.spec-helper-test +(ns org.domaindrivenarchitecture.fed-poc.spec-helper-test (:require [clojure.test :refer [deftest is are testing run-tests]] [clojure.spec.test.alpha :as st] [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as as2] - [org.domaindrivenarchitecture.activity-pub-poc.spec-helper :as sut])) + [org.domaindrivenarchitecture.fed-poc.activitystreams2 :as as2] + [org.domaindrivenarchitecture.fed-poc.spec-helper :as sut])) (deftest shoult-test-spec-for-having-functional-property (is (sut/is-functional-property? ::as2/id)) diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/xsd_test.cljc b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/xsd_test.cljc similarity index 52% rename from src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/xsd_test.cljc rename to src/test/cljc/org/domaindrivenarchitecture/fed_poc/xsd_test.cljc index 56bfcca..39a163e 100644 --- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/xsd_test.cljc +++ b/src/test/cljc/org/domaindrivenarchitecture/fed_poc/xsd_test.cljc @@ -1,6 +1,6 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.xsd-test +(ns org.domaindrivenarchitecture.fed-poc.xsd-test (:require [clojure.test :refer [deftest is are testing run-tests]] [clojure.spec.test.alpha :as st] [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.xsd :as sut])) \ No newline at end of file + [org.domaindrivenarchitecture.fed-poc.xsd :as sut])) \ No newline at end of file diff --git a/tmp/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_legacy.clj b/tmp/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_legacy.clj index 0488ebf..d940a86 100644 --- a/tmp/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_legacy.clj +++ b/tmp/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_legacy.clj @@ -1,7 +1,7 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.activitystreams2-legacy +(ns org.domaindrivenarchitecture.fed-poc.activitystreams2-legacy (:require [clojure.spec.alpha :as s] - [org.domaindrivenarchitecture.activity-pub-poc.owl :as owl] - [org.domaindrivenarchitecture.activity-pub-poc.core :as core])) + [org.domaindrivenarchitecture.fed-poc.owl :as owl] + [org.domaindrivenarchitecture.fed-poc.core :as core])) ; TODO: We could do these with multispec, but that is too much for a POC (def objectAndLinkTypes #{; Object Types diff --git a/tmp/org/domaindrivenarchitecture/activity_pub_poc/common.clj b/tmp/org/domaindrivenarchitecture/activity_pub_poc/common.clj index f0260c6..a1a5d7f 100644 --- a/tmp/org/domaindrivenarchitecture/activity_pub_poc/common.clj +++ b/tmp/org/domaindrivenarchitecture/activity_pub_poc/common.clj @@ -1,4 +1,4 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.common) +(ns org.domaindrivenarchitecture.fed-poc.common) (def resource-path "src/main/resources/") diff --git a/tmp/org/domaindrivenarchitecture/activity_pub_poc/core.clj b/tmp/org/domaindrivenarchitecture/activity_pub_poc/core.clj index c55b42d..4667619 100644 --- a/tmp/org/domaindrivenarchitecture/activity_pub_poc/core.clj +++ b/tmp/org/domaindrivenarchitecture/activity_pub_poc/core.clj @@ -1,8 +1,8 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.core +(ns org.domaindrivenarchitecture.fed-poc.core (:require [lambdaisland.souk.activitypub :as ap] [lambdaisland.souk.json-ld :as ld] [quoll.raphael.core :refer [parse]] - [org.domaindrivenarchitecture.activity-pub-poc.common :as cm] + [org.domaindrivenarchitecture.fed-poc.common :as cm] [clojure.spec.alpha :as s] [orchestra.core :refer [defn-spec]] [clojure.data.json :as json] diff --git a/tmp/org/domaindrivenarchitecture/activity_pub_poc/core_test.clj b/tmp/org/domaindrivenarchitecture/activity_pub_poc/core_test.clj index fe26849..4eb261f 100644 --- a/tmp/org/domaindrivenarchitecture/activity_pub_poc/core_test.clj +++ b/tmp/org/domaindrivenarchitecture/activity_pub_poc/core_test.clj @@ -1,8 +1,8 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.core-test +(ns org.domaindrivenarchitecture.fed-poc.core-test (:require [clojure.test :refer [deftest is are testing run-tests]] [clojure.spec.test.alpha :as st] - [org.domaindrivenarchitecture.activity-pub-poc.core :as sut])) + [org.domaindrivenarchitecture.fed-poc.core :as sut])) (st/instrument `sut/generate-like-map) diff --git a/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser.clj b/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser.clj index b1fff6a..89eb0d0 100644 --- a/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser.clj +++ b/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser.clj @@ -1,5 +1,5 @@ -(ns org.domaindrivenarchitecture.activity-pub-poc.parser - (:require [org.domaindrivenarchitecture.activity-pub-poc.common :as cm] +(ns org.domaindrivenarchitecture.fed-poc.parser + (:require [org.domaindrivenarchitecture.fed-poc.common :as cm] [clojure.string :as str])) (def activitystreams-turtle (slurp cm/activitystreams-ttl)) diff --git a/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser_test.clj b/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser_test.clj index 8a6815f..da93e73 100644 --- a/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser_test.clj +++ b/tmp/org/domaindrivenarchitecture/activity_pub_poc/parser_test.clj @@ -1,6 +1,6 @@ -;(ns org.domaindrivenarchitecture.activity-pub-poc.parser-test +;(ns org.domaindrivenarchitecture.fed-poc.parser-test ; (:require [clojure.test :refer :all] -; [org.domaindrivenarchitecture.activity-pub-poc.parser :as sut])) +; [org.domaindrivenarchitecture.fed-poc.parser :as sut])) ;(def processed (slurp "src/test/resources/deleted_comments_minimal.ttl"))