timet 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fa974afe30946a8b292569e74917c3992097e0ae652339320981f2951f298d
-  data.tar.gz: dc6cf2d3f5bd30feebb93db4aa07c436203e53bf1d9d0dbba5166695b622b021
+  metadata.gz: cd119a6557987c9bdf16530865c16c60b3aca4cf30ed5424a04649f55bb6f430
+  data.tar.gz: 6a0e25787dce7bc903e3b2fa6374631db80045ae3dbf353b9cb8b2fd6cbbcf95
 SHA512:
-  metadata.gz: 49cf7cc38f9e44687d27bee93a8de5678963fd92a9589241e38635afcdf4b86f8229d1c401483d2d6e955ee83e5423ca10f832f4beb0101873e60f5d0ff34821
-  data.tar.gz: 2098f1a3c297277bd07425961b3e84425a1189ae5984e21c35649a3a2c517a5a175dfd5b477abb59ba49f78925a9c4ec872006d3be025ddc4ee363bf86ff7004
+  metadata.gz: 74c3b445e264432d4412afef6bdc53e6f2c1f8a1b8d64c430a4c638d70f58190654faa2d7b550ebcc97fb2068d0091fcb7d4f4ce5d365179c7828db4e0076830
+  data.tar.gz: 9563a33fff69df1b70375f7528174cd5ff064f77b2d78a2f8609d861e095d7f50312e065e21c587786c442ed10b6c7de2803e96e2d556db4626e729cfa04e0e2

data/.rubocop.yml

@@ -6,9 +6,14 @@ AllCops:
     - timet.gemspec
     - "vendor/**/*" # Exclude vendor/bundle gems
 
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/timet/database_syncer.rb'
+
 Metrics/ModuleLength:
   Exclude:
     - 'lib/timet/tag_distribution.rb'
+    - 'lib/timet/database_syncer.rb'
 
 Metrics/MethodLength:
   Max: 15

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.6.4] - 2026-03-26
+
+**Improvements:**
+
+- **Database Synchronization:** Refactored sync logic to use bidirectional comparison with timestamp-based conflict resolution, improving reliability during database merges.
+- **Dependencies:** Updated `icalendar` to `~> 2.12.2` and `json` to `~> 2.19`, removing unused gems.
+- **Code Quality:** Added RuboCop exclusions for predicate methods in `DatabaseSyncer` and module length for `database_syncer.rb`.
+- **Test Coverage:** Expanded test suite for bidirectional sync scenarios, including conflict resolution and remote item handling.
+
+**Bug Fixes:**
+
+- **Sync Logic:** Fixed item synchronization to properly handle local-only and remote-only items with timestamp-based decision making.
+- **Database Updates:** Corrected `update_item_from_hash` method to properly bind ID parameter in SQL queries.
+- **Conflict Resolution:** Simplified remote wins logic to compare timestamps directly, removing redundant deleted flag checks.
+- **Sync Flagging:** Fixed return values in sync methods to accurately track whether local changes occurred during synchronization.
+
 ## [1.6.3] - 2026-02-28
 
 **Improvements:**

data/lib/timet/database_syncer.rb

@@ -55,35 +55,65 @@ module Timet
 
     def sync_databases(*args)
       local_db, remote_db, remote_storage, bucket, local_db_path = args
-      process_database_items(local_db, remote_db)
-      remote_storage.upload_file(bucket, local_db_path, 'timet.db')
+      local_items = local_db.execute_sql('SELECT * FROM items ORDER BY updated_at DESC')
+      remote_items = remote_db.execute('SELECT * FROM items ORDER BY updated_at DESC')
+
+      local_by_id = items_to_hash(local_items)
+      remote_by_id = items_to_hash(remote_items)
+
+      local_changes = process_bidirectional_sync(local_db, local_by_id, remote_by_id)
+
+      if local_changes
+        remote_storage.upload_file(bucket, local_db_path, 'timet.db')
+        puts 'Changes uploaded to remote'
+      else
+        puts 'No local changes to upload'
+      end
+
       puts 'Database sync completed'
     end
 
-    def process_database_items(local_db, remote_db)
-      remote_items = remote_db.execute('SELECT * FROM items ORDER BY updated_at DESC')
-      local_items = local_db.execute_sql('SELECT * FROM items ORDER BY updated_at DESC')
+    def process_bidirectional_sync(local_db, local_items_by_id, remote_items_by_id)
+      all_ids = (remote_items_by_id.keys + local_items_by_id.keys).uniq
+      local_has_changes = false
+
+      all_ids.each do |id|
+        remote_item = remote_items_by_id[id]
+        local_item = local_items_by_id[id]
 
-      sync_items_by_id(local_db, items_to_hash(local_items), items_to_hash(remote_items))
+        changed = sync_single_item_and_flag(local_db, id, local_item, remote_item)
+        local_has_changes = true if changed
+      end
+
+      local_has_changes
     end
 
-    def sync_items_by_id(local_db, local_items_by_id, remote_items_by_id)
-      all_item_ids = (remote_items_by_id.keys + local_items_by_id.keys).uniq
-      all_item_ids.each { |id| sync_single_item(local_db, id, local_items_by_id, remote_items_by_id) }
+    def sync_single_item_and_flag(local_db, id, local_item, remote_item)
+      if !remote_item && local_item
+        puts "Local item #{id} will be uploaded"
+        true
+      elsif !local_item && remote_item
+        puts "Adding remote item #{id} to local"
+        insert_item_from_hash(local_db, remote_item)
+        false
+      elsif local_item && remote_item
+        merge_and_track_changes?(local_db, id, local_item, remote_item)
+      else
+        false
+      end
     end
 
-    def sync_single_item(*args)
-      local_db, id, local_items_by_id, remote_items_by_id = args
-      remote_item = remote_items_by_id[id]
-      local_item = local_items_by_id[id]
+    def merge_and_track_changes?(local_db, id, local_item, remote_item)
+      local_time = extract_timestamp(local_item)
+      remote_time = extract_timestamp(remote_item)
 
-      if !remote_item
-        log_local_only(id)
-      elsif !local_item
-        add_remote_item(local_db, id, remote_item)
-      else
-        merge_item(local_db, id, local_item, remote_item)
+      if remote_time > local_time
+        puts "Remote item #{id} is newer - updating local"
+        update_item_from_hash(local_db, remote_item)
+      elsif local_time > remote_time
+        puts "Local item #{id} is newer - will be uploaded"
       end
+      true
     end
 
     def log_local_only(id)
@@ -132,9 +162,11 @@ module Timet
 
     def update_item_from_hash(db, item)
       fields = "#{ITEM_FIELDS.join(' = ?, ')} = ?"
+      values = get_update_values(item)
+      values << item['id']
       db.execute_sql(
         "UPDATE items SET #{fields} WHERE id = ?",
-        get_update_values(item)
+        values
       )
     end
 
@@ -147,9 +179,8 @@ module Timet
       items.to_h { |item| [item['id'], item] }
     end
 
-    def remote_wins?(remote_item, remote_time, local_time)
-      time_diff = remote_time > local_time
-      time_diff && (remote_item['deleted'].to_i == 1 || time_diff)
+    def remote_wins?(_remote_item, remote_time, local_time)
+      remote_time > local_time
     end
 
     def format_status_message(id, item, source)

data/lib/timet/version.rb

@@ -6,6 +6,6 @@ module Timet
   # @return [String] The version number in the format 'major.minor.patch'.
   #
   # @example Get the version of the Timet application
-  #   Timet::VERSION # => '1.6.3'
-  VERSION = '1.6.3'
+  #   Timet::VERSION # => '1.6.4'
+  VERSION = '1.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timet
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Frank Vielma
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-28 00:00:00.000000000 Z
+date: 2026-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor