todo-jsonl 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2869302296a5a0ab3af889b0a76926cfba6d59552d5e4103524dae1ae3e7fd50
-  data.tar.gz: f2d7d03e8b62139d3197386c44391caf4a9d4fae545012389272cebdca61c3d9
+  metadata.gz: 2af368dfb4ac9e0f8e6448e005bb7242c509d6bf0ce1e97bdc8783629c3dd77f
+  data.tar.gz: dc5f0da8574ea5bda98627c122e9a0bdc7c3d661cba879c4ac09bff3cdb075ba
 SHA512:
-  metadata.gz: 40c72337ffd6a818adf28ef001cbd3b4f365af92d1fecd9a36ea361522a2125d83500ed76d4633df228c2c87a987083b08541452e7129af914452e7ca6652563
-  data.tar.gz: 6f42e59df9b34c140f3c6bba11010f0b6a3f7a3c45d1c7b23d5ded213ee2562e62a963b3e889a6886b97ff991e49e78af6efccf898fd951220c1cad8bcb2f66d
+  metadata.gz: 1d0b4562ca3af2722f5fb2eb594f248ccaf2b69b18eb2a7f2e19f386da1f60352260631a7afd53e5cf375a3f7c37297a85808a701870b0c2eb73efe9797416e8
+  data.tar.gz: 030be81b91d66d0d084dff2c805df49cc1f2705aa020d607a06003d542a139e0f6b6708d307a6e448e14c0ca76b135878e643c5ab54132ac457be506cea43b4f

data/bin/todo.rb

@@ -129,6 +129,7 @@ class Todo
     rescue => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
+    self
   end
 
   private
@@ -177,15 +178,15 @@ class Todo
     due_dates_for_queries = next_7_days.map do |day| day.strftime(DATE_FORMAT) end
 
     @queries = {
-      ':active'    => 'state=(new|started|blocked)',
-      ':done'      => 'state=done',
-      ':blocked'   => 'state=blocked',
-      ':started'   => 'state=started',
-      ':new'       => 'state=new',
-      ':all'       => 'state=\w+',
-      ':today'     => "due=#{due_dates_for_queries[0]}",
-      ':tomorrow'  => "due=#{due_dates_for_queries[1]}",
-      ':next7days' => "due=(#{due_dates_for_queries.join('|')})"
+      ':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
     }
   end
 
@@ -374,10 +375,9 @@ class Todo
   def filter_tasks(tasks, patterns)
     items = {}
     tasks.each do |num, task|
-      normalized_task = "state=#{task[:state]} due=#{task[:due]} #{task[:title]}"
       match = true
       patterns.each do |pattern|
-        match = false unless /#{@queries[pattern] || pattern}/ix.match(normalized_task)
+        match = false unless @queries[pattern] ? @queries[pattern].call(task) : /#{pattern}/ix.match(task[:title])
       end
       items[num] = task if match
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: