fix up util script

Author: thatstoasty

floki/body.mojo

@@ -14,46 +14,25 @@ struct Body(Copyable, Movable, Sized):
         self.body = List[Byte](body)
         self._json_cache = None
 
-    fn __init__(out self, var body: List[Byte]):
-        self.body = body^
-        self._json_cache = None
-
-    fn __init__(out self):
-        self.body = List[Byte]()
-        self._json_cache = None
-
-    fn __init__(out self, var data: emberjson.Object):
-        """Initializes the body from a dictionary, converting it to a form-encoded string."""
-        self.body = List[Byte](emberjson.to_string(data^).as_bytes())
-        self._json_cache = None
-
     fn __len__(self) -> Int:
         return len(self.body)
 
-    fn __iadd__(mut self, var other: Body):
-        self.body += other.body^
-        other.body = List[Byte]()
-
-    fn __iadd__(mut self, other: Span[Byte]):
-        self.body.extend(other)
-
     fn as_bytes(self) -> Span[Byte, origin_of(self.body)]:
         return Span(self.body)
 
     fn as_string_slice(self) -> StringSlice[origin_of(self.body)]:
         return StringSlice(unsafe_from_utf8=Span(self.body))
 
-    fn as_json(mut self) raises -> ref [origin_of(self._json_cache.value()._data)] emberjson.Object:
+    fn as_json(mut self) raises -> ref [origin_of(self._json_cache._value)] emberjson.JSON:
         """Converts the response body to a JSON object."""
         if not self.body:
             raise Error("Body is empty; cannot parse as JSON.")
 
         if self._json_cache:
-            return self._json_cache.value().object()
+            return self._json_cache.value()
 
-        var parser = emberjson.Parser(StringSlice(unsafe_from_utf8=self.body))
-        self._json_cache = parser.parse()
-        return self._json_cache.value().object()
+        self._json_cache = emberjson.parse(StringSlice(unsafe_from_utf8=self.body))
+        return self._json_cache.value()
 
     fn write_to[W: Writer, //](self, mut writer: W):
         """Writes the body to a writer.

floki/response.mojo

@@ -7,39 +7,6 @@ from floki._logger import LOGGER
 from floki.body import Body
 
 
-fn parse_response_headers(mut r: ByteReader) raises -> Tuple[Protocol, String, String]:
-    if not r.peek():
-        raise Error("parse_response_headers: Failed to read first byte from response header")
-
-    var first = r.read_word()
-    r.increment()
-    var second = r.read_word()
-    r.increment()
-    var third = r.read_line()
-    # var cookies = List[String]()
-
-    # while not is_newline(r.peek()):
-    #     var key = r.read_until(BytesConstant.COLON)
-    #     r.increment()
-    #     if is_space(r.peek()):
-    #         r.increment()
-
-    #     # TODO (bgreni): Handle possible trailing whitespace
-    #     var value = r.read_line()
-    #     var k = StringSlice(unsafe_from_utf8=key).lower()
-    #     if k == "set-cookie":
-    #         cookies.append(String(bytes=value))
-    #         continue
-
-    #     headers[k] = String(bytes=value)
-    return (
-        Protocol.from_string(StringSlice(unsafe_from_utf8=first)),
-        String(bytes=second),
-        String(bytes=third),
-        # cookies^,
-    )
-
-
 @fieldwise_init
 struct HTTPResponse(Movable):
     var headers: Dict[String, String]

pixi.toml

@@ -34,7 +34,7 @@ build_and_publish = [{ task = "build" }, { task = "publish" }]
 
 [package]
 name = "floki"
-version = "25.7.1"
+version = "25.7.2"
 
 [package.build]
 backend = { name = "pixi-build-mojo", version = "0.*", channel = "https://prefix.dev/pixi-build-backends" }

scripts/util.mojo

@@ -10,7 +10,11 @@ fn run_files(directory: Path, path: Optional[Path] = None) raises -> None:
         print("Path does not exist: ", directory)
         return
 
-    var files = [path.value()] if path else directory.listdir()
+    var files: List[Path]
+    if path:
+        files = [path.value()]
+    else:
+        files = [path for path in directory.listdir() if path.suffix() == ".mojo"]
     for file in files:
         print("\nRunning file:", file)
         print(subprocess.run(String("mojo -D ASSERT=all -I . ", directory / file)))

test/test_free_functions.mojo

@@ -34,7 +34,7 @@ fn test_post() raises -> None:
     # print(response.body.as_string_slice())
     assert_equal(response.status_code, StatusCode.CREATED)
     print("Body:")
-    for node in response.body.as_json().items():
+    for node in response.body.as_json().object().items():
         print(String(node.key, ": ", node.data))
 
     print(response.body.as_json()["key2"]["subkey"])

test/test_session.mojo

@@ -57,7 +57,7 @@ fn test_post() raises -> None:
     # print(response.body.as_string_slice())
     assert_equal(response.status_code, StatusCode.CREATED)
     print("Body:")
-    for node in response.body.as_json().items():
+    for node in response.body.as_json().object().items():
         print(String(node.key, ": ", node.data))
 
     print(response.body.as_json()["key2"]["subkey"])
@@ -78,7 +78,7 @@ fn test_post_file() raises -> None:
         )
         assert_equal(response.status_code, StatusCode.CREATED)
         print("Body:")
-        for node in response.body.as_json().items():
+        for node in response.body.as_json().object().items():
             print(String(node.key, ": ", node.data))
 
         print(response.body.as_json()["content"]["recently_edited"])
@@ -115,7 +115,7 @@ fn test_put_file() raises -> None:
         )
         assert_equal(response.status_code, StatusCode.OK)
         print("Body:")
-        for node in response.body.as_json().items():
+        for node in response.body.as_json().object().items():
             print(String(node.key, ": ", node.data))
 
 
@@ -150,7 +150,7 @@ fn test_patch_file() raises -> None:
         )
         assert_equal(response.status_code, StatusCode.OK)
         print("Body:")
-        for node in response.body.as_json().items():
+        for node in response.body.as_json().object().items():
             print(String(node.key, ": ", node.data))