csvpath 0.0.519__tar.gz → 0.0.520__tar.gz

{csvpath-0.0.519 → csvpath-0.0.520}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: csvpath
-Version: 0.0.519
+Version: 0.0.520
 Summary: An edge governance framework for managing and validating CSV, Excel, and other tabular data files
 Author: David Kershaw
 Author-email: dk107dk@hotmail.com

{csvpath-0.0.519 → csvpath-0.0.520}/csvpath/cli/asker.py

@@ -22,7 +22,7 @@ class Asker:
             names = self._cli.csvpaths.file_manager.named_file_names
             names.sort()
         elif name_type == "paths":
-            names = self._cli.csvpaths.file_manager.named_file_names
+            names = self._cli.csvpaths.paths_manager.named_paths_names
             names.sort()
         else:
             raise ValueError("Name type must be files or paths")
@@ -31,15 +31,21 @@ class Asker:
 
     def create_prompt_application(self, prompt_text=None):
         if prompt_text is None:
-            prompt_text = "Named-file name? " if self.name_type == "files" else "Named-paths name? "
+            prompt_text = (
+                "Named-file name? "
+                if self.name_type == "files"
+                else "Named-paths name? "
+            )
         # Create a buffer to store input
         buffer = Buffer(completer=self.completer, complete_while_typing=True)
         # Create key bindings
         kb = KeyBindings()
+
         @kb.add("enter")
         def _(event):
             self.result = buffer.text
             event.app.exit()
+
         @kb.add("c-c")
         @kb.add("c-q")
         def _(event):
@@ -85,5 +91,6 @@ class Asker:
         except Exception as e:
             self._cli.csvpaths.logger.error(e)
             import traceback
+
             print(traceback.format_exc())
             return None

{csvpath-0.0.519 → csvpath-0.0.520}/csvpath/matching/functions/types/decimal.py

@@ -45,19 +45,10 @@ class Decimal(ValueProducer, Type):
         h = self._value_one(skip=skip)
         if h is None:
             #
-            # Matcher via Type will take care of mismatches and Nones
+            # Matcher via Type will take care of mismatches and Nones. Args handles nonnone
             #
             if self.notnone is True:
                 self.match = False
-                #
-                # should be caught by Args
-                #
-                """ """
-                msg = f"'{self._value_one(skip=skip)}' cannot be empty"
-                self.matcher.csvpath.error_manager.handle_error(source=self, msg=msg)
-                if self.matcher.csvpath.do_i_raise():
-                    raise MatchException(msg)
-                """ """
                 return
             self.match = True
             return
@@ -65,6 +56,9 @@ class Decimal(ValueProducer, Type):
             #
             # we know this value is a number because Args checked it.
             # but would a user know from looking at it that it was a float?
+            # if strict, we require the fractional part. if not strict any
+            # whole number can be a decimal with an unwritten .0 so we
+            # allow it.
             #
             if self.has_qualifier("strict"):
                 if f"{h}".strip().find(".") == -1:
@@ -76,19 +70,34 @@ class Decimal(ValueProducer, Type):
                     )
                     if self.matcher.csvpath.do_i_raise():
                         raise MatchException(msg)
+                    self.match = False
                     return
-                self.match = True
-            elif self.has_qualifier("weak"):
-                self.match = True
-            elif f"{h}".strip().find(".") == -1:
-                self.match = False
-                return
-            else:
-                self.match = True
+            self.match = True
         else:
             if f"{h}".find(".") > -1:
-                self.match = False
-                return
+                msg = "Integers cannot have a fractional part"
+                if self.has_qualifier("strict"):
+                    self.matcher.csvpath.error_manager.handle_error(
+                        source=self, msg=msg
+                    )
+                    if self.matcher.csvpath.do_i_raise():
+                        raise MatchException(msg)
+                    self.match = False
+                    return
+                i = ExpressionUtility.to_int(h)
+                f = ExpressionUtility.to_float(h)
+                if i == f:
+                    # the fractional part is 0, so we'll allow it
+                    self.match = True
+                else:
+                    self.matcher.csvpath.error_manager.handle_error(
+                        source=self, msg=msg
+                    )
+                    if self.matcher.csvpath.do_i_raise():
+                        raise MatchException(msg)
+                    self.match = False
+                    return
+            self.match = True
         #
         # validate min and max
         #

{csvpath-0.0.519 → csvpath-0.0.520}/csvpath/matching/productions/header.py

@@ -8,8 +8,6 @@ class Header(Matchable):
     """a header is analogous to a column in a spreadsheet or
     RDBMS but with CSV characteristics"""
 
-    NEVER = -9999999999
-
     def __str__(self) -> str:
         return f"""{self._simple_class_name()}({self.qualified_name}) """
 
@@ -17,12 +15,10 @@ class Header(Matchable):
         # header names can be quoted like "Last Year Number"
         if isinstance(name, str):
             name = name.strip()
-            # if name[0] == '"' and name[len(name) - 1] == '"':
-            #    name = name[1 : len(name) - 1]
-        super().__init__(matcher, value=Header.NEVER, name=name)
+        super().__init__(matcher, value=None, name=name)
 
     def reset(self) -> None:
-        self.value = Header.NEVER
+        self.value = None
         self.match = None
         super().reset()
 
@@ -31,27 +27,26 @@ class Header(Matchable):
             ret = self._noop_value()
             self.valuing().result(ret).because("skip")
             return ret
-        if self.value == Header.NEVER:
-            ret = Header.NEVER
-            if isinstance(self.name, int) or self.name.isdecimal():
-                if int(self.name) >= len(self.matcher.line):
-                    ret = None
-                else:
-                    ret = self.matcher.line[int(self.name)]
+        ret = None
+        if isinstance(self.name, int) or self.name.isdecimal():
+            if int(self.name) >= len(self.matcher.line):
+                ret = None
             else:
-                n = self.matcher.header_index(self.name)
-                if n is None:
-                    ret = None
-                elif self.matcher.line and len(self.matcher.line) > n:
-                    ret = self.matcher.line[n]
-                else:
-                    self.matcher.csvpath.logger.debug(
-                        f"Header.to_value: miss because n >= {len(self.matcher.line)}"
-                    )
-            if self.asbool:
-                self.value = ExpressionUtility.asbool(ret)
+                ret = self.matcher.line[int(self.name)]
+        else:
+            n = self.matcher.header_index(self.name)
+            if n is None:
+                ret = None
+            elif self.matcher.line and len(self.matcher.line) > n:
+                ret = self.matcher.line[n]
             else:
-                self.value = ret
+                self.matcher.csvpath.logger.debug(
+                    f"Header.to_value: miss because n >= {len(self.matcher.line)}"
+                )
+        if self.asbool:
+            self.value = ExpressionUtility.asbool(ret)
+        else:
+            self.value = ret
         if isinstance(self.value, str):
             self.value = self.value.strip()
         return self.value

{csvpath-0.0.519 → csvpath-0.0.520}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.519"
+version = "0.0.520"
 description = "An edge governance framework for managing and validating CSV, Excel, and other tabular data files"
 authors = ["David Kershaw <dk107dk@hotmail.com>"]
 readme = "README.md"