storage.rb in tsks-0.0.7

- old
+ new

@@ -8,12 +8,12 @@
       storage.execute <<-SQL
         CREATE TABLE tsks (
           id VARCHAR PRIMARY KEY UNIQUE NOT NULL,
           user_id INTEGER DEFAULT 1,
           tsk VARCHAR NOT NULL,
+          status VARCHAR DEFAULT todo,
           context VARCHAR DEFAULT Inbox,
-          done BOOLEAN DEFAULT false,
           created_at VARCHAR NOT NULL,
           updated_at VARCHAR NOT NULL
         )
       SQL
 
@@ -29,36 +29,36 @@
       now = Time.now.strftime "%F %T"
       uuid = UUID.new.generate
 
       if ctx
         storage.execute("
-          INSERT INTO tsks (id, tsk, context, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?)",
-          [uuid, tsk, ctx, now, now]
+          INSERT INTO tsks (id, tsk, status, context, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?, ?)",
+          [uuid, tsk, 'todo', ctx, now, now]
          )
       else
         storage.execute("
-          INSERT INTO tsks (id, tsk, created_at, updated_at)
-          VALUES (?, ?, ?, ?)",
-          [uuid, tsk, now, now]
+          INSERT INTO tsks (id, tsk, status, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?)",
+          [uuid, tsk, 'todo', now, now]
          )
       end
     end
 
     def self.insert_many tsks
       storage = get_storage_instance
 
       for tsk in tsks
         storage.execute("
           INSERT INTO tsks
-          (id, user_id, tsk, context, done, created_at, updated_at) VALUES
+          (id, user_id, tsk, status, context, created_at, updated_at) VALUES
           (?, ?, ?, ?, ?, ?, ?)",
           [tsk[:id],
            tsk[:user_id],
            tsk[:tsk],
+           tsk[:status],
            tsk[:context],
-           tsk[:done],
            tsk[:created_at],
            tsk[:updated_at]]
         )
       end
     end
@@ -75,11 +75,11 @@
           "UPDATE tsks SET " \
           "#{params.keys.first}=? " \
           "WHERE rowid=?",
           [params.values.first, local_id])
       else
-        storage.execute "UPDATE tsks SET done=true WHERE rowid=?", local_id
+        storage.execute "UPDATE tsks SET status='done' WHERE rowid=?", local_id
       end
     end
 
     def self.select_by params
       storage = get_storage_instance
@@ -152,19 +152,19 @@
         if local_id
            t[:local_id] = tsk[0]
            t[:id] = tsk[1]
            t[:user_id] = tsk[2]
            t[:tsk] = tsk[3]
-           t[:context] = tsk[4]
-           t[:done] = tsk[5]
+           t[:status] = tsk[4]
+           t[:context] = tsk[5]
            t[:created_at] = tsk[6]
            t[:updated_at] = tsk[7]
         else
            t[:id] = tsk[0]
            t[:user_id] = tsk[1]
            t[:tsk] = tsk[2]
-           t[:context] = tsk[3]
-           t[:done] = tsk[4]
+           t[:status] = tsk[3]
+           t[:context] = tsk[4]
            t[:created_at] = tsk[5]
            t[:updated_at] = tsk[6]
         end
 
         structured_tsks.append t