From e593b7d8880d1057b171227cd36b900eead3c085 Mon Sep 17 00:00:00 2001 From: Yash Singh Date: Mon, 27 Jan 2025 12:57:53 +0530 Subject: [PATCH 1/4] feat: added shuffle_default --- shuffle_sdk/shuffle_sdk.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shuffle_sdk/shuffle_sdk.py b/shuffle_sdk/shuffle_sdk.py index 6226dc3..1ec2e4c 100755 --- a/shuffle_sdk/shuffle_sdk.py +++ b/shuffle_sdk/shuffle_sdk.py @@ -109,6 +109,12 @@ def base64_encode(a): except: return base64.b64encode(a).decode() +@shuffle_filters.register +def shuffle_default(a, default_value): + if a in [None, False, 'null', '']: + return default_value + return a + @shuffle_filters.register def random_element(a): # Choose a random item from an array From cf711fc01805e16b05c2dc1162cc2f3460d0d29c Mon Sep 17 00:00:00 2001 From: yashsinghcodes Date: Tue, 28 Jan 2025 12:05:59 +0530 Subject: [PATCH 2/4] improvment over shuffle_default --- shuffle_sdk/shuffle_sdk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shuffle_sdk/shuffle_sdk.py b/shuffle_sdk/shuffle_sdk.py index 1ec2e4c..c919f8f 100755 --- a/shuffle_sdk/shuffle_sdk.py +++ b/shuffle_sdk/shuffle_sdk.py @@ -111,8 +111,9 @@ def base64_encode(a): @shuffle_filters.register def shuffle_default(a, default_value): - if a in [None, False, 'null', '']: + if not a or str(a).strip().lower() in ["none", "nil", "null", "undefined", ""]: return default_value + return a @shuffle_filters.register From 548defebd8ae5418ad4f14c0fe41fbf594f670bc Mon Sep 17 00:00:00 2001 From: yashsinghcodes Date: Tue, 28 Jan 2025 18:43:33 +0530 Subject: [PATCH 3/4] made the shuffle_default function more readable --- shuffle_sdk/shuffle_sdk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shuffle_sdk/shuffle_sdk.py b/shuffle_sdk/shuffle_sdk.py index c919f8f..dd72753 100755 --- a/shuffle_sdk/shuffle_sdk.py +++ b/shuffle_sdk/shuffle_sdk.py @@ -111,8 +111,9 @@ def base64_encode(a): @shuffle_filters.register def shuffle_default(a, default_value): - if not a or str(a).strip().lower() in ["none", "nil", "null", "undefined", ""]: - return default_value + if not a: + if str(a).strip().lower() in ["none", "nil", "null", "undefined", ""]: + return default_value return a From 419eaef33c088cd877f5f8c9ad7d4d107fbe1532 Mon Sep 17 00:00:00 2001 From: yashsinghcodes Date: Tue, 28 Jan 2025 20:28:18 +0530 Subject: [PATCH 4/4] [fixed]: Logical error in shuffle_default --- shuffle_sdk/shuffle_sdk.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shuffle_sdk/shuffle_sdk.py b/shuffle_sdk/shuffle_sdk.py index dd72753..daa7d35 100755 --- a/shuffle_sdk/shuffle_sdk.py +++ b/shuffle_sdk/shuffle_sdk.py @@ -112,8 +112,10 @@ def base64_encode(a): @shuffle_filters.register def shuffle_default(a, default_value): if not a: - if str(a).strip().lower() in ["none", "nil", "null", "undefined", ""]: - return default_value + return default_value + + if str(a).strip().lower() in ["none", "nil", "null", "undefined", ""]: + return default_value return a