todo-jsonl 0.1.33 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f9cb1d9f24fe4077faebac43c8fe85041021f560a9cd812e67acace53441cc
-  data.tar.gz: cddf8951cc9afbdea4ee6831f3c86fc5419a4f00582a2b1292007bba15b9cf13
+  metadata.gz: 1f9f0379dadc07a6aa67bc1dc0662fcb6df0b4183f55de8abbda1020e8393bfc
+  data.tar.gz: c61ac4593f27a6bb737fe2c419fb28b356eed555291c68b33dd17a7a2589ce8b
 SHA512:
-  metadata.gz: 9e90bb2be2db37e6bfdcee15f7953112bba1db7804562dd4ab697a033a7d38ec4cd495abb394320263ff2a76fb5ff23c0886eb8ae381959a170828a0d7d83d9f
-  data.tar.gz: ab376c488d6a86676ee134154ef62e7c63f801d3002ef1df28ec2aee521f535730739ff4a13847dd0d77ad19bab0b6b36d5ce7732d6b317696e125293fa95d28
+  metadata.gz: ce2c81b1964521382cfef561aa92e7c954a4537664966243132d9d6b8752593bcc8fe4386ff7e565e751856697ca08e1a12a798b26cb2f83856db78adea4e2a2
+  data.tar.gz: 6235a7b73886fd6a9a8944287c8c47f012797affac60f492eb7551dd19e4690f06ad7986d63523474cf730d74507ab0caae03de5af6b296ba9613788ed408581

data/bin/todo.rb

@@ -173,19 +173,19 @@ class Todo
 
   def setup
     @today = Date.today
-    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
+    next_7_days = (0..6).map { |day| @today + day }
+    @due_date_days = next_7_days.map { |day| day.strftime('%A').downcase }
+    due_dates_for_queries = next_7_days.map { |day| day.strftime(DATE_FORMAT) }
     @queries = {
-      ':active'    => lambda do |task| /(new|started|blocked)/.match(task[:state]) end,
-      ':done'      => lambda do |task| 'done' == task[:state] end,
-      ':blocked'   => lambda do |task| 'blocked' == task[:state] end,
-      ':started'   => lambda do |task| 'started' == task[:state] end,
-      ':new'       => lambda do |task| 'new' == task[:state] end,
-      ':all'       => lambda do |task| /\w+/.match(task[:state]) end,
-      ':today'     => lambda do |task| due_dates_for_queries[0] == task[:due] end,
-      ':tomorrow'  => lambda do |task| due_dates_for_queries[1] == task[:due] end,
-      ':next7days' => lambda do |task| /(#{due_dates_for_queries.join('|')})/.match(task[:due]) end
+      ':active'    => lambda { |task| /(new|started|blocked)/.match(task[:state]) },
+      ':done'      => lambda { |task| 'done' == task[:state] },
+      ':blocked'   => lambda { |task| 'blocked' == task[:state] },
+      ':started'   => lambda { |task| 'started' == task[:state] },
+      ':new'       => lambda { |task| 'new' == task[:state] },
+      ':all'       => lambda { |task| /\w+/.match(task[:state]) },
+      ':today'     => lambda { |task| due_dates_for_queries[0] == task[:due] },
+      ':tomorrow'  => lambda { |task| due_dates_for_queries[1] == task[:due] },
+      ':next7days' => lambda { |task| /(#{due_dates_for_queries.join('|')})/.match(task[:due]) }
     }
   end
 
@@ -224,8 +224,8 @@ class Todo
 
   def add(text)
     task = {
-      state: 'new',
-      title: text,
+      state:    'new',
+      title:    text,
       modified: @today.strftime(DATE_FORMAT)
     }
     postprocess_tags(task)
@@ -365,20 +365,18 @@ class Todo
     tasks = load_tasks
     patterns = [':done'] + patterns.to_a
     items = filter_tasks(tasks, patterns)
-    items.each_key do |num| tasks.delete(num) end
+    items.each_key { |num| tasks.delete(num) }
     write_tasks(tasks)
     puts "Deleted #{items.size} todo(s)"
   end
 
   def filter_tasks(tasks, patterns)
-    items = {}
-    tasks.each do |num, task|
-      match = patterns.uniq.all? do |pattern|
+    patterns = patterns.uniq
+    tasks.select do |num, task|
+      patterns.all? do |pattern|
         @queries[pattern] ? @queries[pattern].call(task) : /#{pattern}/ix.match(task[:title])
       end
-      items[num] = task if match
     end
-    items
   end
 
   def colorize(text, color)
@@ -388,7 +386,7 @@ class Todo
   def convert_due_date(date)
     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)
+      @due_date_days.map { |day| day[0..2] }.index(date.to_s.downcase)
     return (@today + day_index).strftime(DATE_FORMAT) if day_index
     date.nil? || date.empty? ? nil : Date.strptime(date, DATE_FORMAT).strftime(DATE_FORMAT)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 1.0.0
 platform: ruby
 authors:
 - Gabor Bata