tsks 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b89efbe36c688675848e879587194b69db1f2fb21a60a2722186d71baced4056
-  data.tar.gz: a17fbbb16b65f0e1aa3d020596e71bdbab0c431e54b09365849d74d51121a981
+  metadata.gz: e0ac100edb1bd020860d7f8a63a58e2cca619f8c6c1775db4e9f5d84b5a864ad
+  data.tar.gz: e1e564b30cfb1f4cbe3969dc9b761c13734374a8ee9623818e9d92efd5769f9f
 SHA512:
-  metadata.gz: affe2109c255dab16db5c93f955abcf4d3afd3aa1e46e8e392dee22681a5c3564773ca83195b10f9129e15721b9c0fe11495071bbcacce2419c4c9fe2ba1f2ff
-  data.tar.gz: 6a2c430ee08994a1d4ff8637b545ab2c27f60b645764b01e8b43793d474efec08afe25ab1d8bf9cacd9157547f83a11954ac8e0d9af91f85ad7302e0bb8cc368
+  metadata.gz: a57c235a7aef701d2a8537f0449213466c905d7432696eb15cdce666270943b1fcf7681613480aa8fece0815962f777ede0f3f81918ddb9b173ccc69ae6a022b
+  data.tar.gz: fed3ec9a4952c847d14c004092de4db6d30d1de4d1b06bfc095b86e4d9aa84ba8b621d2e0f3c9d30658f2f4d4dfcf8beca057c0a457137b82f5354f8f0ead3da

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tsks (0.0.12)
+    tsks (0.0.14)
       httparty
       sqlite3
       thor

data/lib/tsks/cli.rb

@@ -6,6 +6,7 @@ require "tsks/actions"
 
 module Tsks
   class CLI < Thor
+    # @setup_folder = File.expand_path "~/.tsks_tmp"
     @setup_folder = File.expand_path "~/.tsks"
 
     def self.setup_folder
@@ -83,7 +84,7 @@ module Tsks
       if tsks.count > 0
         for tsk in tsks
           tsk_status = Tsks::Actions.get_tsk_status tsk[:status]
-          puts "#{tsk_status} | #{tsk[:local_id]} #{tsk[:tsk]} @#{tsk[:context]}"
+          puts "#{tsk[:id]} #{tsk_status} | #{tsk[:tsk]} @#{tsk[:context]}"
         end
       else
         puts "no tsks found."
@@ -161,25 +162,33 @@ module Tsks
       Tsks::Storage.delete_removed_uuids
       local_tsks = Tsks::Storage.select_all local_id=false
 
-      remote_tsks = []
       begin
         get_res = Tsks::Request.get "/tsks", token
-        if get_res[:tsks]
-          for tsk in get_res[:tsks]
-            tsk[:created_at] = Time.parse(tsk[:created_at]).strftime "%F %T"
-            tsk[:updated_at] = Time.parse(tsk[:updated_at]).strftime "%F %T"
-            remote_tsks.append tsk
-          end
+        remote_tsks = get_res[:tsks]
 
+        if get_res[:tsks]
           if get_res[:ok] == true
             local_tsks_to_post = local_tsks - remote_tsks
+
             if local_tsks_to_post.count > 0
               for tsk in local_tsks_to_post
-                Tsks::Request.post "/tsks", token, {tsk: tsk}
+                post_res = Tsks::Request.post "/tsks", token, {tsk: tsk}
+                posted_tsk = post_res[:tsk]
+
+                if posted_tsk
+                  # TODO: write tests for Storage.select_local_id
+                  tsk_local_id = Tsks::Storage.select_local_id({tsk: posted_tsk[:tsk],
+                                                                created_at: posted_tsk[:created_at],
+                                                                updated_at: posted_tsk[:updated_at]})
+
+                  Tsks::Storage.update tsk_local_id, {id: posted_tsk[:id]}
+                end
               end
             end
 
-            remote_tsks_to_storage = remote_tsks - local_tsks
+            updated_local_tsks = Tsks::Storage.select_all local_id=false
+            remote_tsks_to_storage = remote_tsks - updated_local_tsks
+
             if remote_tsks_to_storage.count > 0
               Tsks::Storage.insert_many remote_tsks_to_storage
             end

data/lib/tsks/request.rb

@@ -2,7 +2,8 @@ require "httparty"
 
 module Tsks
   class Request
-    @base_uri = "https://tsks-api.onrender.com/v1"
+    @base_uri = "http://localhost:5000/v1"
+    #@base_uri = "https://tsks-api.onrender.com/v1"
 
     def self.base_uri
       @base_uri

data/lib/tsks/storage.rb

@@ -7,7 +7,7 @@ module Tsks
       storage = get_storage_instance
       storage.execute <<-SQL
         CREATE TABLE tsks (
-          id VARCHAR PRIMARY KEY UNIQUE NOT NULL,
+          id VARCHAR PRIMARY KEY UNIQUE,
           user_id INTEGER DEFAULT 1,
           tsk VARCHAR NOT NULL,
           status VARCHAR DEFAULT todo,
@@ -19,27 +19,26 @@ module Tsks
 
       storage.execute <<-SQL
         CREATE TABLE removed_tsks (
-          tsk_uuid VARCHAR UNIQUE NOT NULL
+          tsk_id VARCHAR UNIQUE NOT NULL
         )
       SQL
     end
 
     def self.insert tsk, ctx=nil
       storage = get_storage_instance
-      now = Time.now.strftime "%F %T"
-      uuid = UUID.new.generate
+      now = Time.now.strftime("%Y-%m-%dT%H:%M:%S.%LZ")
 
       if ctx
         storage.execute("
-          INSERT INTO tsks (id, tsk, status, context, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?, ?)",
-          [uuid, tsk, 'todo', ctx, now, now]
+          INSERT INTO tsks (tsk, status, context, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?)",
+          [tsk, 'todo', ctx, now, now]
          )
       else
         storage.execute("
-          INSERT INTO tsks (id, tsk, status, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?)",
-          [uuid, tsk, 'todo', now, now]
+          INSERT INTO tsks (tsk, status, created_at, updated_at)
+          VALUES (?, ?, ?, ?)",
+          [tsk, 'todo', now, now]
          )
       end
     end
@@ -101,6 +100,17 @@ module Tsks
       tsks = structure_tsks raw_tsks
     end
 
+    # TODO: write tests for Storage.select_local_id
+    def self.select_local_id params
+      storage = get_storage_instance
+
+      tsk = storage.execute(
+        "SELECT rowid, * FROM tsks WHERE #{params.keys.first}=? AND #{params.keys[1]}=? AND #{params.keys.last}=?",
+        params.values.first, params.values[1], params.values.last)
+
+      tsk_local_id = tsk[0][0]
+    end
+
     def self.select_all local_id=true
       storage = get_storage_instance
       raw_tsks = local_id ?
@@ -117,13 +127,11 @@ module Tsks
 
     def self.delete local_id
       storage = get_storage_instance
-      removed_tsks = storage
-                      .execute("SELECT * FROM tsks WHERE rowid=?", local_id)
+      removed_tsks = storage.execute("SELECT * FROM tsks WHERE rowid=?", local_id)
       if removed_tsks.empty?
         return false
       end
-      storage
-        .execute("INSERT INTO removed_tsks (tsk_uuid) VALUES (?)", removed_tsks[0][0])
+      storage.execute("INSERT INTO removed_tsks (tsk_id) VALUES (?)", removed_tsks[0][0])
       storage.execute("DELETE FROM tsks WHERE rowid=?", local_id)
     end
 
@@ -131,11 +139,11 @@ module Tsks
       storage = get_storage_instance
       result = storage.execute("SELECT * FROM removed_tsks")
 
-      tsk_uuids = []
+      tsk_ids = []
       for item in result
-        tsk_uuids.append item[0]
+        tsk_ids.append item[0]
       end
-      return tsk_uuids
+      return tsk_ids
     end
 
     def self.delete_removed_uuids

data/lib/tsks/version.rb

@@ -1,3 +1,3 @@
 module Tsks
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Luan Ramos Vicente
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec