doing 2.1.86 → 2.1.88

data/lib/doing/phrase_parser.rb

@@ -7,6 +7,8 @@ module PhraseParser
   # terms. This is done creating multiple types of clauses instead of just one.
   # A phrase clause generates an Elasticsearch match_phrase query.
   class QueryParser < Parslet::Parser
+    CLAUSE_TYPES = %i[should must must_not].freeze
+
     rule(:term) { match('[^\s"]').repeat(1).as(:term) }
     rule(:quote) { str('"') }
     rule(:operator) { (str('+') | str('-')).as(:operator) }
@@ -19,8 +21,9 @@ module PhraseParser
     root(:query)
   end
 
+  # Transforms the parsed query into a Query object
   class QueryTransformer < Parslet::Transform
-    rule(:clause => subtree(:clause)) do
+    rule(clause: subtree(:clause)) do
       if clause[:term]
         TermClause.new(clause[:operator]&.to_s, clause[:term].to_s)
       elsif clause[:phrase]
@@ -33,6 +36,7 @@ module PhraseParser
     rule(query: sequence(:clauses)) { Query.new(clauses) }
   end
 
+  # Represents an operator
   class Operator
     def self.symbol(str)
       case str
@@ -48,6 +52,7 @@ module PhraseParser
     end
   end
 
+  # Represents a term clause
   class TermClause
     attr_accessor :operator, :term
 
@@ -57,7 +62,7 @@ module PhraseParser
     end
   end
 
-  # Phrase
+  # Represents a phrase clause
   class PhraseClause
     attr_accessor :operator, :phrase
 
@@ -79,27 +84,10 @@ module PhraseParser
     end
 
     def to_elasticsearch
-      query = {}
-
-      if should_clauses.any?
-        query[:should] = should_clauses.map do |clause|
-          clause_to_query(clause)
-        end
-      end
-
-      if must_clauses.any?
-        query[:must] = must_clauses.map do |clause|
-          clause_to_query(clause)
-        end
+      QueryParser::CLAUSE_TYPES.each_with_object({}) do |type, query|
+        clauses = instance_variable_get("@#{type}_clauses")
+        query[type] = clauses.map { |clause| clause_to_query(clause) } if clauses&.any?
       end
-
-      if must_not_clauses.any?
-        query[:must_not] = must_not_clauses.map do |clause|
-          clause_to_query(clause)
-        end
-      end
-
-      query
     end
 
     def clause_to_query(clause)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.86'
+  VERSION = '2.1.88'
 end

data/lib/doing.rb

@@ -20,7 +20,6 @@ require 'safe_yaml/load'
 require 'chronic'
 require 'tty-link'
 require 'tty-which'
-require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.86
+  version: 2.1.88
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -158,6 +157,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.36
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +191,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +265,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +339,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: reline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -845,7 +920,6 @@ homepage: http://brettterpstra.com/project/doing/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--title"
 - doing
@@ -867,8 +941,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A command line tool for managing What Was I Doing reminders
 test_files: []