Skip to content

Restructure source files and namespaces #5

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.

Sign up for GitHub

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

Merged
verberktstan merged 2 commits into from
Jun 3, 2026
Merged

Restructure source files and namespaces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9984a8
Move clj files to /bitten, adapt ns declarations and references
verberktstan Jun 3, 2026
087762f
Move storate protocal and impl to /storage
verberktstan Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bb.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
:pods {org.babashka/go-sqlite3 {:version "0.3.13"}}
:tasks
{test {:doc "Run all tests"
:task (do (require 'db-test 'server-test 'protocol-test)
(let [{:keys [fail error]} (clojure.test/run-tests 'db-test 'server-test 'protocol-test)]
:task (do (require 'bitten.db-test 'bitten.server-test 'bitten.storage.protocol-test)
(let [{:keys [fail error]} (clojure.test/run-tests 'bitten.db-test 'bitten.server-test 'bitten.storage.protocol-test)]
(System/exit (+ fail error))))}

start {:doc "Start the Bitten server (PORT and DB_PATH env vars optional)"
:requires ([server :as server] [sqlite :as sqlite] [storage :as storage])
:requires ([bitten.server :as server] [bitten.storage.sqlite :as sqlite] [bitten.storage.storage :as storage])
:task (let [port (parse-long (or (System/getenv "PORT") "5432"))
db-path (or (System/getenv "DB_PATH") "bitten.db")
backend (sqlite/->SqliteBackend db-path)]
Expand Down
4 changes: 2 additions & 2 deletions src/db.clj → src/bitten/db.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns db
(:require [storage]))
(ns bitten.db
(:require [bitten.storage.core :as storage]))

(def ->eav (juxt :entity :attribute :value))
(def ->full-eav (juxt :entity :attribute :value :valid-time :tx-time :tx-id :retracted))
Expand Down
7 changes: 3 additions & 4 deletions src/server.clj → src/bitten/server.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
(ns server
(:require [storage]
[db]
[protocol]))
(ns bitten.server
(:require [bitten.db :as db]
[bitten.storage.protocol :as protocol]))

(defn- buffered-reader [input-stream]
(-> input-stream java.io.InputStreamReader. java.io.BufferedReader.))
Expand Down
4 changes: 2 additions & 2 deletions src/storage.clj → src/bitten/storage/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns storage)
(ns bitten.storage.core)

(defprotocol IStorage
(migrate! [backend])
(insert-facts! [backend facts])
(query-as-of [backend opts]))
(query-as-of [backend opts]))
2 changes: 1 addition & 1 deletion src/protocol.clj → src/bitten/storage/protocol.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns protocol)
(ns bitten.storage.protocol)

(defn parse-request [line]
(try
Expand Down
4 changes: 2 additions & 2 deletions src/sqlite.clj → src/bitten/storage/sqlite.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns sqlite
(ns bitten.storage.sqlite
(:require [babashka.pods :as pods]
[clojure.string :as str]
[storage]))
[bitten.storage.core :as storage]))

(pods/load-pod 'org.babashka/go-sqlite3 "0.3.13")
(require '[pod.babashka.go-sqlite3 :as sqlite-pod])
Expand Down
8 changes: 4 additions & 4 deletions test/db_test.clj → test/bitten/db_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(ns db-test
(ns bitten.db-test
(:require [clojure.test :refer [deftest is use-fixtures]]
[babashka.pods :as pods]
[babashka.fs :as fs]
[db :as db]
[storage :as storage]
[sqlite :as sqlite-backend]))
[bitten.db :as db]
[bitten.storage.core :as storage]
[bitten.storage.sqlite :as sqlite-backend]))

(pods/load-pod 'org.babashka/go-sqlite3 "0.3.13")
(require '[pod.babashka.go-sqlite3 :as sql-pod])
Expand Down
10 changes: 5 additions & 5 deletions test/server_test.clj → test/bitten/server_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
(ns server-test
(ns bitten.server-test
(:require [clojure.test :refer [deftest is]]
[babashka.pods :as pods]
[babashka.fs :as fs]
[server :as server]
[storage :as storage]
[sqlite :as sqlite-backend]
[db :as db]))
[bitten.server :as server]
[bitten.storage.core :as storage]
[bitten.storage.sqlite :as sqlite-backend]
[bitten.db :as db]))

(pods/load-pod 'org.babashka/go-sqlite3 "0.3.13")

Expand Down
4 changes: 2 additions & 2 deletions test/protocol_test.clj → test/bitten/storage/protocol_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns protocol-test
(ns bitten.storage.protocol-test
(:require [clojure.edn :as edn]
[clojure.test :refer [deftest is]]
[protocol :as protocol]))
[bitten.storage.protocol :as protocol]))

;; parse-request ;;

Expand Down
Loading