Fixed some code review findings

gaborbata · Mar 18, 2021 · 78370ab · 78370ab
1 parent a7dcf75
commit 78370ab
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 56 deletions.
diff --git a/bin/todo.rb b/bin/todo.rb
@@ -29,7 +29,6 @@
 require 'date'
 
 class Todo
-
   COLOR_CODES = {
     black:   30,
     red:     31,
@@ -177,7 +176,6 @@ def setup
     next_7_days = (0..6).map do |day| @today + day end
     @due_date_days = next_7_days.map do |day| day.strftime('%A').downcase end
     due_dates_for_queries = next_7_days.map do |day| day.strftime(DATE_FORMAT) end
-
     @queries = {
       ':active'    => lambda do |task| /(new|started|blocked)/.match(task[:state]) end,
       ':done'      => lambda do |task| 'done' == task[:state] end,
@@ -380,24 +378,19 @@ def filter_tasks(tasks, patterns)
       end
       items[num] = task if match
     end
-    return items
+    items
   end
 
   def colorize(text, color)
     "\e[#{COLOR_CODES[color] || 37}m#{text}\e[0m"
   end
 
   def convert_due_date(date)
-    due = nil
     day_index = @due_date_days.index(date.to_s.downcase) ||
       DUE_DATE_DAYS_SIMPLE.index(date.to_s.downcase) ||
       @due_date_days.map do |day| day[0..2] end.index(date.to_s.downcase)
-    if day_index
-      due = (@today + day_index).strftime(DATE_FORMAT)
-    else
-      due = date.nil? || date.empty? ? nil : Date.strptime(date, DATE_FORMAT).strftime(DATE_FORMAT)
-    end
-    return due
+    return (@today + day_index).strftime(DATE_FORMAT) if day_index
+    date.nil? || date.empty? ? nil : Date.strptime(date, DATE_FORMAT).strftime(DATE_FORMAT)
   end
 end
 

diff --git a/node/package.json b/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "todo-jsonl",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "todo list manager on the command-line inspired by todo.txt using the jsonl format",
   "main": "todo.js",
   "bin": {

diff --git a/node/todo.js b/node/todo.js
diff --git a/node/todo.js.rb b/node/todo.js.rb
@@ -29,7 +29,6 @@
 require 'date'
 
 class Todo
-
   COLOR_CODES = {
     black:   30,
     red:     31,
@@ -66,6 +65,7 @@ class Todo
   }
 
   DATE_FORMAT = '%Y-%m-%d'
+  DATE_PATTERN = /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/
   DUE_DATE_DAYS_SIMPLE = ['today', 'tomorrow']
   DUE_DATE_TAG_PATTERN = /(^| )due:([a-zA-Z0-9-]+)/
   CONTEXT_TAG_PATTERN = /(^| )[@+][\w-]+/
@@ -177,7 +177,6 @@ def setup
     next_7_days = (0..6).map do |day| @today + day end
     @due_date_days = next_7_days.map do |day| day.strftime('%A').downcase end
     due_dates_for_queries = next_7_days.map do |day| day.strftime(DATE_FORMAT) end
-
     @queries = {
       ':active'    => lambda do |task| /(new|started|blocked)/.match(task[:state]) end,
       ':done'      => lambda do |task| 'done' == task[:state] end,
@@ -395,24 +394,19 @@ def filter_tasks(tasks, patterns)
       end
       items[num] = task if match
     end
-    return items
+    items
   end
 
   def colorize(text, color)
     `'\u001b[' + #{COLOR_CODES[color] || 37} + 'm' + #{text} + '\u001b[0m'`
   end
 
   def convert_due_date(date)
-    due = nil
     day_index = @due_date_days.index(date.to_s.downcase) ||
       DUE_DATE_DAYS_SIMPLE.index(date.to_s.downcase) ||
       @due_date_days.map do |day| day[0..2] end.index(date.to_s.downcase)
-    if day_index
-      due = (@today + day_index).strftime(DATE_FORMAT)
-    else
-      due = date.nil? || date.empty? ? nil : Date.parse(/^\d{4}-\d{2}-\d{2}$/.match(date).to_s).strftime(DATE_FORMAT)
-    end
-    return due
+    return (@today + day_index).strftime(DATE_FORMAT) if day_index
+    date.nil? || date.empty? ? nil : Date.parse(DATE_PATTERN.match(date).to_s).strftime(DATE_FORMAT)
   end
 end
 

diff --git a/todo.gemspec b/todo.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'todo-jsonl'
-  s.version     = '0.1.32'
-  s.date        = '2021-03-17'
+  s.version     = '0.1.33'
+  s.date        = '2021-03-18'
   s.summary     = 'todo list manager on the command-line inspired by todo.txt using the jsonl format'
   s.authors     = ['Gabor Bata']
   s.homepage    = 'https://github.com/gaborbata/todo'

diff --git a/web/app.js b/web/app.js
diff --git a/web/app.js.rb b/web/app.js.rb
@@ -8,7 +8,7 @@
 
 `
 var term = new VanillaTerminal({
-  'welcome': '<u>todo list manager</u> REPL v0.1.32<br>Type "help" or "copyright" for more information.<br><br>',
+  'welcome': '<u>todo list manager</u> REPL v0.1.33<br>Type "help" or "copyright" for more information.<br><br>',
   'defaultCallback': default_callback,
   'prompt': 'todo',
   'commands': {

diff --git a/web/todo.js.rb b/web/todo.js.rb
@@ -29,7 +29,6 @@
 require 'date'
 
 class Todo
-
   COLOR_CODES = {
     black:   30,
     red:     31,
@@ -66,11 +65,12 @@ class Todo
   }
 
   DATE_FORMAT = '%Y-%m-%d'
+  DATE_PATTERN = /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/
   DUE_DATE_DAYS_SIMPLE = ['today', 'tomorrow']
   DUE_DATE_TAG_PATTERN = /(^| )due:([a-zA-Z0-9-]+)/
   CONTEXT_TAG_PATTERN = /(^| )[@+][\w-]+/
   PRIORITY_FLAG = '*'
-  TODO_FILE = "todo.jsonl"
+  TODO_FILE = 'todo.jsonl'
 
   def execute(arguments)
     @text_buffer = []
@@ -189,7 +189,6 @@ def setup
     next_7_days = (0..6).map do |day| @today + day end
     @due_date_days = next_7_days.map do |day| day.strftime('%A').downcase end
     due_dates_for_queries = next_7_days.map do |day| day.strftime(DATE_FORMAT) end
-
     @queries = {
       ':active'    => lambda do |task| /(new|started|blocked)/.match(task[:state]) end,
       ':done'      => lambda do |task| 'done' == task[:state] end,
@@ -206,7 +205,6 @@ def setup
   def load_tasks(item_to_check = nil)
     count = 0
     tasks = {}
-
     todo_jsonl = `window.localStorage.getItem(#{TODO_FILE}) || ''`
     if !todo_jsonl.empty?
       todo_jsonl.split("\n").each do |line|
@@ -376,23 +374,18 @@ def filter_tasks(tasks, patterns)
       end
       items[num] = task if match
     end
-    return items
+    items
   end
 
   def colorize(text, color)
     "\e[#{COLOR_CODES[color] || 37}m#{text}\e[0m"
   end
 
   def convert_due_date(date)
-    due = nil
     day_index = @due_date_days.index(date.to_s.downcase) ||
       DUE_DATE_DAYS_SIMPLE.index(date.to_s.downcase) ||
       @due_date_days.map do |day| day[0..2] end.index(date.to_s.downcase)
-    if day_index
-      due = (@today + day_index).strftime(DATE_FORMAT)
-    else
-      due = date.nil? || date.empty? ? nil : Date.parse(/^\d{4}-\d{2}-\d{2}$/.match(date).to_s).strftime(DATE_FORMAT)
-    end
-    return due
+    return (@today + day_index).strftime(DATE_FORMAT) if day_index
+    date.nil? || date.empty? ? nil : Date.parse(DATE_PATTERN.match(date).to_s).strftime(DATE_FORMAT)
   end
 end