checkoff 0.99.0 → 0.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0aa9c88e96e1094d284c59a9c7146ff72f393f2e16442c8e320b3253ab0221d
-  data.tar.gz: 7f6021289d7fb0e331cb6b993b10307287c365d9a00d5fbe789e5b6c13972dad
+  metadata.gz: c1944705f29ddc4dab95bb2c056b55c3aa6417cab26ca036a5493612663a4614
+  data.tar.gz: 299262b20e9331ee86755c8fced359e62889e34f1fb714c694535167356c2793
 SHA512:
-  metadata.gz: ab4476c149bf918e5d138f71a5d1c5df78192f3fa3fa13e8ef0e8a2d7c7198b34268a78ab14e6009237d3cf0113316f3ff91222d22893606c5ecc1ab31830d55
-  data.tar.gz: 4f804bcfc9548b7106fcd80c5764da4250bf024e9dc7f1c2b95460078b89de3a238ba2b28f6d44188cd3fee074a0d348925ef780b751534a0f801f08b74fab24
+  metadata.gz: f84b26f7790beb97d9f2467b00bead09cd59f60c57e448442892304bbbf7acd6c72c299ee2c890762d9682df76efcf203d5ff3b4442d88d8871b117006a18a83
+  data.tar.gz: b1478b9ac625f873fa32ab444facf710ac7246b118927fd3347ed0867ca182cb757ec8b12cbb83a29e4d00882647b6df45a93c2758fb2e4c1ebad5983b13b724

data/Gemfile.lock

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

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

@@ -114,7 +114,7 @@ module Checkoff
         end
       end
 
-      # :ready_between_n_days function
+      # :ready_between_relative function
       class ReadyBetweenRelativePFunctionEvaluator < FunctionEvaluator
         FUNCTION_NAME = :ready_between_relative
 
@@ -134,24 +134,34 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, beginning_num_days_from_now, end_num_days_from_now, ignore_dependencies: false)
+          ready_between_relative?(task,
+                                  beginning_num_days_from_now, end_num_days_from_now,
+                                  ignore_dependencies: ignore_dependencies)
+        end
+
+        private
+
+        # @param task [Asana::Resources::Task]
+        # @param beginning_num_days_from_now [Integer]
+        # @param end_num_days_from_now [Integer]
+        # @param ignore_dependencies [Boolean]
+        #
+        # @return [Boolean]
+        def ready_between_relative?(task,
+                                    beginning_num_days_from_now,
+                                    end_num_days_from_now,
+                                    ignore_dependencies: false)
           beginning_n_days_from_now_time = (Time.now + (beginning_num_days_from_now * 24 * 60 * 60))
           end_n_days_from_now_time = (Time.now + (end_num_days_from_now * 24 * 60 * 60))
 
           # @type [Date, Time, nil]
-          task_date_or_time = @task_timing.date_or_time_field_by_name(task, :start) ||
-                              @task_timing.date_or_time_field_by_name(task, :due)
+          ready_date_or_time = @task_timing.date_or_time_field_by_name(task, :ready)
 
-          return false if task_date_or_time.nil?
+          return false if ready_date_or_time.nil?
 
-          # if time
-          in_range = if task_date_or_time.is_a?(Time)
-                       task_date_or_time > beginning_n_days_from_now_time &&
-                         task_date_or_time <= end_n_days_from_now_time
-                     else
-                       # if date
-                       task_date_or_time > beginning_n_days_from_now_time.to_date &&
-                         task_date_or_time <= end_n_days_from_now_time.to_date
-                     end
+          in_range = ready_in_range?(ready_date_or_time,
+                                     beginning_n_days_from_now_time,
+                                     end_n_days_from_now_time)
 
           return false unless in_range
 
@@ -159,6 +169,17 @@ module Checkoff
 
           true
         end
+
+        # @param ready_date_or_time [Date, Time]
+        # @param start_time [Time]
+        # @param end_time [Time]
+        def ready_in_range?(ready_date_or_time, start_time, end_time)
+          if ready_date_or_time.is_a?(Time)
+            ready_date_or_time > start_time && ready_date_or_time <= end_time
+          else
+            ready_date_or_time > start_time.to_date && ready_date_or_time <= end_time.to_date
+          end
+        end
       end
 
       # :field_less_than_n_days_ago

data/lib/checkoff/internal/task_timing.rb

@@ -59,6 +59,8 @@ module Checkoff
 
         return start_date_or_time(task) if field_name == :start
 
+        return start_date_or_time(task) || due_date_or_time(task) if field_name == :ready
+
         raise "Teach me how to handle field #{field_name}"
       end
     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.99.0'
+  VERSION = '0.100.0'
 end

metadata

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