change to package

Its-Just-Nans · Its-Just-Nans · commit c7aed86b7795 · 2021-12-09T17:11:41.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 n4n5
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -0,0 +1,5 @@
+# csv-to-custom-json-python
+
+## License
+
+Licensed under the MIT License - [LICENSE](LICENSE)
diff --git a/csv.txt b/csv.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
+
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,24 @@
+[metadata]
+name = csv-to-custom-json
+version = 0.0.1
+author = n4n5
+author_email = its.just.n4n5@gmail.com
+description = Easily convert your CSV to custom JSON
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/its-just-nans/csv-to-custom-json-python
+project_urls =
+    Bug Tracker = https://github.com/its-just-nans/csv-to-custom-json-python/issues
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.6
+
+[options.packages.find]
+where = src
diff --git a/src/csv_to_custom_json/__init__.py b/src/csv_to_custom_json/__init__.py
diff --git a/src/csv_to_custom_json/csv_to_custom_json.py b/src/csv_to_custom_json/csv_to_custom_json.py
@@ -5,7 +5,7 @@
 
 def parseFile(pathToFile="", schema=None, optionsUser={}):
     def checkOptions(optionsUser, attr, defaultValue):
-        if attr in optionsUser or (attr == "lineCallBack" and callable(optionsUser[attr])):
+        if attr in optionsUser:
             return optionsUser[attr]
         else:
             return defaultValue
@@ -102,7 +102,10 @@ def parseLine(line):
                 allPath = onePathRow.split(options["privateSeparator"])
                 currentValue = None
                 if ('type' not in oneRow) or ('type' in oneRow and oneRow["type"] == None):
-                    schemaValue = oneRow["value"]
+                    if 'value' not in oneRow:
+                        schemaValue = None
+                    else:
+                        schemaValue = oneRow["value"]
                     index = firstLine.index(oneRow["name"])
                     if index == -1:
                         currentValue = schemaValue
@@ -173,9 +176,9 @@ def parsefirstLine():
                 def dupli(element):
                     return {
                         "name": element,
-                        "type": element
+                        "path": element
                     }
-                cols = map(dupli, firstLine)
+                cols = [dupli(x) for x in firstLine]
             return cols
 
         def reader():
diff --git a/test.py b/test.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/simple copy.csv b/tests/simple copy.csv
@@ -0,0 +1,4 @@
+num1,num2,num3
+1,2,3
+4,5,6
+7,8,9
diff --git a/tests/simple.csv b/tests/simple.csv
@@ -0,0 +1,4 @@
+num1,num2,num3
+1,2,3
+4,5,6
+7,8,9
diff --git a/tests/simple_complexe.csv b/tests/simple_complexe.csv
@@ -0,0 +1,4 @@
+num1,num2,num3,num4
+1,2,3,4
+4,5,6,7
+7,8,9,10
diff --git a/tests/simple_complexe_with_void_line.csv b/tests/simple_complexe_with_void_line.csv
@@ -0,0 +1,5 @@
+num1,num2,num3,num4
+1,2,3,4
+4,5,6,7
+
+7,8,9,10
diff --git a/tests/simple_customSeparator.csv b/tests/simple_customSeparator.csv
@@ -0,0 +1,4 @@
+num1;num2;num3
+1;2;3
+4;5;6
+7;8;9
diff --git a/tests/test.py b/tests/test.py
@@ -0,0 +1,28 @@
+import unittest
+
+from src.csv_to_custom_json.csv_to_custom_json import parseFile
+
+class Test(unittest.TestCase):
+    def simple_test(self):
+        test = parseFile("./tests/simple.csv")
+        self.assertEqual(test, [
+            {
+                "num1": "1",
+                "num2": "2",
+                "num3": "3"
+            },
+            {
+                "num1": "4",
+                "num2": "5",
+                "num3": "6"
+            },
+            {
+                "num1": "7",
+                "num2": "8",
+                "num3": "9"
+            }
+        ])
+
+
+if __name__ == '__main__':
+    unittest.main()

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +num1,num2,num3
 +1,2,3
 +4,5,6
 +7,8,9