checkoff 0.98.0 → 0.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2725cd346d11c05b4742b3dd59d1202064a3a9036ec37c2037332a02f93165eb
-  data.tar.gz: b02da55d5036d05eee1c3fb58237cf42e68c28b788be66cd0f41a07647b9e6eb
+  metadata.gz: c1944705f29ddc4dab95bb2c056b55c3aa6417cab26ca036a5493612663a4614
+  data.tar.gz: 299262b20e9331ee86755c8fced359e62889e34f1fb714c694535167356c2793
 SHA512:
-  metadata.gz: a8a4286f693c686211aa41db250b7d3825b9a846a923e53f7327ca0d94ba714f7b94ebfa8ec55964506721d4912d419318e8c2e94ef147b0ed586151a5b5d252
-  data.tar.gz: 1c1d1f4a88a447e27f3bc9beaf10ff6fec97f0b55ced249eb7cdfbcd2e36955bb5230fb3991339eecd19f44f6b5d9c2ef646746a6ee175b5d4db2d1964305f00
+  metadata.gz: f84b26f7790beb97d9f2467b00bead09cd59f60c57e448442892304bbbf7acd6c72c299ee2c890762d9682df76efcf203d5ff3b4442d88d8871b117006a18a83
+  data.tar.gz: b1478b9ac625f873fa32ab444facf710ac7246b118927fd3347ed0867ca182cb757ec8b12cbb83a29e4d00882647b6df45a93c2758fb2e4c1ebad5983b13b724

data/Gemfile.lock

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

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../function_evaluator'
+require 'checkoff/internal/task_timing'
 
 module Checkoff
   module SelectorClasses
@@ -16,6 +17,7 @@ module Checkoff
           @selector = selector
           @tasks = tasks
           @timelines = timelines
+          @task_timing = ::Checkoff::Internal::TaskTiming.new
           super()
         end
 
@@ -44,31 +46,6 @@ module Checkoff
           raise "Teach me how to handle field #{field_name}"
         end
 
-        # @param task [Asana::Resources::Task]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, Time, nil]
-        def pull_date_or_time_field_by_name(task, field_name)
-          if field_name == :due
-            return Time.parse(task.due_at) unless task.due_at.nil?
-
-            return Date.parse(task.due_on) unless task.due_on.nil?
-
-            return nil
-          end
-
-          if field_name == :start
-            return Time.parse(task.start_at) unless task.start_at.nil?
-
-            return Date.parse(task.start_on) unless task.start_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
         # @sg-ignore
         # @param task [Asana::Resources::Task]
         # @param custom_field_gid [String]

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

@@ -114,7 +114,7 @@ module Checkoff
         end
       end
 
-      # :ready_between_n_days function
+      # :ready_between_relative function
       class ReadyBetweenRelativePFunctionEvaluator < FunctionEvaluator
         FUNCTION_NAME = :ready_between_relative
 
@@ -134,24 +134,34 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, beginning_num_days_from_now, end_num_days_from_now, ignore_dependencies: false)
+          ready_between_relative?(task,
+                                  beginning_num_days_from_now, end_num_days_from_now,
+                                  ignore_dependencies: ignore_dependencies)
+        end
+
+        private
+
+        # @param task [Asana::Resources::Task]
+        # @param beginning_num_days_from_now [Integer]
+        # @param end_num_days_from_now [Integer]
+        # @param ignore_dependencies [Boolean]
+        #
+        # @return [Boolean]
+        def ready_between_relative?(task,
+                                    beginning_num_days_from_now,
+                                    end_num_days_from_now,
+                                    ignore_dependencies: false)
           beginning_n_days_from_now_time = (Time.now + (beginning_num_days_from_now * 24 * 60 * 60))
           end_n_days_from_now_time = (Time.now + (end_num_days_from_now * 24 * 60 * 60))
 
           # @type [Date, Time, nil]
-          task_date_or_time = pull_date_or_time_field_by_name(task, :start) ||
-                              pull_date_or_time_field_by_name(task, :due)
+          ready_date_or_time = @task_timing.date_or_time_field_by_name(task, :ready)
 
-          return false if task_date_or_time.nil?
+          return false if ready_date_or_time.nil?
 
-          # if time
-          in_range = if task_date_or_time.is_a?(Time)
-                       task_date_or_time > beginning_n_days_from_now_time &&
-                         task_date_or_time <= end_n_days_from_now_time
-                     else
-                       # if date
-                       task_date_or_time > beginning_n_days_from_now_time.to_date &&
-                         task_date_or_time <= end_n_days_from_now_time.to_date
-                     end
+          in_range = ready_in_range?(ready_date_or_time,
+                                     beginning_n_days_from_now_time,
+                                     end_n_days_from_now_time)
 
           return false unless in_range
 
@@ -159,6 +169,17 @@ module Checkoff
 
           true
         end
+
+        # @param ready_date_or_time [Date, Time]
+        # @param start_time [Time]
+        # @param end_time [Time]
+        def ready_in_range?(ready_date_or_time, start_time, end_time)
+          if ready_date_or_time.is_a?(Time)
+            ready_date_or_time > start_time && ready_date_or_time <= end_time
+          else
+            ready_date_or_time > start_time.to_date && ready_date_or_time <= end_time.to_date
+          end
+        end
       end
 
       # :field_less_than_n_days_ago

data/lib/checkoff/internal/task_timing.rb

@@ -5,27 +5,64 @@ module Checkoff
     # Utility methods for working with task dates and times
     class TaskTiming
       # @param time_class [Class<Time>]
-      def initialize(time_class: Time)
+      # @param date_class [Class<Date>]
+      def initialize(time_class: Time, date_class: Date)
         @time_class = time_class
+        @date_class = date_class
       end
 
       # @param task [Asana::Resources::Task]
       # @return [Time, nil]
       def start_time(task)
-        return @time_class.parse(task.start_at) if task.start_at
-        return @time_class.parse(task.start_on) if task.start_on
-
-        nil
+        date_or_time_field_by_name(task, :start)&.to_time
       end
 
       # @param task [Asana::Resources::Task]
       # @return [Time, nil]
       def due_time(task)
-        return @time_class.parse(task.due_at) if task.due_at
-        return @time_class.parse(task.due_on) if task.due_on
+        date_or_time_field_by_name(task, :due)&.to_time
+      end
+
+      # @param task [Asana::Resources::Task]
+      # @param field_name [Symbol]
+      #
+      # @sg-ignore
+      # @return [Date, Time, nil]
+      def start_date_or_time(task)
+        return @time_class.parse(task.start_at) unless task.start_at.nil?
+
+        return @date_class.parse(task.start_on) unless task.start_on.nil?
+
+        nil
+      end
+
+      # @param task [Asana::Resources::Task]
+      # @param field_name [Symbol]
+      #
+      # @sg-ignore
+      # @return [Date, Time, nil]
+      def due_date_or_time(task)
+        return @time_class.parse(task.due_at) unless task.due_at.nil?
+
+        return @date_class.parse(task.due_on) unless task.due_on.nil?
 
         nil
       end
+
+      # @param task [Asana::Resources::Task]
+      # @param field_name [Symbol]
+      #
+      # @sg-ignore
+      # @return [Date, Time, nil]
+      def date_or_time_field_by_name(task, field_name)
+        return due_date_or_time(task) if field_name == :due
+
+        return start_date_or_time(task) if field_name == :start
+
+        return start_date_or_time(task) || due_date_or_time(task) if field_name == :ready
+
+        raise "Teach me how to handle field #{field_name}"
+      end
     end
   end
 end

data/lib/checkoff/tasks.rb

@@ -27,6 +27,7 @@ module Checkoff
     # @param workspaces [Checkoff::Workspaces]
     # @param sections [Checkoff::Sections]
     # @param time_class [Class<Time>]
+    # @param date_class [Class<Date>]
     # @param asana_task [Class<Asana::Resources::Task>]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
                    client: Checkoff::Clients.new(config: config).client,
@@ -35,10 +36,12 @@ module Checkoff
                    sections: Checkoff::Sections.new(config: config,
                                                     client: client),
                    time_class: Time,
+                   date_class: Date,
                    asana_task: Asana::Resources::Task)
       @config = config
       @sections = sections
       @time_class = time_class
+      @date_class = date_class
       @asana_task = asana_task
       @client = client
       @workspaces = workspaces
@@ -167,7 +170,7 @@ module Checkoff
 
     # @return [Checkoff::Internal::TaskTiming]
     def task_timing
-      @task_timing ||= Checkoff::Internal::TaskTiming.new(time_class: @time_class)
+      @task_timing ||= Checkoff::Internal::TaskTiming.new(time_class: @time_class, date_class: @date_class)
     end
 
     # @return [Checkoff::Internal::TaskHashes]

data/lib/checkoff/version.rb

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

metadata

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