checkoff 0.111.0 → 0.112.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e758f72d1a6f7cd1c2dd5b6ebb4b52964e9fa2ee6e24f9e17aa613f6c6fe23b
-  data.tar.gz: 9354f3874da0b13ec8662042475d60f67d0b67be9d22ddca07ee9938e81777f0
+  metadata.gz: 393a800af57dad5fa9edde789dbe166b09ad79b374c2f7dcab230ee0050c49e7
+  data.tar.gz: a2e852b005e952bacf694e0684c97db27a0e53e2e68d79b471d7a2a8d66939ce
 SHA512:
-  metadata.gz: 6d5945f70f231c337708a252597ffb2623c9fdc7e96996ca1acfe6337ac1082f53fd3fcc2fc0ae8fcab75c3af4b0eed5e8e469eb8ef0537558d1dfb4e5e56d36
-  data.tar.gz: e84eda5a4713bea660373ff2fc3829d861f61e4d88dd71b9127be5e077d0c9ca621fff32ec067e4890d37d1c65c67a47952f9e8478e129b3f2eae7a1c77443a6
+  metadata.gz: 12769031da94bd1a7afc9afeccededab8f19506201f14c29d97cbacba7b3c0574f73d1a2bf52e9d6e511249d8f946d42295a110f0ef59f575e8d26eb6337377f
+  data.tar.gz: 6395b5b368b7b74a0173d4a62b5e55188348b9c8293865cba02163f7d9a85ede6d6a139ab001f74eaf7acd13b431af341bac7eddc5cff87ec780c4e67f6a7207

data/Gemfile.lock

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

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'task/function_evaluator'
-require 'checkoff/internal/ready_between_relative'
 require 'checkoff/internal/task_timing'
 
 module Checkoff
@@ -146,34 +145,6 @@ module Checkoff
         end
       end
 
-      # :ready_between_relative function
-      class ReadyBetweenRelativePFunctionEvaluator < FunctionEvaluator
-        FUNCTION_NAME = :ready_between_relative
-
-        def matches?
-          fn?(selector, FUNCTION_NAME)
-        end
-
-        # @param _index [Integer]
-        def evaluate_arg?(_index)
-          false
-        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 evaluate(task, beginning_num_days_from_now, end_num_days_from_now, ignore_dependencies: false)
-          ready_between_relative = Checkoff::Internal::ReadyBetweenRelative.new(tasks: @tasks,
-                                                                                client: @client)
-          ready_between_relative.ready_between_relative?(task,
-                                                         beginning_num_days_from_now, end_num_days_from_now,
-                                                         ignore_dependencies: ignore_dependencies)
-        end
-      end
-
       # :last_story_created_less_than_n_days_ago function
       class LastStoryCreatedLessThanNDaysAgoFunctionEvaluator < FunctionEvaluator
         FUNCTION_NAME = :last_story_created_less_than_n_days_ago

data/lib/checkoff/timing.rb

@@ -73,8 +73,7 @@ module Checkoff
     def greater_than_or_equal_to_n_days_from_now?(date_or_time, num_days)
       return false if date_or_time.nil?
 
-      n_days_from_now = (@now_getter.now + (num_days * 24 * 60 * 60))
-      date_or_time >= n_days_from_now
+      date_or_time >= n_days_from_now(num_days)
     end
 
     # @param date_or_time [Date,Time,nil]
@@ -95,8 +94,7 @@ module Checkoff
     def less_than_n_days_from_now?(date_or_time, num_days)
       return false if date_or_time.nil?
 
-      n_days_from_now = (@now_getter.now + (num_days * 24 * 60 * 60))
-      date_or_time < n_days_from_now
+      date_or_time < n_days_from_now(num_days)
     end
 
     # @param date_or_time [Date,Time,nil]
@@ -123,6 +121,29 @@ module Checkoff
       date_or_time.to_time < @now_getter.now
     end
 
+    # @param num_days [Integer]
+    #
+    # @return [Time]
+    def n_days_from_now(num_days)
+      (@now_getter.now + (num_days * 24 * 60 * 60))
+    end
+
+    # @param date_or_time [Date,Time,nil]
+    # @param beginning_num_days_from_now [Integer,nil]
+    # @param end_num_days_from_now [Integer,nil]
+    def between_relative_days?(date_or_time, beginning_num_days_from_now, end_num_days_from_now)
+      start_time = n_days_from_now(beginning_num_days_from_now || -99_999)
+      end_time = n_days_from_now(end_num_days_from_now || 99_999)
+
+      return false if date_or_time.nil?
+
+      if date_or_time.is_a?(Time)
+        date_or_time > start_time && date_or_time <= end_time
+      else
+        date_or_time > start_time.to_date && date_or_time <= end_time.to_date
+      end
+    end
+
     # @param date_or_time [Date,Time,nil]
     # @param period_name [Symbol]
     # @param args [Object]
@@ -133,15 +154,17 @@ module Checkoff
       return less_than_n_days_from_now?(date_or_time, *args) if period_name == :less_than_n_days_from_now
 
       if period_name == :greater_than_or_equal_to_n_days_from_now
-        return greater_than_or_equal_to_n_days_from_now?(date_or_time,
-                                                         *args)
+        return greater_than_or_equal_to_n_days_from_now?(date_or_time, *args)
       end
 
       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(', ')}]"
+      # @sg-ignore
+      return between_relative_days?(date_or_time, *args) if period_name == :between_relative_days
+
+      raise "Teach me how to handle period [#{period_name.inspect}, #{args.map(&:inspect).join(', ')}]"
     end
 
     # bundle exec ./time.rb

data/lib/checkoff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.111.0
+  version: 0.112.0
 platform: ruby
 authors:
 - Vince Broz
@@ -134,7 +134,6 @@ 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

data/lib/checkoff/internal/ready_between_relative.rb

@@ -1,63 +0,0 @@
-# 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 client [Asana::Client]
-      # @param task_timing [Checkoff::Internal::TaskTiming]
-      # @param tasks [Checkoff::Tasks]
-      def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
-                     client: Checkoff::Clients.new(config: config).client,
-                     task_timing: ::Checkoff::Internal::TaskTiming.new(client: client),
-                     tasks: ::Checkoff::Tasks.new(config: config,
-                                                  client: 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