1.1.0

Author: Phelsong

.gitignore

@@ -3,3 +3,4 @@
 *.egg-info
 # magic environments
 .magic
+dist/*

README.me renamed to README.md

@@ -4,10 +4,10 @@ My reference implementation for csv tools in mojo
 
 ### usage
 
-```mojo 
+```mojo
 from mojo_csv import CsvReader
+from pathlib import Path
 
-with open(csv_path, "r") as fi:
-    var rd = CsvReader(fi.read())
+var csv_path = Path("path/to/csv/file.csv")
+var reader = CsvReader(csv_path)
 ```
-

dist/mojo_csv.mojopkg

@@ -4,11 +4,12 @@ channels = ["conda-forge", "https://conda.modular.com/max"]
 description = "csv parser in mojo"
 name = "mojo_csv"
 platforms = ["linux-64"]
-version = "0.1.1"
+version = "1.1.0"
 
 [tasks]
 test = "mojo test.mojo test.csv"
-build_package = "mojo package src -o dist/mojo_csv.mojopkg"
+pack = "mojo package src -o dist/mojo_csv.mojopkg;cd dist; sha256sum mojo_csv.mojopkg > sha256sum.mojo_csv.mojopkg.txt"
+test_pack = "mojo test_pack.mojo test.csv"
 
 [dependencies]
-max = ">=24.6.0,<25"
+max = ">=25.1.0,<26"

magic.lock

@@ -1,2 +1 @@
 from .csv_reader import CsvReader
-# from .open_csv import open_csv

mojoproject.toml

@@ -1,8 +1,8 @@
 from collections import Dict, List
 from pathlib import Path, cwd
-from sys import argv
+from sys import argv, exit
+from testing import assert_true
 
-# item1,"ite,m2",item3
 
 struct CsvReader[]:
     # var data: Dict[String,String]
@@ -18,29 +18,30 @@ struct CsvReader[]:
     var row_count: Int
     var col_count: Int
 
+
     fn __init__(
         out self,
-        # owned in_csv: Path,
-        owned in_csv: String,
+        owned in_csv: Path,
         owned delimiter: String = ",",
         owned quotation_mark: String = '"',
     ):
-        self.raw = in_csv
-        self.length = self.raw.__len__()
-        self.delimiter = delimiter
+        self.raw = ""
+        self.length = 0
         self.QM = quotation_mark
+        self.delimiter = delimiter
         self.escape = "\\"
         self.CR = "\n"
         self.LFCR = "\r\n"
         self.row_count = 0
         self.col_count = 0
         self.elements = List[String]()
         self.headers = List[String]()
-        self.create_reader()
+        self._open(in_csv)
+        self.length = self.raw.__len__()
+        self._create_reader()
 
 
-    fn create_reader(inout self):
-        # var row_start: Int = 0
+    fn _create_reader(mut self):
         var col: Int = 0
         var col_start: Int = 0
         var in_quotes: Bool = False
@@ -65,10 +66,10 @@ struct CsvReader[]:
             # --------
 
             if char == self.delimiter:
-                
+
                 self.elements.append(self.raw[col_start:pos])
                 col_start = pos + 1
-                
+
                 if self.row_count == 0:
                     self.col_count += 1
 
@@ -90,10 +91,26 @@ struct CsvReader[]:
                 if pos + 1 < self.length:
                     self.row_count += 1
                     col_start = pos + 1
-            
+
             elif pos == self.length:
                 self.elements.append(self.raw[col_start:pos])
             # -------
         # -------------
+    fn _open(mut self, in_csv: Path):
+        try:
+            assert_true(in_csv.exists())
+            self.raw = in_csv.read_text()
+            assert_true(self.raw != "")
+        except AssertionError:
+            print("Error opening file:", in_csv)
+            exit()
 
+    # fn __copyinit__(mut self, existing: _Self) -> CsvReader:
+    #     self.raw = existing.raw
+    #     self.delimiter = existing.delimiter
+    #     self.QM = existing.QM
+    #     self.elements = existing.elements
+    #     self.col_count = existing.col_count
+    #     self.row_count = existing.row_count
+    #     return self
     # ---------------------

src/__init__.mojo

@@ -1,48 +1,38 @@
 from collections import Dict, List
 from pathlib import Path, cwd
-from sys import argv
+from sys import argv, exit
+from testing import assert_true
 
 from src.csv_reader import CsvReader
-# from src.open_csv import open_csv
 
-from mojo_csv import CsvReader as CsvReaderD
+var VALID = List[String]("item1", "item2", '"ite,em3"',"pic"," pi c","pic","r_i_1","r_i_2","r_i_3")
 
-fn dist_check(read test_csv: Path):
+fn main() -> None:
+    var in_csv: Path = Path(argv()[1])
+    var rd = CsvReader(in_csv)
+    print(in_csv)
+    print("columns:", rd.col_count)
     print("----------")
     try:
-        # print(in_csv)
-        with open(test_csv, "r") as fi:
-            var rd = CsvReaderD(fi.read())
-            # print(rd.col_count)
-            for x in range(len(rd.elements)):
-                print(rd.elements[x])
-        # -------------
-    except Exception:
-        print("error: ", Exception)
-
-
-
-fn main():
-    try:
-        var in_csv: Path = Path(argv()[1])
-        # print(in_csv)
-        with open(in_csv, "r") as fi:
-            var rd = CsvReader(fi.read())
-            # print(rd.col_count)
-            for x in range(len(rd.elements)):
-                print(rd.elements[x])
-        # -------------
-        # var rd: CsvReader = open_csv(in_csv)
-        # print(rd.col_count)
-        # for x in range(len(rd.elements)):
-        #     print(rd.elements[x])
-        dist_check(in_csv)
-
-    except Exception:
-        print("error: ", Exception)
-
-# def main():
-#     in_csv = Path(argv()[1])
-#     var rd = CsvReader(in_csv)
-#     for x in range(len(rd.elements)):
-#         print(rd.elements[x])
+        for x in range(len(rd.elements)):
+            print(rd.elements[x])
+            assert_true(rd.elements[x] == VALID[x], String("[{0}] != expected [{1}] at index {2}").format(rd.elements[x], VALID[x], x))
+        assert_true(len(rd.elements) == 9)
+    except AssertionError:
+        print(AssertionError)
+        exit()
+    print("----------")
+    print("parse successful")
+
+
+# columns: 3
+# ----------
+# item1
+# item2
+# "ite,em3"
+# pic
+#  pi c
+# pic
+# r_i_1
+# r_i_2
+# r_i_3

src/csv_reader.mojo

@@ -0,0 +1,40 @@
+from collections import Dict, List
+from pathlib import Path, cwd
+from sys import argv, exit
+from testing import assert_true
+
+from mojo_csv import CsvReader
+
+var VALID = List[String]("item1", "item2", '"ite,em3"',"pic"," pi c","pic","r_i_1","r_i_2","r_i_3")
+
+fn main() -> None:
+    var in_csv: Path = Path(argv()[1])
+    var rd = CsvReader(in_csv)
+    print(in_csv)
+    print("columns:", rd.col_count)
+    print("----------")
+    try:
+        for x in range(len(rd.elements)):
+            print(rd.elements[x])
+            assert_true(rd.elements[x] == VALID[x], String("[{0}] != expected [{1}] at index {2}").format(rd.elements[x], VALID[x], x))
+        assert_true(len(rd.elements) == 9)
+    except AssertionError:
+        print(AssertionError)
+        exit()
+    print("----------")
+    print("parse successful")
+
+
+
+
+# columns: 3
+# ----------
+# item1
+# item2
+# "ite,em3"
+# pic
+#  pi c
+# pic
+# r_i_1
+# r_i_2
+# r_i_3