checkoff 0.25.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0163bf29ae74fcf0cf1b95a199f088b1ceb3313a8b1429491c3b08c0b662e52e
-  data.tar.gz: 683ee42666b4ad5594c77b79ec509c5843e88384093715fbc3f0d7d189086ff8
+  metadata.gz: 10a2b886559bd9a77cdf03a309825250a99c4e03c251f0c1699b9941aef09e30
+  data.tar.gz: cab6c6505b28ee63b79c8b6765efc2401d10f4d4ec53b6b86791283a87f5a065
 SHA512:
-  metadata.gz: 2d1a3b432d4b101558595c35b0dda58a2dadc7802bb1976091c50518355b61985287ec6089b1bfeb4f0b3588dc7426488ffcd3f4df1a52f887fb231cd49132d7
-  data.tar.gz: 68523d9b54bb9d7ab79ee23167a75a1218b6de0673d09ff71f78fad9ddebfa802c110faeb54d84c50be45ed94ea11ccf4d833d7bd87e6d453ab249df1534e2c4
+  metadata.gz: e170ab3b7c20cdf9ccb0f6fc89df6277c5bebecaa1da242f58ddeab3dbedc955e097307ad23c11b88d368ae8aeb5fa73e6c0584a05aeaa335232ec753b7235b7
+  data.tar.gz: 6ff4dcbeeaa90e46fa67578c44ce68f790de5569b5a3a19c6d7ebf3a9181aa566921b31f4a9afb0504292a274ce4e51c0b5cb0a8480d0be75b435493f4a687dc

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.25.0)
+    checkoff (0.26.1)
       activesupport
       asana (> 0.10.0)
       cache_method

data/lib/checkoff/internal/search_url/custom_field_param_converter.rb

@@ -33,14 +33,17 @@ module Checkoff
         end
 
         def merge_args_and_task_selectors(args, new_args, task_selector, new_task_selector)
-          args = args.merge(new_args)
-          return [args, task_selector] if new_task_selector == []
+          final_args = args.merge(new_args)
 
-          raise 'Teach me how to merge task selectors' unless task_selector == []
+          final_task_selector = if new_task_selector == []
+                                  task_selector
+                                elsif task_selector == []
+                                  new_task_selector
+                                else
+                                  [:and, task_selector, new_task_selector]
+                                end
 
-          task_selector = new_task_selector
-
-          [args, task_selector]
+          [final_args, final_task_selector]
         end
 
         VARIANTS = {

data/lib/checkoff/internal/search_url/custom_field_variant.rb

@@ -100,8 +100,15 @@ module Checkoff
               raise "Teach me how to handle these remaining keys for #{variant_key}: #{remaining_params}"
             end
 
-            empty_task_selector = []
-            [{ "custom_fields.#{gid}.is_set" => 'false' }, empty_task_selector]
+            api_params = { "custom_fields.#{gid}.is_set" => 'false' }
+            # As of 2023-02, the 'is_set' => 'false' seems to not do
+            # the intuitive thing on multi-select fields; it either
+            # operates as a no-op or operates the same as 'true'; not
+            # sure.
+            #
+            # Let's handle those with a filter afterwards.
+            task_selector = [:nil?, [:custom_field_gid_value, gid]]
+            [api_params, task_selector]
           end
         end
 

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -17,9 +17,35 @@ module Checkoff
       object.is_a?(Array) && !object.empty? && [fn_name, fn_name.to_s].include?(object[0])
     end
 
+    def pull_custom_field_or_raise(task, custom_field_gid)
+      custom_fields = task.custom_fields
+      if custom_fields.nil?
+        raise "Could not find custom_fields under task (was 'custom_fields' included in 'extra_fields'?)"
+      end
+
+      matched_custom_field = custom_fields.find { |data| data.fetch('gid') == custom_field_gid }
+      if matched_custom_field.nil?
+        raise "Could not find custom field with gid #{custom_field_gid} " \
+              "in task #{task.gid} with custom fields #{custom_fields}"
+      end
+
+      matched_custom_field
+    end
+
     attr_reader :task_selector
   end
 
+  # :and function
+  class AndFunctionEvaluator < FunctionEvaluator
+    def matches?
+      fn?(task_selector, :and)
+    end
+
+    def evaluate(_task, lhs, rhs)
+      lhs && rhs
+    end
+  end
+
   # :not function
   class NotFunctionEvaluator < FunctionEvaluator
     def matches?
@@ -80,6 +106,22 @@ module Checkoff
     end
   end
 
+  # :custom_field_gid_value function
+  class CustomFieldGidValueFunctionEvaluator < FunctionEvaluator
+    def matches?
+      fn?(task_selector, :custom_field_gid_value)
+    end
+
+    def evaluate_arg?(_index)
+      false
+    end
+
+    def evaluate(task, custom_field_gid)
+      custom_field = pull_custom_field_or_raise(task, custom_field_gid)
+      custom_field['display_value']
+    end
+  end
+
   # :custom_field_gid_value_contains_any_gid function
   class CustomFieldGidValueContainsAnyGidFunctionEvaluator < FunctionEvaluator
     def matches?
@@ -98,20 +140,6 @@ module Checkoff
 
     private
 
-    def pull_custom_field_or_raise(task, custom_field_gid)
-      custom_fields = task.custom_fields
-      if custom_fields.nil?
-        raise "Could not find custom_fields under task (was 'custom_fields' included in 'extra_fields'?)"
-      end
-
-      matched_custom_field = custom_fields.find { |data| data.fetch('gid') == custom_field_gid }
-      if matched_custom_field.nil?
-        raise "Could not find custom field with gid #{custom_field_gid} in #{task.gid} with #{custom_fields}"
-      end
-
-      matched_custom_field
-    end
-
     def pull_enum_values(custom_field)
       resource_subtype = custom_field.fetch('resource_subtype')
       case resource_subtype
@@ -153,7 +181,9 @@ module Checkoff
       NilPFunctionEvaluator,
       TagPFunctionEvaluator,
       CustomFieldValueFunctionEvaluator,
+      CustomFieldGidValueFunctionEvaluator,
       CustomFieldGidValueContainsAnyGidFunctionEvaluator,
+      AndFunctionEvaluator,
     ].freeze
 
     def evaluate(task_selector)

data/lib/checkoff/version.rb

@@ -3,5 +3,5 @@
 # Command-line and gem client for Asana (unofficial)
 module Checkoff
   # Version of library
-  VERSION = '0.25.0'
+  VERSION = '0.26.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport