checkoff 0.58.0 → 0.59.0

data/lib/checkoff/project_selectors.rb

@@ -5,6 +5,7 @@
 require 'forwardable'
 require 'cache_method'
 require_relative 'internal/config_loader'
+require_relative 'internal/project_selector_evaluator'
 require_relative 'workspaces'
 require_relative 'clients'
 
@@ -22,13 +23,16 @@ module Checkoff
 
     # @param config [Hash<Symbol, Object>]
     # @param workspaces [Checkoff::Workspaces]
+    # @param projects [Checkoff::Projects]
     # @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),
                    clients: Checkoff::Clients.new(config: config),
                    client: clients.client)
       @workspaces = workspaces
+      @projects = projects
       @client = client
     end
 
@@ -37,21 +41,8 @@ module Checkoff
     #        project details.  Examples: [:tag, 'foo'] [:not, [:tag, 'foo']] [:tag, 'foo']
     # @return [Boolean]
     def filter_via_project_selector(project, project_selector)
-      if project_selector == [:custom_field_values_contain_any_value, 'Project attributes', ['timeline']]
-        custom_field = project.custom_fields.find { |field| field.fetch('name') == 'Project attributes' }
-
-        return false if custom_field.nil?
-
-        # @sg-ignore
-        # @type [Hash, nil]
-        timeline = custom_field.fetch('multi_enum_values').find do |multi_enum_value|
-          multi_enum_value.fetch('name') == 'timeline'
-        end
-
-        return !timeline.nil?
-      end
-
-      raise "Teach me how to evaluate #{project} against #{project_selector}"
+      evaluator = ProjectSelectorEvaluator.new(project: project, projects: projects)
+      evaluator.evaluate(project_selector)
     end
 
     private
@@ -59,6 +50,9 @@ module Checkoff
     # @return [Checkoff::Workspaces]
     attr_reader :workspaces
 
+    # @return [Checkoff::Projects]
+    attr_reader :projects
+
     # @return [Asana::Client]
     attr_reader :client
 

data/lib/checkoff/projects.rb

@@ -54,13 +54,14 @@ module Checkoff
     # pulls an Asana API project class given a name
     # @param [String] workspace_name
     # @param [String] project_name
+    # @param [Array<String>] extra_fields
     # @return [Asana::Resources::Project, nil]
-    def project(workspace_name, project_name)
+    def project(workspace_name, project_name, extra_fields: [])
       if project_name.is_a?(Symbol) && project_name.to_s.start_with?('my_tasks')
         my_tasks(workspace_name)
       else
         # @type [Enumerable<Asana::Resources::Project>]
-        ps = projects_by_workspace_name(workspace_name)
+        ps = projects_by_workspace_name(workspace_name, extra_fields: extra_fields)
         ps.find do |project|
           project.name == project_name
         end
@@ -73,7 +74,7 @@ module Checkoff
     # @return [Asana::Resources::Project]
     def project_or_raise(workspace_name, project_name)
       p = project(workspace_name, project_name)
-      raise "Could not find project #{project_name} under workspace #{workspace_name}." if p.nil?
+      raise "Could not find project #{project_name.inspect} under workspace #{workspace_name}." if p.nil?
 
       p
     end

data/lib/checkoff/tasks.rb

@@ -119,6 +119,9 @@ module Checkoff
       dependencies = task.dependencies.map { |dependency| { 'gid' => dependency.gid } } if dependencies.nil?
 
       dependencies.any? do |parent_task_info|
+        # the real bummer though is that asana doesn't let you fetch
+        # the completion status of dependencies, so we need to do this
+        # regardless:
         parent_task_gid = parent_task_info.fetch('gid')
         parent_task = @asana_task.find_by_id(client, parent_task_gid,
                                              options: { fields: ['completed'] })

data/lib/checkoff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.59.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ files:
 - lib/checkoff/custom_fields.rb
 - lib/checkoff/internal/config_loader.rb
 - lib/checkoff/internal/create-class.sh
+- lib/checkoff/internal/project_selector_evaluator.rb
 - lib/checkoff/internal/search_url.rb
 - lib/checkoff/internal/search_url/custom_field_param_converter.rb
 - lib/checkoff/internal/search_url/custom_field_variant.rb
@@ -139,6 +140,14 @@ files:
 - lib/checkoff/internal/search_url/parser.rb
 - lib/checkoff/internal/search_url/results_merger.rb
 - lib/checkoff/internal/search_url/simple_param_converter.rb
+- lib/checkoff/internal/selector_classes/common.rb
+- lib/checkoff/internal/selector_classes/common/function_evaluator.rb
+- lib/checkoff/internal/selector_classes/function_evaluator.rb
+- lib/checkoff/internal/selector_classes/project.rb
+- lib/checkoff/internal/selector_classes/project/function_evaluator.rb
+- lib/checkoff/internal/selector_classes/task.rb
+- lib/checkoff/internal/selector_classes/task/function_evaluator.rb
+- lib/checkoff/internal/selector_evaluator.rb
 - lib/checkoff/internal/task_selector_evaluator.rb
 - lib/checkoff/my_tasks.rb
 - lib/checkoff/project_selectors.rb