checkoff 0.105.0 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4edf9b863abc88b80a990f28fa9a966eaff3d48b9ff267ff0f0c572ef20fda87
-  data.tar.gz: e250e14a24ccc7463fc80dac424f9dc04eca6ff43522c8fc5795c4e8ea04390f
+  metadata.gz: 9a3f9bd1bb8698f7f5a318fefbf79cc09cf17998177dfbbae762fb3be82e33d7
+  data.tar.gz: 634e833fdb5f54c9f8a5e56411b4affb1a2d7384a1231a068bf77a8e37951088
 SHA512:
-  metadata.gz: f9e5100c88fa3a02f678845db245ca271632015ba814c06c6d9cb795cbcf6f0988d7a57676163f66cdcc649c4542f628d91c467512e20531587d8e3391d2a20a
-  data.tar.gz: 626ab57ad3597d651dfea7d41f2fd640286de88d2bfa79cc71c1dff2602db8ecb23536fb32b4e332d8e1f2130405e485f83a62e5e3638c4ced96ea67e1d464f0
+  metadata.gz: 950738387e7ecfe3652763452bca3dd79b39e3e8b8ca2618decacb77c04e6deb2d5b5680a272aacac5b46d97a75b53409a483bc339b13f8fd910c55d8ea0105a
+  data.tar.gz: 176ac1780573b9fe89f97a75c9bddf4cc74b69833ee31ec60e0f684ef88a7ca4dafa5e5661e5c5aec78ce8e5392dc23e7b9f3022e7ef77c2e94b1cc5efd45300

data/Gemfile.lock

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

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

@@ -74,17 +74,27 @@ module Checkoff
       end
 
       # :ready function
+      #
+      # See GLOSSARY.md and tasks.rb#task_ready? for more information.
       class ReadyFunctionEvaluator < FunctionEvaluator
         def matches?
           fn?(selector, :ready)
         end
 
+        # @param _index [Integer]
+        def evaluate_arg?(_index)
+          false
+        end
+
         # @param task [Asana::Resources::Task]
+        # @param period [Symbol<:now_or_before,:this_week>]
         # @param ignore_dependencies [Boolean]
         # @return [Boolean]
-        def evaluate(task, ignore_dependencies: false)
-          @tasks.task_ready?(task, ignore_dependencies: ignore_dependencies)
+        # rubocop:disable Style/OptionalBooleanParameter
+        def evaluate(task, period = :now_or_before, ignore_dependencies = false)
+          @tasks.task_ready?(task, period: period, ignore_dependencies: ignore_dependencies)
         end
+        # rubocop:enable Style/OptionalBooleanParameter
       end
 
       # :unassigned function
@@ -161,16 +171,7 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, field_name, num_days)
-          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?
-
-          # @sg-ignore
-          n_days_ago = Date.today - num_days
-          # @sg-ignore
-          date < n_days_ago
+          @tasks.in_period?(task, field_name, [:less_than_n_days_ago, num_days])
         end
       end
 

data/lib/checkoff/portfolios.rb

@@ -28,9 +28,9 @@ module Checkoff
     # @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

data/lib/checkoff/tasks.rb

@@ -67,9 +67,15 @@ module Checkoff
     # @param period [Symbol<:now_or_before,:this_week>]
     # @param ignore_dependencies [Boolean]
     def task_ready?(task, period: :now_or_before, ignore_dependencies: false)
-      field_name = :ready
       return false if !ignore_dependencies && incomplete_dependencies?(task)
 
+      in_period?(task, :ready, period)
+    end
+
+    # @param task [Asana::Resources::Task]
+    # @param field_name [Symbol]
+    # @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]
       task_date_or_time = task_timing.date_or_time_field_by_name(task, field_name)
 

data/lib/checkoff/timing.rb

@@ -38,7 +38,9 @@ module Checkoff
     end
 
     # @param date_or_time [Date,Time,nil]
-    # @param period [Symbol<:indefinite>]
+    # @param period [Symbol,Array<(Symbol,Integer)>]
+    #
+    #        Valid values: :this_week, :now_or_before, :indefinite, [:less_than_n_days_ago, Integer]
     def in_period?(date_or_time, period)
       return this_week?(date_or_time) if period == :this_week
 
@@ -46,11 +48,34 @@ module Checkoff
 
       return now_or_before?(date_or_time) if period == :now_or_before
 
+      if period.is_a?(Array)
+        # @sg-ignore
+        # @type [Symbol]
+        period_name = period.first
+        args = period[1..]
+
+        # @sg-ignore
+        return less_than_n_days_ago?(date_or_time, *args) if period_name == :less_than_n_days_ago
+      end
+
       raise "Teach me how to handle period #{period.inspect}"
     end
 
     private
 
+    # @param date_or_time [Date,Time,nil]
+    # @param num_days [Integer]
+    def less_than_n_days_ago?(date_or_time, num_days)
+      return false if date_or_time.nil?
+
+      date = date_or_time.to_date
+
+      # @sg-ignore
+      n_days_ago = @today_getter.today - num_days
+      # @sg-ignore
+      date < n_days_ago
+    end
+
     # @param date_or_time [Date,Time,nil]
     def this_week?(date_or_time)
       return true if date_or_time.nil?

data/lib/checkoff/version.rb

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

metadata

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