okta-expression-parser 0.2.0__tar.gz → 0.2.2__tar.gz

{okta_expression_parser-0.2.0 → okta_expression_parser-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: okta-expression-parser
-Version: 0.2.0
+Version: 0.2.2
 Summary: Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language
 Author: Mathew Moon
 Author-email: me@mathewmoon.net

{okta_expression_parser-0.2.0 → okta_expression_parser-0.2.2}/okta_expression_parser/expression_classes/string.py

@@ -87,12 +87,18 @@ class String:
         return default
 
     @classmethod
-    def substring(val: str, start: int, end: int):
+    def substring(self, val: str, start: int, end: int):
         """Return a substring of val starting at index start"""
+        if not isinstance(val, str):
+            return ""
+
+        if end > len(val):
+            end = -1
+
         return val[int(start) : int(end)]
 
     @classmethod
-    def substringAfter(val: str, search: str):
+    def substringAfter(self, val: str, search: str):
         try:
             start = str(val).index(str(search))
         except ValueError:
@@ -101,7 +107,7 @@ class String:
         return val[start:]
 
     @classmethod
-    def substringBefore(val: str, search: str):
+    def substringBefore(self, val: str, search: str):
         """Return substring of val starting after the index of search string"""
         try:
             end = str(val).index(str(search))

{okta_expression_parser-0.2.0 → okta_expression_parser-0.2.2}/okta_expression_parser/parser.py

@@ -292,7 +292,8 @@ class ExpressionParser(sly.Parser):
             return False
 
         val = p.operand
-        if not isinstance(val, list):
+
+        if not isinstance(val, tuple):
             val = [val]
 
         res = list(set(self.__group_ids) & set(val))
@@ -306,7 +307,6 @@ class ExpressionParser(sly.Parser):
         if not self.__group_ids:
             return False
 
-        # return p.operand.lower() in self.__group_ids
         return p.operand in self.__group_ids
 
     @_("condition error")  # noqa: 821

{okta_expression_parser-0.2.0 → okta_expression_parser-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "okta-expression-parser"
-version = "0.2.0"
+version = "0.2.2"
 description = "Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language"
 authors = ["Mathew Moon <me@mathewmoon.net>"]
 readme = "README.md"