timet 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcf74496e5767f780af32f515ddaa47aac3a80056c62dd4e4ab680b4e380d9ea
-  data.tar.gz: 8013d89eb5d8f13c794bc3a8b65d976e6e5658d674183a82aa5c11df3c5e65e3
+  metadata.gz: 9174050872f06486ce9307f0aa9ab28decce4345f7169cc0537741028a8cfcae
+  data.tar.gz: 2eaa910c4a79265fe273bdeb9ff0cffb4f5e5330f8849c1ccc197d1ee5e5edbb
 SHA512:
-  metadata.gz: b0b961c8397a2db270284d7a25530265c79861e812674f376a2457675cdf5f1b6614117ead4e7de39ae73118ffcf30998a17d15ee010b6ec08725f63803bc99a
-  data.tar.gz: aa487be7cff8c23f5c578ea624ad2cd8382d5216833275fde531266d87efd850b678a3df28e350d95561758ba5ea1efa255db9e7eb5fe60e1c09580e4c805ea6
+  metadata.gz: 61d368a8f2e30693c6c29abff6ae067001798b0b30c3012cfbce4fe0ced2d31ce0e89e76fe716e026b361d391ca0d13d58e29e61db6231fb23cbaed2e7cfd8fa
+  data.tar.gz: '0299cb83c55d19053a98dcb795da56e485b14e7b45b10e7c45ed8f1ecc03218d0966a2f5b7a28c1d0939f1455d6e14978caa2cfb8a9bfc8509681f8d7fc813ae'

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [1.5.1] - 2024-12-07
+
+**Improvements:**
+
+- Extracted the logic for syncing items by ID into a separate method `sync_items_by_id` for better readability and maintainability.
+- Improved the writing of missing environment variables to the .env file in the S3Supabase module by ensuring the file content ends with a newline character.
+- Refactored the `all_items` method to use `beginning_of_day` for today's timestamp, improving the accuracy of the timestamp calculation.
+
+**Bug Fixes:**
+
+- Fixed the issue of having parameter lists longer than 5 parameters by refactoring the method to use a hash for named parameters.
+
 ## [1.5.0] - 2024-12-06
 
 **Improvements:**

data/lib/timet/database.rb

@@ -94,7 +94,9 @@ module Timet
     #   insert_item(1633072800, 'work', 'Completed task X')
     #
     # @note The method executes SQL to insert a new row into the 'items' table.
-    def insert_item(start, tag, notes, pomodoro = nil, updated_at = nil, created_at = nil)
+    def insert_item(*args, pomodoro: nil, updated_at: nil, created_at: nil)
+      # Unpacking args into meaningful variables for clarity
+      start, tag, notes = args
       execute_sql('INSERT INTO items (start, tag, notes, pomodoro, updated_at, created_at) VALUES (?, ?, ?, ?, ?, ?)',
                   [start, tag, notes, pomodoro, updated_at, created_at])
     end
@@ -185,7 +187,7 @@ module Timet
     # @note The method executes SQL to fetch all items from the 'items' table that have a start time greater than
     # or equal to today.
     def all_items
-      today = Time.now.to_i - (Time.now.to_i % 86_400)
+      today = Time.now.beginning_of_day.to_i
       execute_sql('SELECT * FROM items WHERE start >= ? AND (deleted IS NULL OR deleted = 0) ORDER BY start DESC',
                   [today])
     end

data/lib/timet/database_sync_helper.rb

@@ -198,21 +198,30 @@ module Timet
       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')
 
-      remote_by_id = items_to_hash(remote_items)
-      local_by_id = items_to_hash(local_items)
-      all_ids = (remote_by_id.keys + local_by_id.keys).uniq
+      sync_items_by_id(
+        local_db,
+        items_to_hash(local_items),
+        items_to_hash(remote_items)
+      )
+    end
 
-      all_ids.each do |id|
-        remote_item = remote_by_id[id]
-        local_item = local_by_id[id]
+    # Syncs items between local and remote databases based on their IDs
+    #
+    # @param local_db [SQLite3::Database] The local database connection
+    # @param local_items_by_id [Hash] Local items indexed by ID
+    # @param remote_items_by_id [Hash] Remote items indexed by ID
+    # @return [void]
+    def self.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
 
-        if remote_item && local_item
-          process_existing_item(id, local_item, remote_item, local_db)
-        elsif remote_item
-          puts "Adding remote item #{id} to local"
-          insert_item_from_hash(local_db, remote_item)
-        else # local_item exists
+      all_item_ids.each do |id|
+        if !remote_items_by_id[id]
           puts "Local item #{id} will be uploaded"
+        elsif !local_items_by_id[id]
+          puts "Adding remote item #{id} to local"
+          insert_item_from_hash(local_db, remote_items_by_id[id])
+        else
+          process_existing_item(id, local_items_by_id[id], remote_items_by_id[id], local_db)
         end
       end
     end

data/lib/timet/s3_supabase.rb

@@ -34,7 +34,7 @@ module Timet
     # Append missing variables with empty values
     return if missing_vars.empty?
 
-    File.write(env_file_path, missing_vars.map { |var| "#{var}=''" }.join("\n") + "\n", mode: 'a')
+    File.write(env_file_path, "#{missing_vars.map { |var| "#{var}=''" }.join("\n")}\n", mode: 'a')
   end
 
   # S3Supabase is a class that provides methods to interact with an S3-compatible
@@ -110,7 +110,8 @@ module Timet
     # Lists all objects in the specified bucket.
     #
     # @param bucket_name [String] The name of the bucket to list objects from
-    # @return [Array<Hash>, false, nil] Array of object hashes if objects found, false if bucket is empty, nil if error occurs
+    # @return [Array<Hash>, false, nil] Array of object hashes if objects found, false if bucket is empty,
+    # nil if error occurs
     # @raise [Aws::S3::Errors::ServiceError] if there's an error accessing the S3 service
     # @example
     #   list_objects('my-bucket') #=> [{key: 'example.txt', last_modified: '2023-01-01', ...}, ...]

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.5.0'
-  VERSION = '1.5.0'
+  #   Timet::VERSION # => '1.5.1'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timet
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Frank Vielma
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor