moco-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7bd1d9f8ec25fb5689f497af1ad20f7481fa4df62eb794e6a0123c5c9ed495
-  data.tar.gz: 75e4a230361fd3f05b5392c6cb6ad8fc218c63f18f4f77b41b148fc615a231d0
+  metadata.gz: 781b3fd8aed069892a3c387056616917556da295b17878e23e3ec3b8aa8dd8fb
+  data.tar.gz: 1a818a32e9910e7ab30fd978e4e39348dcb7e970717b60e3f2f2b7dd755c6fbb
 SHA512:
-  metadata.gz: 34d936b6240f8645bf2210686a46651d6116d9073fef13f1802d6fbd07700b3fe1cc71a7bbd7044a1f79b055cc29b3f89e3266e2e4049f1b7f350f8374983ec1
-  data.tar.gz: 4ff707e14a5b1b327799d5feda4bb0d993b12a586d084b4c9f735333f85bb572f3abe2be4e57b5185fa8f8e269d2d9eab32c3e6561274676dcd215377eee18df
+  metadata.gz: aa1352b7183998b30397668eca16ca9eefbb99659f72fb60812eb14585f284789808defa0e8dfb147e6327a4d540bccf1e0531c3c3946f6753447bee347e3942
+  data.tar.gz: 367888eed8cb0a9bc91d2301a28e9f57ab1cc57f9226e5bd09a91fb71fe52c4220ff65bcb0e2fd7aae903fc12107be37f46e5df7ce27636451a1e7d3800e6807

data/CHANGELOG.md

@@ -1,9 +1,21 @@
 # Changelog
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
-
 ## [Unreleased]
 
+## [0.1.2] - 2025-04-02
+
+### Added
+- Complete Activities API implementation:
+  - Single activity retrieval
+  - Bulk activity creation
+  - Activity timer control (start/stop)
+  - Activity disregard endpoint
+  - Activity deletion
+- Project management API endpoints:
+  - Archive/unarchive projects
+  - Project report operations
+  - Project group assignment
+
 ## [0.1.1] - 2024-02-27
 
 ### Added

data/Gemfile.lock

@@ -46,6 +46,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   moco-ruby!

data/lib/moco/api.rb

@@ -38,6 +38,21 @@ module MOCO
       parse_activities_response(response.body)
     end
 
+    def get_activity(id)
+      response = @conn.get("activities/#{id}")
+      parse_activities_response([response.body]).first
+    end
+
+    def create_activities_bulk(activities)
+      api_entities = activities.map do |activity|
+        activity.to_h.except(:id, :project, :user, :customer).tap do |h|
+          h[:project_id] = activity.project.id
+          h[:task_id] = activity.task.id
+        end
+      end
+      @conn.post("activities/bulk", { activities: api_entities })
+    end
+
     def create_activity(activity)
       api_entity = activity.to_h.except(:id, :project, :user, :customer).tap do |h|
         h[:project_id] = activity.project.id
@@ -54,6 +69,56 @@ module MOCO
       @conn.put("activities/#{activity.id}", api_entity)
     end
 
+    def start_activity_timer(activity_id)
+      @conn.patch("activities/#{activity_id}/start_timer")
+    end
+
+    def stop_activity_timer(activity_id)
+      @conn.patch("activities/#{activity_id}/stop_timer")
+    end
+
+    def disregard_activities(reason:, activity_ids:, company_id:, project_id: nil)
+      payload = {
+        reason: reason,
+        activity_ids: activity_ids,
+        company_id: company_id
+      }
+      payload[:project_id] = project_id if project_id
+      @conn.post("activities/disregard", payload)
+    end
+
+    def delete_activity(activity_id)
+      @conn.delete("activities/#{activity_id}")
+    end
+
+    def archive_project(project_id)
+      @conn.put("projects/#{project_id}/archive")
+    end
+
+    def unarchive_project(project_id)
+      @conn.put("projects/#{project_id}/unarchive")
+    end
+
+    def get_project_report(project_id)
+      @conn.get("projects/#{project_id}/report")
+    end
+
+    def share_project_report(project_id)
+      @conn.put("projects/#{project_id}/share")
+    end
+
+    def disable_project_report_sharing(project_id)
+      @conn.put("projects/#{project_id}/disable_share")
+    end
+
+    def assign_project_to_group(project_id, project_group_id)
+      @conn.put("projects/#{project_id}/assign_project_group", { project_group_id: project_group_id })
+    end
+
+    def unassign_project_from_group(project_id)
+      @conn.put("projects/#{project_id}/unassign_project_group")
+    end
+
     private
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength

data/lib/moco/entities.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "helpers"
+
 module MOCO
   # Base entity class others inherit from, providing comparison, to_h, to_json
   class BaseEntity
@@ -67,7 +69,7 @@ module MOCO
                   :customer, :tag
 
     def to_s
-      "#{date} - #{hours}h (#{seconds}s) - #{project&.name} - #{task&.name}#{description.empty? ? "" : " (#{description})"} " \
+      "#{date} - #{Helpers.decimal_hours_to_civil(hours)}h (#{seconds}s) - #{project&.name} - #{task&.name}#{description.empty? ? "" : " (#{description})"} " \
         "(#{%i[billable billed].map { |x| (send(x) ? "" : "not ") + x.to_s }.join(", ")})"
     end
   end

data/lib/moco/helpers.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module MOCO
+  class Helpers
+    def self.decimal_hours_to_civil(decimal_hours)
+      hours = decimal_hours.floor
+      fractional_hours = decimal_hours - hours
+      minutes = (fractional_hours * 60).round
+      "#{hours}:#{format("%02d", minutes)}"
+    end
+  end
+end

data/lib/moco/sync.rb

@@ -8,7 +8,7 @@ module MOCO
   class Sync
     attr_reader :project_mapping, :task_mapping, :source_projects, :target_projects
     attr_accessor :project_match_threshold, :task_match_threshold, :dry_run
-
+  
     def initialize(source_instance_api, target_instance_api, **args)
       @source_api = source_instance_api
       @target_api = target_instance_api
@@ -16,14 +16,14 @@ module MOCO
       @task_match_threshold = args.fetch(:task_match_threshold, 0.45)
       @filters = args.fetch(:filters, {})
       @dry_run = args.fetch(:dry_run, false)
-
+  
       @project_mapping = {}
       @task_mapping = {}
-
+  
       fetch_assigned_projects
       build_initial_mappings
     end
-
+  
     # rubocop:todo Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def sync(&callbacks)
       results = []
@@ -38,6 +38,9 @@ module MOCO
         activities.group_by(&:project)
       end
 
+      used_source_activities = []
+      used_target_activities = []
+
       source_activities_grouped.each do |date, activities_by_project|
         activities_by_project.each do |project, source_activities|
           target_activities = target_activities_grouped.fetch(date, {}).fetch(@project_mapping[project.id], [])
@@ -46,9 +49,6 @@ module MOCO
           matches = calculate_matches(source_activities, target_activities)
           matches.sort_by! { |match| -match[:score] }
 
-          used_source_activities = []
-          used_target_activities = []
-
           matches.each do |match|
             source_activity, target_activity = match[:activity]
             score = match[:score]
@@ -87,6 +87,20 @@ module MOCO
           end
         end
       end
+
+      source_activities_r.each do |source_activity|
+        unless used_source_activities.include?(source_activity)
+          next unless @project_mapping[source_activity.project.id]
+          
+          expected_target_activity = get_expected_target_activity(source_activity)
+          callbacks&.call(:create, source_activity, expected_target_activity)
+          unless @dry_run
+            results << @target_api.create_activity(expected_target_activity)
+            callbacks&.call(:created, source_activity, expected_target_activity, results.last)
+          end
+        end
+      end
+
       results
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/moco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MOCO
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moco-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Teal Bauer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,6 +58,7 @@ files:
 - lib/moco.rb
 - lib/moco/api.rb
 - lib/moco/entities.rb
+- lib/moco/helpers.rb
 - lib/moco/sync.rb
 - lib/moco/version.rb
 - mocurl.rb