checkoff 0.102.0 → 0.104.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8549d02934007d479b28d83262a32e060e6ada2033f5d5c9743210bf599e68
-  data.tar.gz: 86f5d4ba266d1d60af237d428c50b0065e80ce233d8ed964e7af9cc2396e6ae3
+  metadata.gz: b6d308b4ca05ee88bf3b380772496d9c621cc7b9f521b4cf19eb1351395ed2b2
+  data.tar.gz: eb14bb0c6f4dabd72e083ce67a5c3c821be931ac268f3202445714da9ae713aa
 SHA512:
-  metadata.gz: 6e7d47b7d64ee0008783db1a0a460bc0a1865f361920ff136c85e95df6f1d4cf36f88fda44ce50cb0f7f81e5117800feef82874320d6453e4b525f734721fc2d
-  data.tar.gz: 9c376fe5b386897f379f0b575423078fa0d4495ae953f05a5aeab6d794e3be6eac36a235f4d44d7e80313824de8110e246e7069abf3399f88c0a931eb709b60f
+  metadata.gz: 28983082df6a4c00e31fb3f458a6bafc0241920d4f1b5657e6ce3613d86127b0df6561defde8669a9ead845e2ef7d77c10ec1d45603c55d17fe735c5d3d5e716
+  data.tar.gz: dc877bc157ed76157327c2e094ff69ff4074275eaa9df93ec9d3fdf8bc67969c4402503ee9435bcf1305f489f0d7ab22f0b43129e69b0abe9e06064b4683f8e7

data/Gemfile.lock

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

data/lib/checkoff/internal/ready_between_relative.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Checkoff
+  module Internal
+    # Determine whether a task is due within a relative date range
+    class ReadyBetweenRelative
+      # @param config [Hash<Symbol, Object>]
+      # @param clients [Checkoff::Clients]
+      # @param task_timing [Checkoff::Internal::TaskTiming]
+      # @param tasks [Checkoff::Tasks]
+      def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
+                     clients: Checkoff::Clients.new(config: config),
+                     task_timing: ::Checkoff::Internal::TaskTiming.new,
+                     tasks: ::Checkoff::Tasks.new(config: config,
+                                                  client: clients.client))
+        @task_timing = task_timing
+        @tasks = tasks
+      end
+
+      # @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]
+        ready_date_or_time = @task_timing.date_or_time_field_by_name(task, :ready)
+
+        return false if ready_date_or_time.nil?
+
+        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
+
+        return false if !ignore_dependencies && @tasks.incomplete_dependencies?(task)
+
+        true
+      end
+
+      private
+
+      # @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
+  end
+end

data/lib/checkoff/internal/selector_classes/common/function_evaluator.rb

@@ -15,54 +15,6 @@ module Checkoff
 
         private
 
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, nil]
-        def pull_date_field_by_name(project, field_name)
-          if field_name == :modified
-            return Time.parse(project.modified_at).to_date unless project.modified_at.nil?
-
-            return nil
-          end
-
-          if field_name == :due
-            return Time.parse(project.due_at).to_date unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, Time, nil]
-        def pull_date_or_time_field_by_name(project, field_name)
-          if field_name == :due
-            return Time.parse(project.due_at) unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          if field_name == :start
-            return Time.parse(project.start_at) unless project.start_at.nil?
-
-            return Date.parse(project.start_on) unless project.start_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
         # @sg-ignore
         # @param project [Asana::Resources::Project]
         # @param custom_field_gid [String]

data/lib/checkoff/internal/selector_classes/project/function_evaluator.rb

@@ -18,54 +18,6 @@ module Checkoff
 
         private
 
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, nil]
-        def pull_date_field_by_name(project, field_name)
-          if field_name == :modified
-            return Time.parse(project.modified_at).to_date unless project.modified_at.nil?
-
-            return nil
-          end
-
-          if field_name == :due
-            return Time.parse(project.due_at).to_date unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
-        # @param project [Asana::Resources::Project]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, Time, nil]
-        def pull_date_or_time_field_by_name(project, field_name)
-          if field_name == :due
-            return Time.parse(project.due_at) unless project.due_at.nil?
-
-            return Date.parse(project.due_on) unless project.due_on.nil?
-
-            return nil
-          end
-
-          if field_name == :start
-            return Time.parse(project.start_at) unless project.start_at.nil?
-
-            return Date.parse(project.start_on) unless project.start_on.nil?
-
-            return nil
-          end
-
-          raise "Teach me how to handle field #{field_name}"
-        end
-
         # @sg-ignore
         # @param project [Asana::Resources::Project]
         # @param custom_field_gid [String]

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../function_evaluator'
-require 'checkoff/internal/task_timing'
 
 module Checkoff
   module SelectorClasses
@@ -17,35 +16,11 @@ module Checkoff
           @selector = selector
           @tasks = tasks
           @timelines = timelines
-          @task_timing = ::Checkoff::Internal::TaskTiming.new
           super()
         end
 
         private
 
-        # @param task [Asana::Resources::Task]
-        # @param field_name [Symbol]
-        #
-        # @sg-ignore
-        # @return [Date, nil]
-        def pull_date_field_by_name(task, field_name)
-          if field_name == :modified
-            return Time.parse(task.modified_at).to_date unless task.modified_at.nil?
-
-            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
         # @param task [Asana::Resources::Task]
         # @param custom_field_gid [String]

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'task/function_evaluator'
+require 'checkoff/internal/ready_between_relative'
+require 'checkoff/internal/task_timing'
 
 module Checkoff
   module SelectorClasses
@@ -134,51 +136,10 @@ 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]
-          ready_date_or_time = @task_timing.date_or_time_field_by_name(task, :ready)
-
-          return false if ready_date_or_time.nil?
-
-          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
-
-          return false if !ignore_dependencies && @tasks.incomplete_dependencies?(task)
-
-          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
+          ready_between_relative = Checkoff::Internal::ReadyBetweenRelative.new(tasks: @tasks)
+          ready_between_relative.ready_between_relative?(task,
+                                                         beginning_num_days_from_now, end_num_days_from_now,
+                                                         ignore_dependencies: ignore_dependencies)
         end
       end
 
@@ -200,7 +161,9 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, field_name, num_days)
-          date = pull_date_field_by_name(task, field_name)
+          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?
 
@@ -229,7 +192,8 @@ module Checkoff
         #
         # @return [Boolean]
         def evaluate(task, field_name, num_days)
-          date = pull_date_field_by_name(task, field_name)
+          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?
 

data/lib/checkoff/internal/task_timing.rb

@@ -49,6 +49,13 @@ module Checkoff
         nil
       end
 
+      # @param task [Asana::Resources::Task]
+      #
+      # @return [Time, nil]
+      def modified_time(task)
+        return @time_class.parse(task.modified_at) unless task.modified_at.nil?
+      end
+
       # @param task [Asana::Resources::Task]
       # @param field_name [Symbol]
       #
@@ -59,6 +66,8 @@ module Checkoff
 
         return start_date_or_time(task) if field_name == :start
 
+        return modified_time(task) if field_name == :modified
+
         return start_date_or_time(task) || due_date_or_time(task) if field_name == :ready
 
         raise "Teach me how to handle field #{field_name}"

data/lib/checkoff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.102.0
+  version: 0.104.0
 platform: ruby
 authors:
 - Vince Broz
@@ -134,6 +134,7 @@ files:
 - lib/checkoff/internal/config_loader.rb
 - lib/checkoff/internal/create-class.sh
 - lib/checkoff/internal/project_selector_evaluator.rb
+- lib/checkoff/internal/ready_between_relative.rb
 - lib/checkoff/internal/search_url.rb
 - lib/checkoff/internal/search_url/custom_field_param_converter.rb
 - lib/checkoff/internal/search_url/custom_field_variant.rb