Convert tests

.gitignore

@@ -4,6 +4,7 @@
 .env
 .idea
 /storage
+/test/storage
 build
 erl_crash.dump
 secrets.env

src/ethos.gleam

@@ -1,6 +1,6 @@
 pub type BagTable(k, v)
 
-@external(erlang, "ethos_ffi", "bag_get")
+@external(erlang, "ethos_ffi", "bag_new")
 pub fn new() -> BagTable(k, v)
 
 @external(erlang, "ethos_ffi", "bag_get")

src/ethos_ffi.erl

@@ -9,7 +9,7 @@ bag_new() ->
 
 bag_get(Bag, Key) ->
     Items1 = ets:lookup(Bag, Key),
-    Items2 = lists:map(fun(Elem) -> element(1, Elem) end, Items1),
+    Items2 = lists:map(fun(Elem) -> element(2, Elem) end, Items1),
     {ok, Items2}.
 
 bag_insert(Bag, Key, Value) ->

src/packages.gleam

@@ -4,13 +4,13 @@ import gleam/erlang/process
 import gleam/io
 import gleam/otp/actor
 import gleam/otp/supervisor
-import gleam/result
 import mist
 import packages/error.{type Error}
 import packages/periodic
 import packages/router
 import packages/storage
 import packages/syncing
+import packages/text_search
 import packages/web
 import wisp
 import wisp/wisp_mist
@@ -42,18 +42,22 @@ fn server() {
   // generated anew each time
   let secret_key_base = wisp.random_string(64)
 
-  // // Initialisation that is run per-request
-  // let make_context = fn() {
-  //   web.Context(db: database, static_directory: static_directory)
-  // }
-  //
-  // // Start the web server
-  // let assert Ok(_) =
-  //   router.handle_request(_, make_context)
-  //   |> wisp_mist.handler(secret_key_base)
-  //   |> mist.new
-  //   |> mist.port(3000)
-  //   |> mist.start_http
+  // Initialisation that is run per-request
+  let make_context = fn() {
+    web.Context(
+      db: database,
+      search_index: text_search.new(),
+      static_directory: static_directory,
+    )
+  }
+
+  // Start the web server
+  let assert Ok(_) =
+    router.handle_request(_, make_context)
+    |> wisp_mist.handler(secret_key_base)
+    |> mist.new
+    |> mist.port(3000)
+    |> mist.start_http
 
   // Start syncing new releases periodically
   let assert Ok(_) = start_hex_syncer(database, key)

src/packages/storage.gleam

@@ -100,6 +100,7 @@ fn package_to_json(package: Package) -> Json {
     #("description", json.string(package.description)),
     #("inserted_in_hex_at", json.int(package.inserted_in_hex_at)),
     #("updated_in_hex_at", json.int(package.updated_in_hex_at)),
+    #("latest_version", json.string(package.latest_version)),
     #("docs_url", json.string(package.docs_url)),
     #("downloads_all", json.int(package.downloads_all)),
     #("downloads_recent", json.int(package.downloads_recent)),

src/packages/text_search.gleam

@@ -25,7 +25,8 @@ pub fn insert(
   |> string.append(" ")
   |> string.append(description)
   |> stem_words
-  |> list.try_each(fn(word) { insert(index, word, name) })
+  |> list.try_each(fn(word) { ethos.insert(index.table, word, name) })
+  |> result.replace_error(error.EtsTableError)
 }
 
 pub fn update(
@@ -41,16 +42,18 @@ pub fn lookup(
   index: TextSearchIndex,
   phrase: String,
 ) -> Result(List(String), Nil) {
-  let words = stem_words(phrase)
-  use names <- result.map(list.try_map(words, ethos.get(index.table, _)))
-  names
-  |> list.flatten
-  |> list.fold(dict.new(), fn(counters, name) {
-    dict.upsert(counters, name, fn(x) { option.unwrap(x, 0) + 1 })
+  stem_words(phrase)
+  |> list.try_map(ethos.get(index.table, _))
+  |> result.map(fn(names) {
+    names
+    |> list.flatten
+    |> list.fold(dict.new(), fn(counters, name) {
+      dict.upsert(counters, name, fn(x) { option.unwrap(x, 0) + 1 })
+    })
+    |> dict.to_list
+    |> list.sort(fn(a, b) { int.compare(b.1, a.1) })
+    |> list.map(fn(pair) { pair.0 })
   })
-  |> dict.to_list
-  |> list.sort(fn(a, b) { int.compare(a.1, b.1) })
-  |> list.map(fn(pair) { pair.0 })
 }
 
 fn remove(index: TextSearchIndex, name: String) -> Result(Nil, Error) {