checkoff 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1adcf7ca7bea1514f07f234a4952e550afeb47be68882a631d26b88231839ec4
-  data.tar.gz: e2d86531a6e256cbfb9315199b529d6e587263dc6a750c6ab3a28faa8e1f0b12
+  metadata.gz: bac942429684609678acb06e7426577be0bfd0239b9bf7ca4123e71484125746
+  data.tar.gz: 5cad1409ce70028e43f52789878b3d2cbcfaceb3bfcd26b230890a27d9d87fbf
 SHA512:
-  metadata.gz: 636615e7e3b49a763e71c867718b6441bde385eb30533263c67030cb9b6febd7a3c233087daec5c30e2ec1e2bf24d0fe97c7480faf6feb18baf121c140e14642
-  data.tar.gz: ab00d105d5f79e402c2030a4a982fe3b863270c9477ffa4c4fccf686d79a1280ab3a20561be72311711ee481544a206f2af9785eaaab5db3d3646a466f6f888d
+  metadata.gz: b68f2aa40aef9ecfe7fb4fbbe1bfac3b48f99c7cdf4ed1ed6308f93e3f4ac9f0d8b289bd5e82a7e1e05ee189b9fc62ca7cf6e07a237cb5d626318509ec24f5b8
+  data.tar.gz: 493cc1f59007c7fce4146e3bebae38a9447fa57cf418079afd835783529f8952c981e4bf86819fc8ec66f40f2c32a251da43fccafaf064316bee90f8bdbf781a

data/Gemfile.lock

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

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

@@ -49,6 +49,7 @@ module Checkoff
         VARIANTS = {
           'is' => CustomFieldVariant::Is,
           'no_value' => CustomFieldVariant::NoValue,
+          'any_value' => CustomFieldVariant::AnyValue,
           'is_not' => CustomFieldVariant::IsNot,
           'less_than' => CustomFieldVariant::LessThan,
           'greater_than' => CustomFieldVariant::GreaterThan,

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

@@ -16,6 +16,12 @@ module Checkoff
 
           attr_reader :gid, :remaining_params
 
+          def ensure_no_remaining_params!
+            return if remaining_params.length.zero?
+
+            raise "Teach me how to handle these remaining keys: #{remaining_params}"
+          end
+
           def fetch_solo_param(param_name)
             case remaining_params.keys
             when [param_name]
@@ -96,39 +102,52 @@ module Checkoff
         # custom_field_#{gid}.variant = 'no_value'
         class NoValue < CustomFieldVariant
           def convert
-            unless remaining_params.length.zero?
-              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]
+            ensure_no_remaining_params!
+
+            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
 
-        # custom_field_#{gid}.variant = 'is'
-        class Is < CustomFieldVariant
+        # custom_field_#{gid}.variant = 'any_value'
+        #
+        # Not used for multi-select fields
+        class AnyValue < CustomFieldVariant
           def convert
-            unless remaining_params.length == 1
-              raise "Teach me how to handle these remaining keys for #{variant_key}: #{remaining_params}"
-            end
+            ensure_no_remaining_params!
 
-            key, values = remaining_params.to_a[0]
-            convert_custom_field_is_arg(key, values)
+            api_params = { "custom_fields.#{gid}.is_set" => 'true' }
+            task_selector = []
+            [api_params, task_selector]
           end
+        end
 
-          private
+        # custom_field_#{gid}.variant = 'is'
+        class Is < CustomFieldVariant
+          def convert
+            selected_options = fetch_solo_param("custom_field_#{gid}.selected_options").split('~')
 
-          def convert_custom_field_is_arg(key, values)
             empty_task_selector = []
-
-            if key.end_with? '.selected_options'
-              raise "Too many values found for #{key}: #{values}" if values.length != 1
-
-              return [{ "custom_fields.#{gid}.value" => values[0] },
-                      empty_task_selector]
+            if selected_options.length == 1
+              [{ "custom_fields.#{gid}.value" => selected_options[0] },
+               empty_task_selector]
+            else
+              # As of 2023-01,
+              # https://developers.asana.com/reference/searchtasksforworkspace
+              # says "Not Supported: searching for multiple exact
+              # matches of a custom field".  So I guess we have to
+              # search this manually.
+              api_params = { "custom_fields.#{gid}.is_set" => 'true' }
+              task_selector = [:custom_field_gid_value_contains_any_gid, gid, selected_options]
+              [api_params, task_selector]
             end
-
-            raise "Teach me how to handle #{key} = #{values}"
           end
         end
       end

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -17,6 +17,21 @@ 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
 
@@ -91,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?
@@ -104,25 +135,13 @@ module Checkoff
     def evaluate(task, custom_field_gid, custom_field_values_gids)
       actual_custom_field_values_gids = pull_custom_field_values_gids(task, custom_field_gid)
 
-      (custom_field_values_gids - actual_custom_field_values_gids).empty?
+      actual_custom_field_values_gids.any? do |custom_field_value|
+        custom_field_values_gids.include?(custom_field_value)
+      end
     end
 
     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
@@ -164,6 +183,7 @@ module Checkoff
       NilPFunctionEvaluator,
       TagPFunctionEvaluator,
       CustomFieldValueFunctionEvaluator,
+      CustomFieldGidValueFunctionEvaluator,
       CustomFieldGidValueContainsAnyGidFunctionEvaluator,
       AndFunctionEvaluator,
     ].freeze

data/lib/checkoff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 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