checkoff 0.103.0 → 0.105.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ab918128cd0d805829245306102209f7715f9dfa580a8861b4e97be7aa3b31
-  data.tar.gz: 0c40f9f30d1a0441de43140dcd442d783c7b6ae5e584e9b0ed23e13acbe5e35e
+  metadata.gz: 4edf9b863abc88b80a990f28fa9a966eaff3d48b9ff267ff0f0c572ef20fda87
+  data.tar.gz: e250e14a24ccc7463fc80dac424f9dc04eca6ff43522c8fc5795c4e8ea04390f
 SHA512:
-  metadata.gz: 4b0ce332d7ee01af5680511dd1c7da6b7654f94b153b3240d344c64663ebc71ceaff79bc4ae2fb01846430904e167a36b81d55ac581f992524eef3dae50c6783
-  data.tar.gz: 738deef8848a424fe874711c874f83b70b14320b9df49a85da6b187da8e817887a3d3de9b63cc65411cf866e5813eb759d5c051eaf9b3c1d50726a98fa3dde33
+  metadata.gz: f9e5100c88fa3a02f678845db245ca271632015ba814c06c6d9cb795cbcf6f0988d7a57676163f66cdcc649c4542f628d91c467512e20531587d8e3391d2a20a
+  data.tar.gz: 626ab57ad3597d651dfea7d41f2fd640286de88d2bfa79cc71c1dff2602db8ecb23536fb32b4e332d8e1f2130405e485f83a62e5e3638c4ced96ea67e1d464f0

data/Gemfile.lock

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

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

@@ -15,54 +15,6 @@ module Checkoff
 
         private
 
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, nil]
-        def pull_date_field_by_name(project, field_name)
-          if field_name == :modified
-            return Time.parse(project.modified_at).to_date unless project.modified_at.nil?
-
-            return nil
-          end
-
-          if field_name == :due
-            return Time.parse(project.due_at).to_date unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, Time, nil]
-        def pull_date_or_time_field_by_name(project, field_name)
-          if field_name == :due
-            return Time.parse(project.due_at) unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          if field_name == :start
-            return Time.parse(project.start_at) unless project.start_at.nil?
-
-            return Date.parse(project.start_on) unless project.start_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
         # @sg-ignore
         # @param project [Asana::Resources::Project]
         # @param custom_field_gid [String]

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

@@ -18,54 +18,6 @@ module Checkoff
 
         private
 
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, nil]
-        def pull_date_field_by_name(project, field_name)
-          if field_name == :modified
-            return Time.parse(project.modified_at).to_date unless project.modified_at.nil?
-
-            return nil
-          end
-
-          if field_name == :due
-            return Time.parse(project.due_at).to_date unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, Time, nil]
-        def pull_date_or_time_field_by_name(project, field_name)
-          if field_name == :due
-            return Time.parse(project.due_at) unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          if field_name == :start
-            return Time.parse(project.start_at) unless project.start_at.nil?
-
-            return Date.parse(project.start_on) unless project.start_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
         # @sg-ignore
         # @param project [Asana::Resources::Project]
         # @param custom_field_gid [String]

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../function_evaluator'
-require 'checkoff/internal/task_timing'
 
 module Checkoff
   module SelectorClasses
@@ -22,29 +21,6 @@ module Checkoff
 
         private
 
-        # @param task [Asana::Resources::Task]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, nil]
-        def pull_date_field_by_name(task, field_name)
-          if field_name == :modified
-            return Time.parse(task.modified_at).to_date unless task.modified_at.nil?
-
-            return nil
-          end
-
-          if field_name == :due
-            return Time.parse(task.due_at).to_date unless task.due_at.nil?
-
-            return Date.parse(task.due_on) unless task.due_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

@@ -2,6 +2,7 @@
 
 require_relative 'task/function_evaluator'
 require 'checkoff/internal/ready_between_relative'
+require 'checkoff/internal/task_timing'
 
 module Checkoff
   module SelectorClasses
@@ -160,7 +161,9 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, field_name, num_days)
-          date = pull_date_field_by_name(task, field_name)
+          task_timing = Checkoff::Internal::TaskTiming.new
+
+          date = task_timing.date_or_time_field_by_name(task, field_name)&.to_date
 
           return false if date.nil?
 
@@ -189,7 +192,8 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, field_name, num_days)
-          date = pull_date_field_by_name(task, field_name)
+          task_timing = Checkoff::Internal::TaskTiming.new
+          date = task_timing.date_or_time_field_by_name(task, field_name)&.to_date
 
           return false if date.nil?
 

data/lib/checkoff/internal/task_timing.rb

@@ -49,6 +49,13 @@ module Checkoff
         nil
       end
 
+      # @param task [Asana::Resources::Task]
+      #
+      # @return [Time, nil]
+      def modified_time(task)
+        return @time_class.parse(task.modified_at) unless task.modified_at.nil?
+      end
+
       # @param task [Asana::Resources::Task]
       # @param field_name [Symbol]
       #
@@ -59,6 +66,8 @@ module Checkoff
 
         return start_date_or_time(task) if field_name == :start
 
+        return modified_time(task) if field_name == :modified
+
         return start_date_or_time(task) || due_date_or_time(task) if field_name == :ready
 
         raise "Teach me how to handle field #{field_name}"

data/lib/checkoff/tasks.rb

@@ -50,6 +50,7 @@ module Checkoff
       @client = client
       @portfolios = portfolios
       @workspaces = workspaces
+      @timing = Timing.new(today_getter: date_class, now_getter: time_class)
     end
 
     # Indicates a task is ready for a person to work on it.  This is
@@ -63,16 +64,16 @@ module Checkoff
     # * start at is before now
     #
     # @param task [Asana::Resources::Task]
+    # @param period [Symbol<:now_or_before,:this_week>]
     # @param ignore_dependencies [Boolean]
-    def task_ready?(task, ignore_dependencies: false)
+    def task_ready?(task, period: :now_or_before, ignore_dependencies: false)
+      field_name = :ready
       return false if !ignore_dependencies && incomplete_dependencies?(task)
 
-      start = task_timing.start_time(task)
-      due = task_timing.due_time(task)
+      # @type [Date,Time,nil]
+      task_date_or_time = task_timing.date_or_time_field_by_name(task, field_name)
 
-      return true if start.nil? && due.nil?
-
-      (start || due) < @time_class.now
+      timing.in_period?(task_date_or_time, period)
     end
 
     # Pull a specific task by name
@@ -236,6 +237,9 @@ module Checkoff
     # @return [Asana::Client]
     attr_reader :client
 
+    # @return [Checkoff::Timing]
+    attr_reader :timing
+
     # @return [Checkoff::Projects]
     def projects
       @projects ||= @sections.projects

data/lib/checkoff/timing.rb

@@ -23,24 +23,38 @@ module Checkoff
     SHORT_CACHE_TIME = MINUTE
 
     # @param today_getter [Class<Date>]
-    def initialize(today_getter: Date)
+    # @param now_getter [Class<Time>]
+    def initialize(today_getter: Date,
+                   now_getter: Time)
       @today_getter = today_getter
+      @now_getter = now_getter
     end
 
-    # @param date [Date]
+    # @param date_or_time [Date,Time,nil]
+    def now_or_before?(date_or_time)
+      return true if date_or_time.nil?
+
+      date_or_time.to_time < @now_getter.now
+    end
+
+    # @param date_or_time [Date,Time,nil]
     # @param period [Symbol<:indefinite>]
-    def in_period?(date, period)
-      return this_week?(date) if period == :this_week
+    def in_period?(date_or_time, period)
+      return this_week?(date_or_time) if period == :this_week
 
       return true if period == :indefinite
 
+      return now_or_before?(date_or_time) if period == :now_or_before
+
       raise "Teach me how to handle period #{period.inspect}"
     end
 
     private
 
-    # @param date [Date]
-    def this_week?(date)
+    # @param date_or_time [Date,Time,nil]
+    def this_week?(date_or_time)
+      return true if date_or_time.nil?
+
       today = @today_getter.today
 
       # Beginning of this week (assuming week starts on Sunday)
@@ -49,6 +63,8 @@ module Checkoff
       # End of this week (assuming week ends on Saturday)
       end_of_week = beginning_of_week + 6
 
+      date = date_or_time.to_date
+
       date >= beginning_of_week && date <= end_of_week
     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.103.0'
+  VERSION = '0.105.0'
 end

metadata

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