checkoff 0.106.0 → 0.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1113a5ffbcd7bbe80ffd702559e8be32741468c788b26b976d8bb33ce50c06b
-  data.tar.gz: 91fb42cdc5620a932033d43eab190c46191c11794004b358a92bc6e40f97818d
+  metadata.gz: a6f58b9f4020d786886f43c7c3422b55b99143796be35fcccf7d46cc6d3369d8
+  data.tar.gz: 39b470be2c13d3e32d545f9914d935ee1fb8a8f2705e5cdb799a2ae2bab8bf71
 SHA512:
-  metadata.gz: 18746c467511ea53db664dd7194ce8b9aeb432ae4fac74911db3d775a921fb7abb9ee8e1ce16e83c2ad1e31b4baf9cf79efb180b827579f040007729f7a6fc20
-  data.tar.gz: 81645f19b209186e1e27d8d07bb5e9792eb9127462fa12af8518f71ee5baf2a8b721a2fe2060fb24ab4dc5291b817b27c8370e6b452e9c49a52b7cae3226567a
+  metadata.gz: df03add2cd762e7e4ce70ec769d316d96b718f59eb418c340557822894f202d28b92796ae0d02e42b5e9e8d1f1ca607c294a4ce64ac92e71e1a6a556d4eeba72
+  data.tar.gz: 89ad98040c6ea65313d51206394f5af2ddcd2671a0b9ea403ecbf3466df564dbe7e09f64932838d7f8d06302d9abf9c29dd8f8dbaad28cf2342795269e5ec2f5

data/Gemfile.lock

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

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

@@ -94,7 +94,7 @@ module Checkoff
         def evaluate(task, period = :now_or_before, ignore_dependencies = false)
           @tasks.task_ready?(task, period: period, ignore_dependencies: ignore_dependencies)
         end
-        # rubocop:ensable Style/OptionalBooleanParameter
+        # rubocop:enable Style/OptionalBooleanParameter
       end
 
       # :unassigned function
@@ -171,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
 
@@ -202,15 +193,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_from_today = Date.today + num_days
-          # @sg-ignore
-          date >= n_days_from_today
+          @tasks.in_period?(task, field_name, [:greater_than_or_equal_to_n_days_from_today, 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

@@ -31,14 +31,9 @@ module Checkoff
     end
 
     # @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>]
+    # @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 +41,46 @@ 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..]
+
+        return compound_in_period?(date_or_time, period_name, *args)
+      end
+
       raise "Teach me how to handle period #{period.inspect}"
     end
 
     private
 
+    # @param date_or_time [Date,Time,nil]
+    # @param num_days [Integer]
+    def greater_than_or_equal_to_n_days_from_today?(date_or_time, num_days)
+      return false if date_or_time.nil?
+
+      date = date_or_time.to_date
+
+      # @sg-ignore
+      n_days_from_today = @today_getter.today + num_days
+      # @sg-ignore
+      date >= n_days_from_today
+    end
+
+    # @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?
@@ -68,6 +98,27 @@ module Checkoff
       date >= beginning_of_week && date <= end_of_week
     end
 
+    # @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_name [Symbol]
+    # @param args [Object]
+    def compound_in_period?(date_or_time, period_name, *args)
+      # @sg-ignore
+      return less_than_n_days_ago?(date_or_time, *args) if period_name == :less_than_n_days_ago
+
+      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)
+      end
+      raise "Teach me how to handle period [#{period_name.inspect}, #{args.join(', ')}]"
+    end
+
     # bundle exec ./time.rb
     # :nocov:
     class << self

data/lib/checkoff/version.rb

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

metadata

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