active_collab-ruby-sdk 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618cfa962f35bcae3a41e437b9aac7d77ae528f535f452355146ccacdb56885d
-  data.tar.gz: 3f370da2a5aeba7923bdc7cb44531a7c9d5f21eec0ded03bf4312194a0e2c6db
+  metadata.gz: a6e17e753d8da98b0e24d093fc9256b751a4030dddca75fc896ebe3177aeb103
+  data.tar.gz: d744024765c2181eb5f0e6b8f4e22e0c5b440893bdf73795085d94ff20da88b3
 SHA512:
-  metadata.gz: 47597a3f5889d9abbb95699b3f1dffbe9a231c4eb28112b707af2fe0e9e9a06d56cefa88c1d87d00d52ed5d095fb4bc21694ea7f063996b0279fb7d8ff0dffef
-  data.tar.gz: f23a36519466b76297966bf02f319235113a76d7a3450612f8e4f8c00cd9fd9a40ef41970f4d1198c54cb56b9f109600450e9185a4ca70e1b1c6009db81ddf81
+  metadata.gz: 26ca19d4bf4f16dff4b5b3f8ef9c9cec2d5402f899cd9d8112a78b9ada767aee51b9a7a92d865bd6cbcf3d724a3fecc6e240c882638c9e940322fdfabb73f177
+  data.tar.gz: 6b2d69c5e712a78c7c2e0475370bb106edff53aa02e98c5df46479d782f07de574bf71dd4be42b952301250e208cd0da78377d33ad6e17a6b8c804e853153e78

data/lib/active_collab/tasks.rb

@@ -12,18 +12,17 @@ class ActiveCollab::Tasks
   # Returns all tasks (active + archived), sorted by created_on descending.
   #
   # @param params [Hash] query parameters
-  # @option params [String] 'format' response format ('hash' or 'json')
+  # @option params [String] :format response format ('hash' or 'json')
   # @return [Hash, String] a hash with a 'tasks' key, or JSON string
   def all(params = {})
-    temp_params = params.merge('format' => 'hash')
-    all_tasks = [active(temp_params)['tasks'] + archived(temp_params)['tasks']]
+    params = params.transform_keys(&:to_sym)
+    temp_params = params.merge(format: 'hash')
+    all_tasks = active(temp_params)['tasks'] + archived(temp_params)['tasks']
     result = {
-      'tasks' => all_tasks
-        .flatten
-        .sort_by { |t| -t['created_on'] } || []
+      'tasks' => all_tasks.sort_by { |t| -t['created_on'] }
     }
 
-    return JSON.generate(result) if params['format'] == 'json'
+    return JSON.generate(result) if params[:format] == 'json'
     result
   end
 
@@ -41,24 +40,33 @@ class ActiveCollab::Tasks
   # Auto-paginates through all pages unless a specific page is requested.
   #
   # @param params [Hash] query parameters
-  # @option params [Integer] 'page' specific page to fetch (disables auto-pagination)
-  # @option params [String] 'format' response format ('hash' or 'json')
+  # @option params [Integer] :page specific page to fetch (disables auto-pagination)
+  # @option params [String] :format response format ('hash' or 'json')
   # @return [Hash, String] a hash with a 'tasks' key, or JSON string
   def archived(params = {})
-    page = params['page'] || 1
+    params = params.transform_keys(&:to_sym)
+    page = params[:page] || 1
     all_tasks = []
 
     loop do
       response = @client
-        .get("/projects/#{@project_id}/tasks/archive", params.merge('page' => page))
-      tasks = response || []
+        .get("/projects/#{@project_id}/tasks/archive", params.merge(page: page))
+
+      tasks = if response.is_a?(Hash)
+                Array(response['tasks'])
+              elsif response.is_a?(Array)
+                response
+              else
+                []
+              end
+
       all_tasks += tasks
-      break if tasks.empty? || params.key?('page')
+      break if tasks.empty? || params.key?(:page)
       page += 1
     end
 
-    result = { 'tasks' => all_tasks.flatten.sort_by { |t| -t['created_on'] } }
-    return JSON.generate(result) if params['format'] == 'json'
+    result = { 'tasks' => all_tasks.sort_by { |t| -t['created_on'] } }
+    return JSON.generate(result) if params[:format] == 'json'
     result
   end
 

data/lib/active_collab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveCollab
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_collab-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dave Lens