checkoff 0.53.0 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70e5f767656e34b2431a2920a57ade34d64480f53d95855818bd607400ae9e60
-  data.tar.gz: 42b5dc27c71e1f0bb5772f00d8ae74947286f13e7bb319d9ae8ab2c8dbb06722
+  metadata.gz: 2a26bf5e53147ab791087492c23a9a050c6bdeef1d0edadba9a4d3d4741c32bf
+  data.tar.gz: 403940c20a3e08c11904192168fbd6d0df95b012cd17e025148a777223b0f30c
 SHA512:
-  metadata.gz: 8327942085367d3501b77563121dab0935696550a46036da89f4662d59d5dd7acc9fa49930db08f3901a1468b05c5ab63a2f813ab56415c9f627887b585d8386
-  data.tar.gz: 6046d32bfd28b7805771be9854843821d0d84c2da3e49eac3df3f44d839169b073117870a38e67659e4f3ca0356151bcbfc4eb2feabbb7a6ffc88efe7917673b
+  metadata.gz: a5421aa9a82b335176e2cd98e0bba600acbaa61cc5e8c45fd876c13eeb5d2d1d750740f56a92cf8f556d79faf7b8ac162452d7ff6d30dff9719df5ffeba4930f
+  data.tar.gz: 8dd35cf8d9009cb1bf76fd0b662a0d5bbde874a25c7cad914424131dc8d5e508ce0e39f0c2ba690b2ff3936bda3076ea9b6ec1eff6416ea032cd24bb0b10da59

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.53.0)
+    checkoff (0.54.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -22,7 +22,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

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

@@ -13,31 +13,88 @@ module Checkoff
           @date_url_params = date_url_params
         end
 
+        # @sg-ignore
+        # @return [Array(Hash<String, String>, Array<[Symbol, Array]>)]
+        def convert
+          return [{}, []] if date_url_params.empty?
+
+          out = nil
+
+          %w[due_date start_date].each do |prefix|
+            next unless date_url_params.key? "#{prefix}.operator"
+            raise 'Teach me how to handle simultaneous date parameters' unless out.nil?
+
+            out = convert_for_prefix(prefix)
+          end
+
+          raise "Teach me to handle these parameters: #{date_url_params.inspect}" unless date_url_params.empty?
+
+          out
+        end
+
+        private
+
+        # @sg-ignore
+        # @param prefix [String]
+        # @return [Array(Hash<String, String>, Array<[Symbol, Array]>)]
+        def convert_for_prefix(prefix)
+          # example params:
+          #   due_date.operator=through_next
+          #   due_date.value=0
+          #   due_date.unit=day
+          operator = get_single_param("#{prefix}.operator")
+
+          out = if operator == 'through_next'
+                  handle_through_next(prefix)
+                elsif operator == 'between'
+                  handle_between(prefix)
+                else
+                  raise "Teach me how to handle date mode: #{operator.inspect}."
+                end
+
+          # mark these as done by deleting from the hash
+          date_url_params.delete_if { |k, _| k.start_with? prefix }
+
+          out
+        end
+
+        # https://developers.asana.com/docs/search-tasks-in-a-workspace
+        API_PREFIX = {
+          'due_date' => 'due_on',
+          'start_date' => 'start_on',
+        }.freeze
+
+        # @param prefix [String]
         # @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
+        def handle_through_next(prefix)
+          value = get_single_param("#{prefix}.value").to_i
 
-          validate_unit_is_day!
+          validate_unit_is_day!(prefix)
 
           # @sg-ignore
           # @type [Date]
-          before = Date.today + due_date_value
+          before = Date.today + 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 }, []]
+          [{ "#{API_PREFIX.fetch(prefix)}.before" => before.to_s }, []]
         end
 
+        # @param prefix [String]
         # @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'
+        def handle_between(prefix)
+          after = get_single_param("#{prefix}.after")
+          raise "Teach me how to handle #{prefix}.before" if date_url_params.key? "#{prefix}.before"
 
-          validate_unit_not_provided!
+          validate_unit_not_provided!(prefix)
 
           # Example value: 1702857600000
-          after = Time.at(due_date_after.to_i / 1000).to_date
-          [{ 'due_on.after' => after.to_s }, []]
+          # +1 is because API seems to operate on inclusive ranges
+          # @type [Date]
+          # @sg-ignore
+          after = Time.at(after.to_i / 1000).to_date + 1
+          [{ "#{API_PREFIX.fetch(prefix)}.after" => after.to_s }, []]
         end
 
         # @param param_key [String]
@@ -52,37 +109,20 @@ module Checkoff
           value[0]
         end
 
-        # @return [Array(Hash<String, String>, Array<[Symbol, Array]>)]
-        def convert
-          return [{}, []] if date_url_params.empty?
-
-          # example params:
-          #   due_date.operator=through_next
-          #   due_date.value=0
-          #   due_date.unit=day
-          due_date_operator = get_single_param('due_date.operator')
-
-          return handle_through_next if due_date_operator == 'through_next'
-
-          return handle_between if due_date_operator == 'between'
-
-          raise "Teach me how to handle date mode: #{due_date_operator.inspect}."
-        end
-
-        private
-
+        # @param prefix [String]
         # @return [void]
-        def validate_unit_not_provided!
-          return unless date_url_params.key? 'due_date.unit'
+        def validate_unit_not_provided!(prefix)
+          return unless date_url_params.key? "#{prefix}.unit"
 
-          raise "Teach me how to handle other due_date.unit for these params: #{date_url_params.inspect}"
+          raise "Teach me how to handle other #{prefix}.unit for these params: #{date_url_params.inspect}"
         end
 
+        # @param prefix [String]
         # @return [void]
-        def validate_unit_is_day!
-          unit = date_url_params.fetch('due_date.unit').fetch(0)
+        def validate_unit_is_day!(prefix)
+          unit = date_url_params.fetch("#{prefix}.unit").fetch(0)
 
-          raise 'Teach me how to handle other time units' unless unit == 'day'
+          raise "Teach me how to handle other time units: #{unit}" unless unit == 'day'
         end
 
         # @return [Hash<String, Array<String>>]

data/lib/checkoff/version.rb

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

metadata

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