checkoff 0.107.0 → 0.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a3f9bd1bb8698f7f5a318fefbf79cc09cf17998177dfbbae762fb3be82e33d7
-  data.tar.gz: 634e833fdb5f54c9f8a5e56411b4affb1a2d7384a1231a068bf77a8e37951088
+  metadata.gz: 199142d4090e6eb4196958d2c73958fefdfa864c0e7e69a5e8a589f198465b2e
+  data.tar.gz: aa0739c73ce5359fe1f965e4c46674bf3a7d79a603d7bcc683f671cd5e039fd9
 SHA512:
-  metadata.gz: 950738387e7ecfe3652763452bca3dd79b39e3e8b8ca2618decacb77c04e6deb2d5b5680a272aacac5b46d97a75b53409a483bc339b13f8fd910c55d8ea0105a
-  data.tar.gz: 176ac1780573b9fe89f97a75c9bddf4cc74b69833ee31ec60e0f684ef88a7ca4dafa5e5661e5c5aec78ce8e5392dc23e7b9f3022e7ef77c2e94b1cc5efd45300
+  metadata.gz: fce61c75d5175ad6c7ae37263f3065efc796dc496dd290616bd6cf1bb69518149231e6da378f6ee5573a8f17d1a55e73179da30e46820a61b237038b62483ff3
+  data.tar.gz: e7e2cadb887aaacb9fea39058bea689f087da8719ceba75931b768f92b170ca16bf2f93fe7731a18c4a5ebd00660ece4bfdf4f466f712bf98f7d74dc66d1e0b6

data/Gemfile.lock

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

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

@@ -97,6 +97,26 @@ module Checkoff
         # rubocop:enable Style/OptionalBooleanParameter
       end
 
+      # :in_period? function
+      class InPeriodPFunctionEvaluator < FunctionEvaluator
+        def matches?
+          fn?(selector, :in_period?)
+        end
+
+        # @param _index [Integer]
+        def evaluate_arg?(_index)
+          false
+        end
+
+        # @param task [Asana::Resources::Task]
+        # @param field_name [Symbol] See Checksoff::Tasks#in_period?
+        # @param period [Symbol,Array<Symbol>] See Checkoff::Timing#in_period?
+        # @return [Boolean]
+        def evaluate(task, field_name, period)
+          @tasks.in_period?(task, field_name, period)
+        end
+      end
+
       # :unassigned function
       class UnassignedPFunctionEvaluator < FunctionEvaluator
         def matches?
@@ -153,58 +173,6 @@ module Checkoff
         end
       end
 
-      # :field_less_than_n_days_ago
-      class FieldLessThanNDaysAgoPFunctionEvaluator < FunctionEvaluator
-        FUNCTION_NAME = :field_less_than_n_days_ago
-
-        def matches?
-          fn?(selector, FUNCTION_NAME)
-        end
-
-        def evaluate_arg?(_index)
-          false
-        end
-
-        # @param task [Asana::Resources::Task]
-        # @param field_name [Symbol]
-        # @param num_days [Integer]
-        #
-        # @return [Boolean]
-        def evaluate(task, field_name, num_days)
-          @tasks.in_period?(task, field_name, [:less_than_n_days_ago, num_days])
-        end
-      end
-
-      # :field_greater_than_or_equal_to_n_days_from_today
-      class FieldGreaterThanOrEqualToNDaysFromTodayPFunctionEvaluator < FunctionEvaluator
-        FUNCTION_NAME = :field_greater_than_or_equal_to_n_days_from_today
-
-        def matches?
-          fn?(selector, FUNCTION_NAME)
-        end
-
-        def evaluate_arg?(_index)
-          false
-        end
-
-        # @param task [Asana::Resources::Task]
-        # @param field_name [Symbol]
-        # @param num_days [Integer]
-        #
-        # @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
-        end
-      end
-
       # :custom_field_less_than_n_days_from_now function
       class CustomFieldLessThanNDaysFromNowFunctionEvaluator < FunctionEvaluator
         FUNCTION_NAME = :custom_field_less_than_n_days_from_now

data/lib/checkoff/timing.rb

@@ -30,13 +30,6 @@ module Checkoff
       @now_getter = now_getter
     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,Array<(Symbol,Integer)>]
     #
@@ -54,8 +47,7 @@ module Checkoff
         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
+        return compound_in_period?(date_or_time, period_name, *args)
       end
 
       raise "Teach me how to handle period #{period.inspect}"
@@ -63,6 +55,19 @@ module Checkoff
 
     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)
@@ -93,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.107.0'
+  VERSION = '0.109.0'
 end

metadata

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