checkoff 0.24.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b36fb42ff1797a222323d199980f2bb5975c7c08f363d14c4a60a4bac2ebad
-  data.tar.gz: 1e8864d3ecae5f6ef28bb8b3466c2dd6024bc7411e00822fdc451551cf458759
+  metadata.gz: 1adcf7ca7bea1514f07f234a4952e550afeb47be68882a631d26b88231839ec4
+  data.tar.gz: e2d86531a6e256cbfb9315199b529d6e587263dc6a750c6ab3a28faa8e1f0b12
 SHA512:
-  metadata.gz: 73409fb7dc9ae6407bc57ca07599da338faf97449a2bec69df98b333310cffde433f2e006fa2186233ccdc31867a0bcdd13948816babb087a904599c30e816aa
-  data.tar.gz: f52814a389c1e25bb7d3e050d1eadbbe97613775a0de02a4aaf1e6e74e56d05a23102804a34d12d05a1b0e7f02c88570ad008bc27777aec694cad34cf9081fd3
+  metadata.gz: 636615e7e3b49a763e71c867718b6441bde385eb30533263c67030cb9b6febd7a3c233087daec5c30e2ec1e2bf24d0fe97c7480faf6feb18baf121c140e14642
+  data.tar.gz: ab00d105d5f79e402c2030a4a982fe3b863270c9477ffa4c4fccf686d79a1280ab3a20561be72311711ee481544a206f2af9785eaaab5db3d3646a466f6f888d

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.24.1)
+    checkoff (0.26.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -22,7 +22,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.1)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -167,7 +167,7 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
     tomlrb (2.0.3)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     undercover (0.4.5)
       imagen (>= 0.1.8)

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 = {
@@ -50,6 +53,7 @@ module Checkoff
           'less_than' => CustomFieldVariant::LessThan,
           'greater_than' => CustomFieldVariant::GreaterThan,
           'doesnt_contain_any' => CustomFieldVariant::DoesntContainAny,
+          'contains_any' => CustomFieldVariant::ContainsAny,
         }.freeze
 
         def convert_single_custom_field_params(gid, single_custom_field_params)

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

@@ -79,6 +79,20 @@ module Checkoff
           end
         end
 
+        # This is used in the UI for multi-select fields
+        #
+        # custom_field_#{gid}.variant = 'contains_any'
+        class ContainsAny < CustomFieldVariant
+          def convert
+            selected_options = fetch_solo_param("custom_field_#{gid}.selected_options").split('~')
+
+            [{ "custom_fields.#{gid}.is_set" => 'true' },
+             ['custom_field_gid_value_contains_any_gid',
+              gid,
+              selected_options]]
+          end
+        end
+
         # custom_field_#{gid}.variant = 'no_value'
         class NoValue < CustomFieldVariant
           def convert

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

@@ -27,25 +27,13 @@ module Checkoff
           end
 
           attr_reader :key, :values
-        end
-
-        # Handle 'any_projects.ids' search url param
-        class AnyProjectsIds < SimpleParam
-          def projects
-            @projects ||= []
-          end
 
-          def sections
-            @sections ||= []
-          end
-
-          def parse!
-            # Inputs:
-            #   123_column_456 means "abc" project, "def" section
-            #   123 means "abc" project
-            #   123~456 means "abc" and "def" projects
-            project_section_pairs = single_value.split('~')
-            project_section_pairs.each do |project_section_pair|
+          # Inputs:
+          #   123_column_456 means "abc" project, "def" section
+          #   123 means "abc" project
+          #   123~456 means "abc" and "def" projects
+          def parse_projects_and_sections(projects, sections)
+            single_value.split('~').each do |project_section_pair|
               project, section = project_section_pair.split('_column_')
               if section.nil?
                 projects << project
@@ -55,15 +43,31 @@ module Checkoff
             end
           end
 
-          def convert
-            parse!
+          def convert_from_projects_and_sections(verb)
+            projects = []
+            sections = []
+            parse_projects_and_sections(projects, sections)
             out = {}
-            out['projects.any'] = projects.join(',') unless projects.empty?
-            out['sections.any'] = sections.join(',') unless sections.empty?
+            out["projects.#{verb}"] = projects.join(',') unless projects.empty?
+            out["sections.#{verb}"] = sections.join(',') unless sections.empty?
             out.to_a.flatten
           end
         end
 
+        # Handle 'any_projects.ids' search url param
+        class AnyProjectsIds < SimpleParam
+          def convert
+            convert_from_projects_and_sections('any')
+          end
+        end
+
+        # Handle 'not_projects.ids' search url param
+        class NotProjectsIds < SimpleParam
+          def convert
+            convert_from_projects_and_sections('not')
+          end
+        end
+
         # Handle 'completion' search url param
         class Completion < SimpleParam
           def convert
@@ -116,6 +120,7 @@ module Checkoff
 
         ARGS = {
           'any_projects.ids' => SimpleParam::AnyProjectsIds,
+          'not_projects.ids' => SimpleParam::NotProjectsIds,
           'completion' => SimpleParam::Completion,
           'not_tags.ids' => SimpleParam::NotTagsIds,
           'any_tags.ids' => SimpleParam::AnyTagsIds,

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -20,6 +20,17 @@ module Checkoff
     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?
@@ -154,6 +165,7 @@ module Checkoff
       TagPFunctionEvaluator,
       CustomFieldValueFunctionEvaluator,
       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.24.1'
+  VERSION = '0.26.0'
 end

metadata

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