checkoff 0.29.3 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced71b64a24369d0c0fe302b321d7f1002230d76c8dcdf725f4f638f6123aca2
-  data.tar.gz: 530c801995de6d17d5dc183edd6211b2c1cf16885bc27be72d9400a9a40eb172
+  metadata.gz: 56b8922e030c6770a830b116c1b436f31621670e1a80617e01bf35c5756688fd
+  data.tar.gz: efa9bbbf45f71ef73df1ec5e1ebc0501915ae6c92b43d6246e48d9866b76da57
 SHA512:
-  metadata.gz: 7fc6c123962608a1ec0209112e1c61a71423f7d410e32b464a637a29681cde1ac4d7c7571cfc54b0a6f7647b93d63f23a6284036dcef9ef43517bb68451f57f7
-  data.tar.gz: 811034e7770c45ccf89b71e29a394a997143ca567d8aa22b1c4be74e69f9f74242fb40045b0598ec5db1c4ef472478a55c6a99a8efc24c7244e98b77a14affaf
+  metadata.gz: 9b09f82050f2a5b15fc15c8b34ef70093cc7502e64cc5a59d90bc475fce7cdd957dfe4e00d5223ab7c185c2b7f5ddaddc27f1830264c70b3b2279389032c114a
+  data.tar.gz: 05627d4fc018a5eae0bf06a226dccf0819ac836a297f56c221b69b5b255f74e2e3501ab8f3e99bfffd4c65984d712e667c9c2e0332fba407fb00f95f7c27a582

data/Gemfile.lock

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

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

@@ -55,6 +55,7 @@ module Checkoff
           'greater_than' => CustomFieldVariant::GreaterThan,
           'doesnt_contain_any' => CustomFieldVariant::DoesntContainAny,
           'contains_any' => CustomFieldVariant::ContainsAny,
+          'contains_all' => CustomFieldVariant::ContainsAll,
         }.freeze
 
         def convert_single_custom_field_params(gid, single_custom_field_params)

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

@@ -99,6 +99,20 @@ module Checkoff
           end
         end
 
+        # This is used in the UI for multi-select fields
+        #
+        # custom_field_#{gid}.variant = 'contains_all'
+        class ContainsAll < 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_all_gids',
+              gid,
+              selected_options]]
+          end
+        end
+
         # custom_field_#{gid}.variant = 'no_value'
         class NoValue < CustomFieldVariant
           def convert

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -35,6 +35,35 @@ module Checkoff
     end
 
     attr_reader :task_selector
+
+    def pull_enum_values(custom_field)
+      resource_subtype = custom_field.fetch('resource_subtype')
+      case resource_subtype
+      when 'enum'
+        [custom_field.fetch('enum_value')]
+      when 'multi_enum'
+        custom_field.fetch('multi_enum_values')
+      else
+        raise "Teach me how to handle resource_subtype #{resource_subtype}"
+      end
+    end
+
+    def find_gids(custom_field, enum_value)
+      if enum_value.nil?
+        []
+      else
+        raise "Unexpected enabled value on custom field: #{custom_field}" if enum_value.fetch('enabled') == false
+
+        [enum_value.fetch('gid')]
+      end
+    end
+
+    def pull_custom_field_values_gids(task, custom_field_gid)
+      custom_field = pull_custom_field_or_raise(task, custom_field_gid)
+      pull_enum_values(custom_field).flat_map do |enum_value|
+        find_gids(custom_field, enum_value)
+      end
+    end
   end
 
   # :and function
@@ -152,35 +181,23 @@ module Checkoff
         custom_field_values_gids.include?(custom_field_value)
       end
     end
+  end
 
-    private
-
-    def pull_enum_values(custom_field)
-      resource_subtype = custom_field.fetch('resource_subtype')
-      case resource_subtype
-      when 'enum'
-        [custom_field.fetch('enum_value')]
-      when 'multi_enum'
-        custom_field.fetch('multi_enum_values')
-      else
-        raise "Teach me how to handle resource_subtype #{resource_subtype}"
-      end
+  # :custom_field_gid_value_contains_all_gids function
+  class CustomFieldGidValueContainsAllGidsFunctionEvaluator < FunctionEvaluator
+    def matches?
+      fn?(task_selector, :custom_field_gid_value_contains_all_gids)
     end
 
-    def find_gids(custom_field, enum_value)
-      if enum_value.nil?
-        []
-      else
-        raise "Unexpected enabled value on custom field: #{custom_field}" if enum_value.fetch('enabled') == false
-
-        [enum_value.fetch('gid')]
-      end
+    def evaluate_arg?(_index)
+      false
     end
 
-    def pull_custom_field_values_gids(task, custom_field_gid)
-      custom_field = pull_custom_field_or_raise(task, custom_field_gid)
-      pull_enum_values(custom_field).flat_map do |enum_value|
-        find_gids(custom_field, enum_value)
+    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.all? do |custom_field_value|
+        actual_custom_field_values_gids.include?(custom_field_value)
       end
     end
   end
@@ -200,6 +217,7 @@ module Checkoff
       CustomFieldValueFunctionEvaluator,
       CustomFieldGidValueFunctionEvaluator,
       CustomFieldGidValueContainsAnyGidFunctionEvaluator,
+      CustomFieldGidValueContainsAllGidsFunctionEvaluator,
       AndFunctionEvaluator,
       DuePFunctionEvaluator,
     ].freeze

data/lib/checkoff/projects.rb

@@ -24,9 +24,9 @@ module Checkoff
     SHORT_CACHE_TIME = MINUTE
 
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                   workspaces: Checkoff::Workspaces.new(config: config),
-                   clients: Checkoff::Clients.new(config: config),
-                   client: clients.client)
+                   client: Checkoff::Clients.new(config: config).client,
+                   workspaces: Checkoff::Workspaces.new(config: config,
+                                                        client: client))
       @config = config
       @workspaces = workspaces
       @client = client

data/lib/checkoff/sections.rb

@@ -18,10 +18,11 @@ module Checkoff
     attr_reader :projects, :workspaces, :time, :my_tasks
 
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                   projects: Checkoff::Projects.new(config: config),
-                   workspaces: Checkoff::Workspaces.new(config: config),
-                   clients: Checkoff::Clients.new(config: config),
-                   client: clients.client,
+                   client: Checkoff::Clients.new(config: config).client,
+                   projects: Checkoff::Projects.new(config: config,
+                                                    client: client),
+                   workspaces: Checkoff::Workspaces.new(config: config,
+                                                        client: client),
                    time: Time)
       @projects = projects
       @workspaces = workspaces

data/lib/checkoff/tasks.rb

@@ -15,9 +15,9 @@ module Checkoff
     SHORT_CACHE_TIME = MINUTE * 5
 
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                   sections: Checkoff::Sections.new(config: config),
-                   clients: Checkoff::Clients.new(config: config),
-                   client: clients.client,
+                   client: Checkoff::Clients.new(config: config).client,
+                   sections: Checkoff::Sections.new(config: config,
+                                                    client: client),
                    time_class: Time,
                    asana_task: Asana::Resources::Task)
       @config = config

data/lib/checkoff/version.rb

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

data/lib/checkoff/workspaces.rb

@@ -18,8 +18,7 @@ module Checkoff
     SHORT_CACHE_TIME = MINUTE
 
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                   clients: Checkoff::Clients.new(config: config),
-                   client: clients.client)
+                   client: Checkoff::Clients.new(config: config).client)
       @config = config
       @client = client
     end

metadata

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