checkoff 0.50.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bdb0bf4cc27747e4ce2255f22438fe749beedff628a70ebe1b24252ed7c0bb3
-  data.tar.gz: ddf33a293e522f25f1ee10df10fbd9b80fdcca9ea29d32fa1f3d21e3d8bf4ead
+  metadata.gz: c150952f6929705defdcfb0d506308ca1d5e285e732eb6715fcb9c03a78e8ad4
+  data.tar.gz: ac88caf643edccda95c7fcf345e601bcee87f6f1e59b0af83136fe7194420766
 SHA512:
-  metadata.gz: b69f0673147f4581d3cb983e77639ef811a3b9895b89a8c11c07951b02362142ee412c799cd81333727b191e9cae0e7df800ce805f4dfcd354d6d897d78ac202
-  data.tar.gz: c788eb613e2ae5ae0a28d433944f982b55fe246c9b1ae9283220147eb4d2d8c0904a65a7a2f26c2abff8bae351ebdb42e2b5963d9d8b42ff806e85d66a5a5248
+  metadata.gz: 3d4a6454075c4e2332b3c59ca3f93b3358b77f77f8bf43e2c7e28f9a615d73b204edc3b1ac00b51acbe109355ae3b6a16b30944bd13ea6be653dc28e2e45d857
+  data.tar.gz: 774fb7f8311cc540f762f36d30f79b59de16897105ae8a34496585a5c1c6e19353b37736b691b98b3bc447a88685bdd73db297dbaa23f2bde1b3d70f0ef47ab2

data/Gemfile.lock

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

data/config/definitions.rb

@@ -4,9 +4,21 @@
 # @!parse
 #   class Time
 #     class << self
-#       # @param date [String]
+#       # @param time [String]
 #       # @return [Time]
+#       def parse(time); end
+#     end
+#     # https://ruby-doc.org/3.2.2/exts/date/Time.html#method-i-to_date#
+#     # @return [Date]
+#     def to_date; end
+#   end
+#   class Date
+#     class << self
+#       # @param date [String]
+#       # @return [Date]
 #       def parse(date); end
+#       # @return [Date]
+#       def today; end
 #     end
 #   end
 #   module Asana
@@ -26,6 +38,10 @@
 #     module Resources
 #       # https://developers.asana.com/reference/gettask
 #       class Task
+#         # @return [String,nil]
+#         def due_at; end
+#         # @return [String,nil]
+#         def due_on; end
 #         # @return [Hash<String, String>, nil]
 #         def assignee; end
 #         # @return [String, nil]

data/lib/checkoff/internal/search_url/date_param_converter.rb

@@ -14,6 +14,45 @@ module Checkoff
         end
 
         # @return [Array(Hash<String, String>, Array<[Symbol, Array]>)] See https://developers.asana.com/docs/search-tasks-in-a-workspace
+        def handle_through_next
+          due_date_value = get_single_param('due_date.value').to_i
+
+          validate_unit_is_day!
+
+          # @sg-ignore
+          # @type [Date]
+          before = Date.today + due_date_value
+          # 'due_on.before' => '2023-01-01',
+          # 'due_on.after' => '2023-01-01',
+          # [{ 'due_on.before' => '2023-09-01' }, []]
+          [{ 'due_on.before' => before.to_s }, []]
+        end
+
+        # @return [Array(Hash<String, String>, Array<[Symbol, Array]>)] See https://developers.asana.com/docs/search-tasks-in-a-workspace
+        def handle_between
+          due_date_after = get_single_param('due_date.after')
+          raise 'Teach me how to handle due_date_before' if date_url_params.key? 'due_date.before'
+
+          validate_unit_not_provided!
+
+          # Example value: 1702857600000
+          after = Time.at(due_date_after.to_i / 1000).to_date
+          [{ 'due_on.after' => after.to_s }, []]
+        end
+
+        # @param param_key [String]
+        # @return [String]
+        def get_single_param(param_key)
+          raise "Expected #{param_key} to have at least one value" unless date_url_params.key? param_key
+
+          value = date_url_params.fetch(param_key)
+
+          raise "Expected #{param_key} to have one value" if value.length != 1
+
+          value[0]
+        end
+
+        # @return [Array(Hash<String, String>, Array<[Symbol, Array]>)]
         def convert
           return [{}, []] if date_url_params.empty?
 
@@ -21,38 +60,29 @@ module Checkoff
           #   due_date.operator=through_next
           #   due_date.value=0
           #   due_date.unit=day
-          validate_due_date_through_next!
+          due_date_operator = get_single_param('due_date.operator')
 
-          value = date_url_params.fetch('due_date.value').fetch(0).to_i
+          return handle_through_next if due_date_operator == 'through_next'
 
-          # @sg-ignore
-          # @type [Date]
-          before = Date.today + value
+          return handle_between if due_date_operator == 'between'
 
-          validate_unit_is_day!
-
-          # 'due_on.before' => '2023-01-01',
-          # 'due_on.after' => '2023-01-01',
-          # [{ 'due_on.before' => '2023-09-01' }, []]
-          [{ 'due_on.before' => before.to_s }, []]
+          raise "Teach me how to handle date mode: #{due_date_operator.inspect}."
         end
 
         private
 
         # @return [void]
-        def validate_unit_is_day!
-          unit = date_url_params.fetch('due_date.unit').fetch(0)
+        def validate_unit_not_provided!
+          return unless date_url_params.key? 'due_date.unit'
 
-          raise 'Teach me how to handle other time units' unless unit == 'day'
+          raise "Teach me how to handle other due_date.unit for these params: #{date_url_params.inspect}"
         end
 
         # @return [void]
-        def validate_due_date_through_next!
-          due_date_operators = date_url_params.fetch('due_date.operator')
-
-          return if due_date_operators == ['through_next']
+        def validate_unit_is_day!
+          unit = date_url_params.fetch('due_date.unit').fetch(0)
 
-          raise "Teach me how to handle date mode: #{due_date_operators}."
+          raise 'Teach me how to handle other time units' unless unit == 'day'
         end
 
         # @return [Hash<String, Array<String>>]

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -38,9 +38,21 @@ module Checkoff
       # @sg-ignore
       # @return [Date, nil]
       def pull_date_field_by_name_or_raise(task, field_name)
-        raise "Teach me how to handle field #{field_name}" unless field_name == :modified_at
+        if field_name == :modified
+          return Time.parse(task.modified_at).to_date unless task.modified_at.nil?
 
-        task.modified_at
+          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
@@ -372,13 +384,43 @@ module Checkoff
       #
       # @return [Boolean]
       def evaluate(task, field_name, num_days)
-        time = pull_date_field_by_name_or_raise(task, field_name)
+        date = pull_date_field_by_name_or_raise(task, field_name)
 
-        return false if time.nil?
+        return false if date.nil?
 
-        n_days_ago = (Time.now - (num_days * 24 * 60 * 60))
         # @sg-ignore
-        time < n_days_ago
+        n_days_ago = Date.today - num_days
+        # @sg-ignore
+        date < n_days_ago
+      end
+    end
+
+    # :field_greater_than_or_equal_to_n_days_from_today
+    class FieldGreaterThanOrEqualToNDaysFromTodayFunctionEvaluator < FunctionEvaluator
+      FUNCTION_NAME = :field_greater_than_or_equal_to_n_days_from_today
+
+      def matches?
+        fn?(task_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)
+        date = pull_date_field_by_name_or_raise(task, field_name)
+
+        return false if date.nil?
+
+        # @sg-ignore
+        n_days_from_today = Date.today + num_days
+        # @sg-ignore
+        date >= n_days_from_today
       end
     end
 
@@ -481,6 +523,7 @@ module Checkoff
       Checkoff::TaskSelectorClasses::UnassignedPFunctionEvaluator,
       Checkoff::TaskSelectorClasses::DueDateSetPFunctionEvaluator,
       Checkoff::TaskSelectorClasses::FieldLessThanNDaysAgoFunctionEvaluator,
+      Checkoff::TaskSelectorClasses::FieldGreaterThanOrEqualToNDaysFromTodayFunctionEvaluator,
       Checkoff::TaskSelectorClasses::CustomFieldLessThanNDaysFromNowFunctionEvaluator,
       Checkoff::TaskSelectorClasses::CustomFieldGreaterThanOrEqualToNDaysFromNowFunctionEvaluator,
       Checkoff::TaskSelectorClasses::StringLiteralEvaluator,

data/lib/checkoff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport