checkoff 0.109.0 → 0.111.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 199142d4090e6eb4196958d2c73958fefdfa864c0e7e69a5e8a589f198465b2e
-  data.tar.gz: aa0739c73ce5359fe1f965e4c46674bf3a7d79a603d7bcc683f671cd5e039fd9
+  metadata.gz: 6e758f72d1a6f7cd1c2dd5b6ebb4b52964e9fa2ee6e24f9e17aa613f6c6fe23b
+  data.tar.gz: 9354f3874da0b13ec8662042475d60f67d0b67be9d22ddca07ee9938e81777f0
 SHA512:
-  metadata.gz: fce61c75d5175ad6c7ae37263f3065efc796dc496dd290616bd6cf1bb69518149231e6da378f6ee5573a8f17d1a55e73179da30e46820a61b237038b62483ff3
-  data.tar.gz: e7e2cadb887aaacb9fea39058bea689f087da8719ceba75931b768f92b170ca16bf2f93fe7731a18c4a5ebd00660ece4bfdf4f466f712bf98f7d74dc66d1e0b6
+  metadata.gz: 6d5945f70f231c337708a252597ffb2623c9fdc7e96996ca1acfe6337ac1082f53fd3fcc2fc0ae8fcab75c3af4b0eed5e8e469eb8ef0537558d1dfb4e5e56d36
+  data.tar.gz: e84eda5a4713bea660373ff2fc3829d861f61e4d88dd71b9127be5e077d0c9ca621fff32ec067e4890d37d1c65c67a47952f9e8478e129b3f2eae7a1c77443a6

data/Gemfile.lock

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

data/config/definitions.rb

@@ -37,6 +37,8 @@
 #       def portfolios; end
 #       # @return [Asana::ProxiedResourceClasses::User]
 #       def users; end
+#       # @return [Asana::ProxiedResourceClasses::CustomField]
+#       def custom_fields; end
 #     end
 #     class Collection < Asana::Resources::Collection; end
 #     module Resources
@@ -79,6 +81,15 @@
 #       end
 #     end
 #     module ProxiedResourceClasses
+#       class CustomField
+#         # Get a workspace's custom fields
+#         #
+#         # @param workspace_gid [String]  (required) Globally unique identifier for the workspace or organization.
+#         # @param options [Hash] the request I/O options
+#         #
+#         # @return [Enumerable<Asana::Resources::CustomField>]
+#         def get_custom_fields_for_workspace(workspace_gid: required("workspace_gid"), options: {}); end
+#       end
 #       class Task
 #         # Returns the complete task record for a single task.
 #         #

data/lib/checkoff/create-entity.sh

@@ -30,11 +30,17 @@ module Checkoff
     #   extend CacheMethod::ClassMethods
 
     MINUTE = 60
+    private_constant :MINUTE
     HOUR = MINUTE * 60
+    private_constant :HOUR
     DAY = 24 * HOUR
+    private_constant :DAY
     REALLY_LONG_CACHE_TIME = HOUR * 1
+    private_constant :REALLY_LONG_CACHE_TIME
     LONG_CACHE_TIME = MINUTE * 15
+    private_constant :LONG_CACHE_TIME
     SHORT_CACHE_TIME = MINUTE
+    private_constant :SHORT_CACHE_TIME
 
     # @param config [Hash]
     # @param workspaces [Checkoff::Workspaces]

data/lib/checkoff/custom_fields.rb

@@ -13,6 +13,9 @@ require_relative 'clients'
 module Checkoff
   # Work with custom fields in Asana
   class CustomFields
+    # @!parse
+    #   extend CacheMethod::ClassMethods
+
     MINUTE = 60
     HOUR = MINUTE * 60
     DAY = 24 * HOUR
@@ -20,22 +23,36 @@ module Checkoff
     LONG_CACHE_TIME = MINUTE * 15
     SHORT_CACHE_TIME = MINUTE
 
+    # @param config [Hash]
+    # @param workspaces [Checkoff::Workspaces]
+    # @param clients [Checkoff::Clients]
+    # @param client [Asana::Client]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                   workspaces: Checkoff::Workspaces.new(config: config),
                    clients: Checkoff::Clients.new(config: config),
-                   client: clients.client)
+                   client: clients.client,
+                   workspaces: Checkoff::Workspaces.new(config: config,
+                                                        client: client))
       @workspaces = workspaces
       @client = client
     end
 
+    # @param workspace_name [String]
+    # @param custom_field_name [String]
+    #
+    # @return [Asana::Resources::CustomField]
     def custom_field_or_raise(workspace_name, custom_field_name)
-      custom_field = custom_field(workspace_name, custom_field_name)
-      raise "Could not find custom_field #{custom_field_name} under workspace #{workspace_name}." if custom_field.nil?
+      cf = custom_field(workspace_name, custom_field_name)
+      raise "Could not find custom_field #{custom_field_name} under workspace #{workspace_name}." if cf.nil?
 
-      custom_field
+      cf
     end
     cache_method :custom_field_or_raise, LONG_CACHE_TIME
 
+    # @param workspace_name [String]
+    # @param custom_field_name [String]
+    #
+    # @sg-ignore
+    # @return [Asana::Resources::CustomField,nil]
     def custom_field(workspace_name, custom_field_name)
       workspace = workspaces.workspace_or_raise(workspace_name)
       custom_fields = client.custom_fields.get_custom_fields_for_workspace(workspace_gid: workspace.gid)
@@ -43,15 +60,133 @@ module Checkoff
     end
     cache_method :custom_field, LONG_CACHE_TIME
 
+    # @param resource [Asana::Resources::Project,Asana::Resources::Task]
+    # @param custom_field_gid [String]
+    #
+    # @return [Array<String>]
+    def resource_custom_field_values_gids_or_raise(resource, custom_field_gid)
+      custom_field = resource_custom_field_by_gid_or_raise(resource, custom_field_gid)
+
+      resource_custom_field_enum_values(custom_field).flat_map do |enum_value|
+        find_gids(custom_field, enum_value)
+      end
+    end
+
+    # @param resource [Asana::Resources::Project,Asana::Resources::Task]
+    # @param custom_field_name [String]
+    # @return [Array<String>]
+    def resource_custom_field_values_names_by_name(resource, custom_field_name)
+      custom_field = resource_custom_field_by_name(resource, custom_field_name)
+      return [] if custom_field.nil?
+
+      resource_custom_field_enum_values(custom_field).flat_map do |enum_value|
+        find_names(enum_value)
+      end
+    end
+
+    # @sg-ignore
+    # @param project [Asana::Resources::Task,Asana::Resources::Project]
+    # @param custom_field_name [String]
+    # @return [Hash, nil]
+    def resource_custom_field_by_name(resource, custom_field_name)
+      # @sg-ignore
+      # @type [Array<Hash>]
+      custom_fields = resource.custom_fields
+      if custom_fields.nil?
+        raise "custom fields not found on resource - did you add 'custom_fields' in your extra_fields argument?"
+      end
+
+      # @sg-ignore
+      # @type [Hash, nil]
+      custom_fields.find { |field| field.fetch('name') == custom_field_name }
+    end
+
+    # @param resource [Asana::Resources::Task,Asana::Resources::Project]
+    # @param custom_field_name [String]
+    # @return [Hash]
+    def resource_custom_field_by_name_or_raise(resource, custom_field_name)
+      custom_field = resource_custom_field_by_name(resource, custom_field_name)
+      if custom_field.nil?
+        raise "Could not find custom field with name #{custom_field_name} " \
+              "in gid #{resource.gid} with custom fields #{resource.custom_fields}"
+      end
+      custom_field
+    end
+
+    # @param resource [Asana::Resources::Project,Asana::Resources::Task]
+    # @param custom_field_gid [String]
+    # @return [Hash]
+    def resource_custom_field_by_gid_or_raise(resource, custom_field_gid)
+      # @type [Array<Hash>]
+      custom_fields = resource.custom_fields
+      if custom_fields.nil?
+        raise "Could not find custom_fields under project (was 'custom_fields' included in 'extra_fields'?)"
+      end
+
+      # @sg-ignore
+      # @type [Hash, nil]
+      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 gid #{resource.gid} with custom fields #{custom_fields}"
+      end
+
+      matched_custom_field
+    end
+
     private
 
-    attr_reader :workspaces, :client
+    # @sg-ignore
+    # @param custom_field [Hash]
+    # @return [Array<String>]
+    def resource_custom_field_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
+
+    # @param custom_field [Hash]
+    # @param enum_value [Object, nil]
+    # @return [Array<String>]
+    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
+
+    # @param custom_field [Hash]
+    # @param enum_value [Object, nil]
+    # @return [Array<String>]
+    def find_names(enum_value)
+      [enum_value.fetch('name')]
+    end
+
+    # @return [Checkoff::Workspaces]
+    attr_reader :workspaces
+
+    # @return [Asana::Client]
+    attr_reader :client
 
     # bundle exec ./custom_fields.rb
     # :nocov:
     class << self
+      # @return [void]
       def run
+        # @sg-ignore
+        # @type [String]
         workspace_name = ARGV[0] || raise('Please pass workspace name as first argument')
+        # @sg-ignore
+        # @type [String]
         custom_field_name = ARGV[1] || raise('Please pass custom_field name as second argument')
         custom_fields = Checkoff::CustomFields.new
         custom_field = custom_fields.custom_field_or_raise(workspace_name, custom_field_name)

data/lib/checkoff/internal/project_selector_evaluator.rb

@@ -9,10 +9,13 @@ module Checkoff
   class ProjectSelectorEvaluator < SelectorEvaluator
     # @param project [Asana::Resources::Project]
     # @param projects [Checkoff::Projects]
+    # @param custom_fields [Checkoff::CustomFields]
     def initialize(project:,
-                   projects: Checkoff::Projects.new)
+                   projects: Checkoff::Projects.new,
+                   custom_fields: Checkoff::CustomFields.new)
       @item = project
       @projects = projects
+      @custom_fields = custom_fields
       super()
     end
 
@@ -35,12 +38,14 @@ module Checkoff
 
     # @return [Hash]
     def initializer_kwargs
-      { projects: projects }
+      { projects: projects, custom_fields: custom_fields }
     end
 
     # @return [Asana::Resources::Project]
     attr_reader :item
     # @return [Checkoff::Projects]
     attr_reader :projects
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
   end
 end

data/lib/checkoff/internal/ready_between_relative.rb

@@ -5,14 +5,14 @@ module Checkoff
     # Determine whether a task is due within a relative date range
     class ReadyBetweenRelative
       # @param config [Hash<Symbol, Object>]
-      # @param clients [Checkoff::Clients]
+      # @param client [Asana::Client]
       # @param task_timing [Checkoff::Internal::TaskTiming]
       # @param tasks [Checkoff::Tasks]
       def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                     clients: Checkoff::Clients.new(config: config),
-                     task_timing: ::Checkoff::Internal::TaskTiming.new,
+                     client: Checkoff::Clients.new(config: config).client,
+                     task_timing: ::Checkoff::Internal::TaskTiming.new(client: client),
                      tasks: ::Checkoff::Tasks.new(config: config,
-                                                  client: clients.client))
+                                                  client: client))
         @task_timing = task_timing
         @tasks = tasks
       end

data/lib/checkoff/internal/section_selector_evaluator.rb

@@ -11,14 +11,18 @@ module Checkoff
     # @param client [Asana::Client]
     # @param projects [Checkoff::Projects]
     # @param sections [Checkoff::Sections]
+    # @param custom_fields [Checkoff::CustomFields]
     def initialize(section:,
                    client:,
                    projects: Checkoff::Projects.new(client: client),
-                   sections: Checkoff::Sections.new)
+                   sections: Checkoff::Sections.new(client: client),
+                   custom_fields: Checkoff::CustomFields.new(client: client),
+                   **_kwargs)
       @item = section
       @client = client
       @projects = projects
       @sections = sections
+      @custom_fields = custom_fields
       super()
     end
 
@@ -41,7 +45,7 @@ module Checkoff
 
     # @return [Hash]
     def initializer_kwargs
-      { sections: sections, projects: projects, client: client }
+      { sections: sections, projects: projects, client: client, custom_fields: custom_fields }
     end
 
     # @return [Asana::Resources::Project]
@@ -50,6 +54,8 @@ module Checkoff
     attr_reader :sections
     # @return [Checkoff::Projects]
     attr_reader :projects
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
     # @return [Asana::Client]
     attr_reader :client
   end

data/lib/checkoff/internal/selector_classes/common/function_evaluator.rb

@@ -8,122 +8,17 @@ module Checkoff
       # Base class to evaluate a project selector function given fully evaluated arguments
       class FunctionEvaluator < ::Checkoff::SelectorClasses::FunctionEvaluator
         # @param selector [Array<(Symbol, Array)>,String]
-        def initialize(selector:, **_kwargs)
+        # @param custom_fields [Checkoff::CustomFields]
+        def initialize(selector:, custom_fields:, **_kwargs)
           @selector = selector
+          @custom_fields = custom_fields
           super()
         end
 
         private
 
-        # @sg-ignore
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_gid [String]
-        # @return [Hash]
-        def pull_custom_field_or_raise(project, custom_field_gid)
-          # @type [Array<Hash>]
-          custom_fields = project.custom_fields
-          if custom_fields.nil?
-            raise "Could not find custom_fields under project (was 'custom_fields' included in 'extra_fields'?)"
-          end
-
-          # @sg-ignore
-          # @type [Hash, nil]
-          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 project #{project.gid} with custom fields #{custom_fields}"
-          end
-
-          matched_custom_field
-        end
-
         # @return [Array<(Symbol, Array)>]
         attr_reader :selector
-
-        # @sg-ignore
-        # @param custom_field [Hash]
-        # @return [Array<String>]
-        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
-
-        # @param custom_field [Hash]
-        # @param enum_value [Object, nil]
-        # @return [Array<String>]
-        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
-
-        # @param custom_field [Hash]
-        # @param enum_value [Object, nil]
-        # @return [Array<String>]
-        def find_names(enum_value)
-          [enum_value.fetch('name')]
-        end
-
-        # @param project [Asana::Resources::Project,Asana::Resources::Task]
-        # @param custom_field_gid [String]
-        # @return [Array<String>]
-        def pull_custom_field_values_gids_or_raise(project, custom_field_gid)
-          custom_field = pull_custom_field_or_raise(project, custom_field_gid)
-
-          pull_enum_values(custom_field).flat_map do |enum_value|
-            find_gids(custom_field, enum_value)
-          end
-        end
-
-        # @param resource [Asana::Resources::Project,Asana::Resources::Task]
-        # @param custom_field_name [String]
-        # @return [Array<String>]
-        def pull_custom_field_values_names_by_name(resource, custom_field_name)
-          custom_field = pull_custom_field_by_name(resource, custom_field_name)
-          return [] if custom_field.nil?
-
-          pull_enum_values(custom_field).flat_map do |enum_value|
-            find_names(enum_value)
-          end
-        end
-
-        # @sg-ignore
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_name [String]
-        # @return [Hash, nil]
-        def pull_custom_field_by_name(project, custom_field_name)
-          custom_fields = project.custom_fields
-          if custom_fields.nil?
-            raise "custom fields not found on project - did you add 'custom_fields' in your extra_fields argument?"
-          end
-
-          # @sg-ignore
-          # @type [Hash, nil]
-          custom_fields.find { |field| field.fetch('name') == custom_field_name }
-        end
-
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_name [String]
-        # @return [Hash]
-        def pull_custom_field_by_name_or_raise(project, custom_field_name)
-          custom_field = pull_custom_field_by_name(project, custom_field_name)
-          if custom_field.nil?
-            raise "Could not find custom field with name #{custom_field_name} " \
-                  "in project #{project.gid} with custom fields #{project.custom_fields}"
-          end
-          custom_field
-        end
       end
     end
   end

data/lib/checkoff/internal/selector_classes/common.rb

@@ -105,7 +105,7 @@ module Checkoff
         # @param custom_field_name [String]
         # @return [String, nil]
         def evaluate(resource, custom_field_name)
-          custom_field = pull_custom_field_by_name(resource, custom_field_name)
+          custom_field = @custom_fields.resource_custom_field_by_name(resource, custom_field_name)
           return nil if custom_field.nil?
 
           custom_field['display_value']
@@ -127,7 +127,7 @@ module Checkoff
         # @param custom_field_gid [String]
         # @return [String, nil]
         def evaluate(resource, custom_field_gid)
-          custom_field = pull_custom_field_or_raise(resource, custom_field_gid)
+          custom_field = @custom_fields.resource_custom_field_by_gid_or_raise(resource, custom_field_gid)
           custom_field['display_value']
         end
       end
@@ -149,7 +149,8 @@ module Checkoff
         # @param custom_field_values_gids [Array<String>]
         # @return [Boolean]
         def evaluate(resource, custom_field_gid, custom_field_values_gids)
-          actual_custom_field_values_gids = pull_custom_field_values_gids_or_raise(resource, custom_field_gid)
+          actual_custom_field_values_gids = @custom_fields.resource_custom_field_values_gids_or_raise(resource,
+                                                                                                      custom_field_gid)
 
           actual_custom_field_values_gids.any? do |custom_field_value|
             custom_field_values_gids.include?(custom_field_value)
@@ -174,7 +175,9 @@ module Checkoff
         # @param custom_field_value_names [Array<String>]
         # @return [Boolean]
         def evaluate(resource, custom_field_name, custom_field_value_names)
-          actual_custom_field_values_names = pull_custom_field_values_names_by_name(resource, custom_field_name)
+          actual_custom_field_values_names =
+            @custom_fields.resource_custom_field_values_names_by_name(resource,
+                                                                      custom_field_name)
 
           actual_custom_field_values_names.any? do |custom_field_value|
             custom_field_value_names.include?(custom_field_value)
@@ -199,7 +202,9 @@ module Checkoff
         # @param custom_field_values_gids [Array<String>]
         # @return [Boolean]
         def evaluate(resource, custom_field_gid, custom_field_values_gids)
-          actual_custom_field_values_gids = pull_custom_field_values_gids_or_raise(resource, custom_field_gid)
+          actual_custom_field_values_gids =
+            @custom_fields.resource_custom_field_values_gids_or_raise(resource,
+                                                                      custom_field_gid)
 
           custom_field_values_gids.all? do |custom_field_value|
             actual_custom_field_values_gids.include?(custom_field_value)

data/lib/checkoff/internal/selector_classes/project/function_evaluator.rb

@@ -10,7 +10,8 @@ module Checkoff
         # @param selector [Array<(Symbol, Array)>,String]
         # @param projects [Checkoff::Projects]
         def initialize(selector:,
-                       projects:)
+                       projects:,
+                       **_kwargs)
           @selector = selector
           @projects = projects
           super()
@@ -18,95 +19,8 @@ module Checkoff
 
         private
 
-        # @sg-ignore
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_gid [String]
-        # @return [Hash]
-        def pull_custom_field_or_raise(project, custom_field_gid)
-          # @type [Array<Hash>]
-          custom_fields = project.custom_fields
-          if custom_fields.nil?
-            raise "Could not find custom_fields under project (was 'custom_fields' included in 'extra_fields'?)"
-          end
-
-          # @sg-ignore
-          # @type [Hash, nil]
-          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 project #{project.gid} with custom fields #{custom_fields}"
-          end
-
-          matched_custom_field
-        end
-
         # @return [Array<(Symbol, Array)>]
         attr_reader :selector
-
-        # @sg-ignore
-        # @param custom_field [Hash]
-        # @return [Array<String>]
-        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
-
-        # @param custom_field [Hash]
-        # @param enum_value [Object, nil]
-        # @return [Array<String>]
-        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
-
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_gid [String]
-        # @return [Array<String>]
-        def pull_custom_field_values_gids(project, custom_field_gid)
-          custom_field = pull_custom_field_or_raise(project, custom_field_gid)
-          pull_enum_values(custom_field).flat_map do |enum_value|
-            find_gids(custom_field, enum_value)
-          end
-        end
-
-        # @sg-ignore
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_name [String]
-        # @return [Hash, nil]
-        def pull_custom_field_by_name(project, custom_field_name)
-          custom_fields = project.custom_fields
-          if custom_fields.nil?
-            raise "custom fields not found on project - did you add 'custom_fields' in your extra_fields argument?"
-          end
-
-          # @sg-ignore
-          # @type [Hash, nil]
-          custom_fields.find { |field| field.fetch('name') == custom_field_name }
-        end
-
-        # @param project [Asana::Resources::Project]
-        # @param custom_field_name [String]
-        # @return [Hash]
-        def pull_custom_field_by_name_or_raise(project, custom_field_name)
-          custom_field = pull_custom_field_by_name(project, custom_field_name)
-          if custom_field.nil?
-            raise "Could not find custom field with name #{custom_field_name} " \
-                  "in project #{project.gid} with custom fields #{project.custom_fields}"
-          end
-          custom_field
-        end
       end
     end
   end

data/lib/checkoff/internal/selector_classes/section.rb

@@ -7,7 +7,7 @@ module Checkoff
     # Section selector classes
     module Section
       # :ends_with_milestone function
-      class DueDateFunctionEvaluator < FunctionEvaluator
+      class EndsWithMilestoneFunctionEvaluator < FunctionEvaluator
         FUNCTION_NAME = :ends_with_milestone
 
         def matches?

data/lib/checkoff/internal/selector_classes/task/function_evaluator.rb

@@ -10,106 +10,23 @@ module Checkoff
         # @param selector [Array<(Symbol, Array)>,String]
         # @param tasks [Checkoff::Tasks]
         # @param timelines [Checkoff::Timelines]
+        # @param custom_fields [Checkoff::CustomFields]
         def initialize(selector:,
                        tasks:,
-                       timelines:)
+                       timelines:,
+                       custom_fields:,
+                       **_kwargs)
           @selector = selector
           @tasks = tasks
           @timelines = timelines
+          @custom_fields = custom_fields
           super()
         end
 
         private
 
-        # @sg-ignore
-        # @param task [Asana::Resources::Task]
-        # @param custom_field_gid [String]
-        # @return [Hash]
-        def pull_custom_field_or_raise(task, custom_field_gid)
-          # @type [Array<Hash>]
-          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
-
-          # @sg-ignore
-          # @type [Hash, nil]
-          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
-
         # @return [Array<(Symbol, Array)>]
         attr_reader :selector
-
-        # @sg-ignore
-        # @param custom_field [Hash]
-        # @return [Array<String>]
-        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
-
-        # @param custom_field [Hash]
-        # @param enum_value [Object, nil]
-        # @return [Array<String>]
-        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
-
-        # @param task [Asana::Resources::Task]
-        # @param custom_field_gid [String]
-        # @return [Array<String>]
-        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
-
-        # @sg-ignore
-        # @param task [Asana::Resources::Task]
-        # @param custom_field_name [String]
-        # @return [Hash, nil]
-        def pull_custom_field_by_name(task, custom_field_name)
-          custom_fields = task.custom_fields
-          if custom_fields.nil?
-            raise "custom fields not found on task - did you add 'custom_fields' in your extra_fields argument?"
-          end
-
-          # @sg-ignore
-          # @type [Hash, nil]
-          custom_fields.find { |field| field.fetch('name') == custom_field_name }
-        end
-
-        # @param task [Asana::Resources::Task]
-        # @param custom_field_name [String]
-        # @return [Hash]
-        def pull_custom_field_by_name_or_raise(task, custom_field_name)
-          custom_field = pull_custom_field_by_name(task, custom_field_name)
-          if custom_field.nil?
-            raise "Could not find custom field with name #{custom_field_name} " \
-                  "in task #{task.gid} with custom fields #{task.custom_fields}"
-          end
-          custom_field
-        end
       end
     end
   end

data/lib/checkoff/internal/selector_classes/task.rb

@@ -166,73 +166,14 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, beginning_num_days_from_now, end_num_days_from_now, ignore_dependencies: false)
-          ready_between_relative = Checkoff::Internal::ReadyBetweenRelative.new(tasks: @tasks)
+          ready_between_relative = Checkoff::Internal::ReadyBetweenRelative.new(tasks: @tasks,
+                                                                                client: @client)
           ready_between_relative.ready_between_relative?(task,
                                                          beginning_num_days_from_now, end_num_days_from_now,
                                                          ignore_dependencies: ignore_dependencies)
         end
       end
 
-      # :custom_field_less_than_n_days_from_now function
-      class CustomFieldLessThanNDaysFromNowFunctionEvaluator < FunctionEvaluator
-        FUNCTION_NAME = :custom_field_less_than_n_days_from_now
-
-        def matches?
-          fn?(selector, FUNCTION_NAME)
-        end
-
-        def evaluate_arg?(_index)
-          false
-        end
-
-        # @param task [Asana::Resources::Task]
-        # @param custom_field_name [String]
-        # @param num_days [Integer]
-        # @return [Boolean]
-        def evaluate(task, custom_field_name, num_days)
-          custom_field = pull_custom_field_by_name_or_raise(task, custom_field_name)
-
-          # @sg-ignore
-          # @type [String, nil]
-          time_str = custom_field.fetch('display_value')
-          return false if time_str.nil?
-
-          time = Time.parse(time_str)
-          n_days_from_now = (Time.now + (num_days * 24 * 60 * 60))
-          time < n_days_from_now
-        end
-      end
-
-      # :custom_field_greater_than_or_equal_to_n_days_from_now function
-      class CustomFieldGreaterThanOrEqualToNDaysFromNowFunctionEvaluator < FunctionEvaluator
-        FUNCTION_NAME = :custom_field_greater_than_or_equal_to_n_days_from_now
-
-        def matches?
-          fn?(selector, FUNCTION_NAME)
-        end
-
-        def evaluate_arg?(_index)
-          false
-        end
-
-        # @param task [Asana::Resources::Task]
-        # @param custom_field_name [String]
-        # @param num_days [Integer]
-        # @return [Boolean]
-        def evaluate(task, custom_field_name, num_days)
-          custom_field = pull_custom_field_by_name_or_raise(task, custom_field_name)
-
-          # @sg-ignore
-          # @type [String, nil]
-          time_str = custom_field.fetch('display_value')
-          return false if time_str.nil?
-
-          time = Time.parse(time_str)
-          n_days_from_now = (Time.now + (num_days * 24 * 60 * 60))
-          time >= n_days_from_now
-        end
-      end
-
       # :last_story_created_less_than_n_days_ago function
       class LastStoryCreatedLessThanNDaysAgoFunctionEvaluator < FunctionEvaluator
         FUNCTION_NAME = :last_story_created_less_than_n_days_ago
@@ -289,7 +230,7 @@ module Checkoff
         # @param task [Asana::Resources::Task]
         # @return [Boolean]
         def evaluate(task)
-          custom_field = pull_custom_field_by_name(task, 'Estimated time')
+          custom_field = @custom_fields.resource_custom_field_by_name(task, 'Estimated time')
 
           return false if custom_field.nil?
 

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -10,12 +10,15 @@ module Checkoff
     # @param task [Asana::Resources::Task]
     # @param tasks [Checkoff::Tasks]
     # @param timelines [Checkoff::Timelines]
+    # @param custom_fields [Checkoff::CustomFields]
     def initialize(task:,
                    tasks: Checkoff::Tasks.new,
-                   timelines: Checkoff::Timelines.new)
+                   timelines: Checkoff::Timelines.new,
+                   custom_fields: Checkoff::CustomFields.new)
       @item = task
       @tasks = tasks
       @timelines = timelines
+      @custom_fields = custom_fields
       super()
     end
 
@@ -38,7 +41,7 @@ module Checkoff
 
     # @return [Hash]
     def initializer_kwargs
-      { tasks: tasks, timelines: timelines }
+      { tasks: tasks, timelines: timelines, custom_fields: custom_fields }
     end
 
     # @return [Asana::Resources::Task]
@@ -47,5 +50,7 @@ module Checkoff
     attr_reader :tasks
     # @return [Checkoff::Timelines]
     attr_reader :timelines
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
   end
 end

data/lib/checkoff/internal/task_timing.rb

@@ -6,9 +6,14 @@ module Checkoff
     class TaskTiming
       # @param time_class [Class<Time>]
       # @param date_class [Class<Date>]
-      def initialize(time_class: Time, date_class: Date)
+      # @param client [Asana::Client]
+      # @param custom_fields [Checkoff::CustomFields]
+      def initialize(time_class: Time, date_class: Date,
+                     client: Checkoff::Clients.new.client,
+                     custom_fields: Checkoff::CustomFields.new(client: client))
         @time_class = time_class
         @date_class = date_class
+        @custom_fields = custom_fields
       end
 
       # @param task [Asana::Resources::Task]
@@ -56,6 +61,20 @@ module Checkoff
         return @time_class.parse(task.modified_at) unless task.modified_at.nil?
       end
 
+      # @param task [Asana::Resources::Task]
+      # @param custom_field_name [String]
+      #
+      # @return [Time, Date, nil]
+      def custom_field(task, custom_field_name)
+        custom_field = @custom_fields.resource_custom_field_by_name_or_raise(task, custom_field_name)
+        # @sg-ignore
+        # @type [String, nil]
+        time_str = custom_field.fetch('display_value')
+        return nil if time_str.nil?
+
+        Time.parse(time_str)
+      end
+
       # @param task [Asana::Resources::Task]
       # @param field_name [Symbol]
       #
@@ -70,6 +89,15 @@ module Checkoff
 
         return start_date_or_time(task) || due_date_or_time(task) if field_name == :ready
 
+        if field_name.is_a?(Array)
+          # @sg-ignore
+          # @type [Symbol]
+          actual_field_name = field_name.first
+          args = field_name[1..]
+
+          return custom_field(task, *args) if actual_field_name == :custom_field
+        end
+
         raise "Teach me how to handle field #{field_name}"
       end
     end

data/lib/checkoff/project_selectors.rb

@@ -22,15 +22,18 @@ module Checkoff
     # @param config [Hash<Symbol, Object>]
     # @param workspaces [Checkoff::Workspaces]
     # @param projects [Checkoff::Projects]
+    # @param custom_fields [Checkoff::CustomFields]
     # @param clients [Checkoff::Clients]
     # @param client [Asana::Client]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
                    workspaces: Checkoff::Workspaces.new(config: config),
                    projects: Checkoff::Projects.new(config: config),
+                   custom_fields: Checkoff::CustomFields.new(config: config),
                    clients: Checkoff::Clients.new(config: config),
                    client: clients.client)
       @workspaces = workspaces
       @projects = projects
+      @custom_fields = custom_fields
       @client = client
     end
 
@@ -39,7 +42,7 @@ module Checkoff
     #        project details.  Examples: [:tag, 'foo'] [:not, [:tag, 'foo']] [:tag, 'foo']
     # @return [Boolean]
     def filter_via_project_selector(project, project_selector)
-      evaluator = ProjectSelectorEvaluator.new(project: project, projects: projects)
+      evaluator = ProjectSelectorEvaluator.new(project: project, projects: projects, custom_fields: custom_fields)
       evaluator.evaluate(project_selector)
     end
 
@@ -51,6 +54,9 @@ module Checkoff
     # @return [Checkoff::Projects]
     attr_reader :projects
 
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
+
     # @return [Asana::Client]
     attr_reader :client
 

data/lib/checkoff/section_selectors.rb

@@ -22,15 +22,18 @@ module Checkoff
     # @param config [Hash<Symbol, Object>]
     # @param workspaces [Checkoff::Workspaces]
     # @param sections [Checkoff::Sections]
+    # @param custom_fields [Checkoff::CustomFields]
     # @param clients [Checkoff::Clients]
     # @param client [Asana::Client]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
                    workspaces: Checkoff::Workspaces.new(config: config),
                    sections: Checkoff::Sections.new(config: config),
+                   custom_fields: Checkoff::CustomFields.new(config: config),
                    clients: Checkoff::Clients.new(config: config),
                    client: clients.client)
       @workspaces = workspaces
       @sections = sections
+      @custom_fields = custom_fields
       @client = client
     end
 
@@ -40,7 +43,8 @@ module Checkoff
     # @return [Boolean]
     def filter_via_section_selector(section, section_selector)
       # @sg-ignore
-      evaluator = SectionSelectorEvaluator.new(section: section, sections: sections, client: client)
+      evaluator = SectionSelectorEvaluator.new(section: section, sections: sections, custom_fields: custom_fields,
+                                               client: client)
       evaluator.evaluate(section_selector)
     end
 
@@ -52,6 +56,9 @@ module Checkoff
     # @return [Checkoff::Sections]
     attr_reader :sections
 
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
+
     # @return [Asana::Client]
     attr_reader :client
 

data/lib/checkoff/task_selectors.rb

@@ -29,10 +29,13 @@ module Checkoff
                    tasks: Checkoff::Tasks.new(config: config,
                                               client: client),
                    timelines: Checkoff::Timelines.new(config: config,
-                                                      client: client))
+                                                      client: client),
+                   custom_fields: Checkoff::CustomFields.new(config: config,
+                                                             client: client))
       @config = config
       @tasks = tasks
       @timelines = timelines
+      @custom_fields = custom_fields
     end
 
     # @param [Asana::Resources::Task] task
@@ -40,7 +43,8 @@ module Checkoff
     #        task details.  Examples: [:tag, 'foo'] [:not, [:tag, 'foo']] [:tag, 'foo']
     # @return [Boolean]
     def filter_via_task_selector(task, task_selector)
-      evaluator = TaskSelectorEvaluator.new(task: task, tasks: tasks, timelines: timelines)
+      evaluator = TaskSelectorEvaluator.new(task: task, tasks: tasks, timelines: timelines,
+                                            custom_fields: custom_fields)
       evaluator.evaluate(task_selector)
     end
 
@@ -52,6 +56,9 @@ module Checkoff
     # @return [Checkoff::Timelines]
     attr_reader :timelines
 
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
+
     # bundle exec ./task_selectors.rb
     # :nocov:
     class << self

data/lib/checkoff/tasks.rb

@@ -28,6 +28,7 @@ module Checkoff
     # @param workspaces [Checkoff::Workspaces]
     # @param sections [Checkoff::Sections]
     # @param portfolios [Checkoff::Portfolios]
+    # @param custom_fields [Checkoff::CustomFields]
     # @param time_class [Class<Time>]
     # @param date_class [Class<Date>]
     # @param asana_task [Class<Asana::Resources::Task>]
@@ -39,6 +40,8 @@ module Checkoff
                                                     client: client),
                    portfolios: Checkoff::Portfolios.new(config: config,
                                                         client: client),
+                   custom_fields: Checkoff::CustomFields.new(config: config,
+                                                             client: client),
                    time_class: Time,
                    date_class: Date,
                    asana_task: Asana::Resources::Task)
@@ -49,6 +52,7 @@ module Checkoff
       @asana_task = asana_task
       @client = client
       @portfolios = portfolios
+      @custom_fields = custom_fields
       @workspaces = workspaces
       @timing = Timing.new(today_getter: date_class, now_getter: time_class)
     end
@@ -73,7 +77,7 @@ module Checkoff
     end
 
     # @param task [Asana::Resources::Task]
-    # @param field_name [Symbol]
+    # @param field_name [Symbol,Array]
     # @param period [Symbol<:now_or_before,:this_week>,Array] See Checkoff::Timing#in_period?_
     def in_period?(task, field_name, period)
       # @type [Date,Time,nil]
@@ -210,7 +214,9 @@ module Checkoff
 
     # @return [Checkoff::Internal::TaskTiming]
     def task_timing
-      @task_timing ||= Checkoff::Internal::TaskTiming.new(time_class: @time_class, date_class: @date_class)
+      @task_timing ||= Checkoff::Internal::TaskTiming.new(time_class: @time_class, date_class: @date_class,
+                                                          client: client,
+                                                          custom_fields: custom_fields)
     end
 
     # @return [Checkoff::Internal::TaskHashes]
@@ -246,6 +252,9 @@ module Checkoff
     # @return [Checkoff::Timing]
     attr_reader :timing
 
+    # @return [Checkoff::CustomFields]
+    attr_reader :custom_fields
+
     # @return [Checkoff::Projects]
     def projects
       @projects ||= @sections.projects

data/lib/checkoff/timing.rb

@@ -68,6 +68,15 @@ module Checkoff
       date >= n_days_from_today
     end
 
+    # @param date_or_time [Date,Time,nil]
+    # @param num_days [Integer]
+    def greater_than_or_equal_to_n_days_from_now?(date_or_time, num_days)
+      return false if date_or_time.nil?
+
+      n_days_from_now = (@now_getter.now + (num_days * 24 * 60 * 60))
+      date_or_time >= n_days_from_now
+    end
+
     # @param date_or_time [Date,Time,nil]
     # @param num_days [Integer]
     def less_than_n_days_ago?(date_or_time, num_days)
@@ -81,6 +90,15 @@ module Checkoff
       date < n_days_ago
     end
 
+    # @param date_or_time [Date,Time,nil]
+    # @param num_days [Integer]
+    def less_than_n_days_from_now?(date_or_time, num_days)
+      return false if date_or_time.nil?
+
+      n_days_from_now = (@now_getter.now + (num_days * 24 * 60 * 60))
+      date_or_time < n_days_from_now
+    end
+
     # @param date_or_time [Date,Time,nil]
     def this_week?(date_or_time)
       return true if date_or_time.nil?
@@ -112,10 +130,17 @@ module Checkoff
       # @sg-ignore
       return less_than_n_days_ago?(date_or_time, *args) if period_name == :less_than_n_days_ago
 
+      return less_than_n_days_from_now?(date_or_time, *args) if period_name == :less_than_n_days_from_now
+
+      if period_name == :greater_than_or_equal_to_n_days_from_now
+        return greater_than_or_equal_to_n_days_from_now?(date_or_time,
+                                                         *args)
+      end
+
       if period_name == :greater_than_or_equal_to_n_days_from_today
-        return greater_than_or_equal_to_n_days_from_today?(date_or_time,
-                                                           *args)
+        return greater_than_or_equal_to_n_days_from_today?(date_or_time, *args)
       end
+
       raise "Teach me how to handle period [#{period_name.inspect}, #{args.join(', ')}]"
     end
 

data/lib/checkoff/version.rb

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

metadata

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