checkoff 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0163bf29ae74fcf0cf1b95a199f088b1ceb3313a8b1429491c3b08c0b662e52e
-  data.tar.gz: 683ee42666b4ad5594c77b79ec509c5843e88384093715fbc3f0d7d189086ff8
+  metadata.gz: 1adcf7ca7bea1514f07f234a4952e550afeb47be68882a631d26b88231839ec4
+  data.tar.gz: e2d86531a6e256cbfb9315199b529d6e587263dc6a750c6ab3a28faa8e1f0b12
 SHA512:
-  metadata.gz: 2d1a3b432d4b101558595c35b0dda58a2dadc7802bb1976091c50518355b61985287ec6089b1bfeb4f0b3588dc7426488ffcd3f4df1a52f887fb231cd49132d7
-  data.tar.gz: 68523d9b54bb9d7ab79ee23167a75a1218b6de0673d09ff71f78fad9ddebfa802c110faeb54d84c50be45ed94ea11ccf4d833d7bd87e6d453ab249df1534e2c4
+  metadata.gz: 636615e7e3b49a763e71c867718b6441bde385eb30533263c67030cb9b6febd7a3c233087daec5c30e2ec1e2bf24d0fe97c7480faf6feb18baf121c140e14642
+  data.tar.gz: ab00d105d5f79e402c2030a4a982fe3b863270c9477ffa4c4fccf686d79a1280ab3a20561be72311711ee481544a206f2af9785eaaab5db3d3646a466f6f888d

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.25.0)
+    checkoff (0.26.0)
       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/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.25.0'
+  VERSION = '0.26.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Vince Broz