checkoff 0.110.0 → 0.111.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a81e333f4fb405aaeadf79c3e41b65b8282ff8cbbcb5ffea959379e48e4209b0
-  data.tar.gz: bcb8cbf57ccc8b906efbfb350aac27b233163a207e0d7ea08afbb9803f35ce00
+  metadata.gz: 6e758f72d1a6f7cd1c2dd5b6ebb4b52964e9fa2ee6e24f9e17aa613f6c6fe23b
+  data.tar.gz: 9354f3874da0b13ec8662042475d60f67d0b67be9d22ddca07ee9938e81777f0
 SHA512:
-  metadata.gz: d93bcd456a656aaf8dd375345715b9c39c272be02c9bac9345e84827c7aaa6809a8b0414103f38ac4492dd1690a6662b28c14a9ba50604942a81439aba2dd4b7
-  data.tar.gz: 612fb95319d7be645abbebb0a45442ae9549f3a51f757903bcc4f372d65831c1c72e5fbf52b821b8bd970c27543ff96e0a4901cdcc774dc4d0e1eb164c9f00af
+  metadata.gz: 6d5945f70f231c337708a252597ffb2623c9fdc7e96996ca1acfe6337ac1082f53fd3fcc2fc0ae8fcab75c3af4b0eed5e8e469eb8ef0537558d1dfb4e5e56d36
+  data.tar.gz: e84eda5a4713bea660373ff2fc3829d861f61e4d88dd71b9127be5e077d0c9ca621fff32ec067e4890d37d1c65c67a47952f9e8478e129b3f2eae7a1c77443a6

data/Gemfile.lock

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

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/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 = @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 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 = @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 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

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/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.110.0'
+  VERSION = '0.111.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.110.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