doing 2.1.0pre → 2.1.4pre

data/lib/completion/doing.bash

@@ -101,9 +101,9 @@ _doing_finish() {
 _doing_grep() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --case --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --case --duration --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-i -o -s -t -x --after --before --case --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-i -o -s -t -x --after --before --case --duration --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
   
   fi
 }
@@ -131,9 +131,9 @@ _doing_import() {
 _doing_last() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--bool --case --editor --not --section --search --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--bool --case --duration --editor --not --section --search --tag --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -s -x --bool --case --editor --not --section --search --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -s -x --bool --case --duration --editor --not --section --search --tag --exact' -- $token ) )
   
   fi
 }
@@ -191,9 +191,9 @@ _doing_now() {
 _doing_on() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--duration --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --duration --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -221,9 +221,9 @@ _doing_plugins() {
 _doing_recent() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--interactive --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--duration --interactive --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-i -s -t --interactive --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-i -s -t --duration --interactive --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -261,9 +261,9 @@ _doing_sections() {
 _doing_select() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --resume --cancel --case --delete --editor --finish --flag --force --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -r -s -t -x --archive --resume --cancel --case --delete --editor --finish --flag --force --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -r -s -t -x --archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
   
   fi
 }
@@ -276,9 +276,9 @@ local words=$(doing sections)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --duration --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -c -f -i -o -s -t -x --age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -c -i -o -s -t -x --age --after --bool --before --count --case --duration --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -301,9 +301,9 @@ IFS="$OLD_IFS"
 _doing_since() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--duration --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --duration --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -331,9 +331,9 @@ _doing_template() {
 _doing_today() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --duration --from --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --after --before --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --duration --from --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -356,9 +356,9 @@ local words=$(doing views)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -401,9 +401,9 @@ _doing_wiki() {
 _doing_yesterday() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --output --section --times --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --duration --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --after --before --output --section --times --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --duration --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
   
   fi
 }

data/lib/doing/boolean_term_parser.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'parslet'
+
+module BooleanTermParser
+  # This query parser adds an optional operator ("+" or "-") to the simple term
+  # parser. In order to do that, a new "clause" node is added to the parse tree.
+  class QueryParser < Parslet::Parser
+    rule(:term) { match('[^\s]').repeat(1).as(:term) }
+    rule(:operator) { (str('+') | str('-')).as(:operator) }
+    rule(:clause) { (operator.maybe >> term).as(:clause) }
+    rule(:space) { match('\s').repeat(1) }
+    rule(:query) { (clause >> space.maybe).repeat.as(:query) }
+    root(:query)
+  end
+
+  class QueryTransformer < Parslet::Transform
+    rule(:clause => subtree(:clause)) do
+      Clause.new(clause[:operator]&.to_s, clause[:term].to_s)
+    end
+    rule(:query => sequence(:clauses)) { Query.new(clauses) }
+  end
+
+  class Operator
+    def self.symbol(str)
+      case str
+      when '+'
+        :must
+      when '-'
+        :must_not
+      when nil
+        :should
+      else
+        raise "Unknown operator: #{str}"
+      end
+    end
+  end
+
+  class Clause
+    attr_accessor :operator, :term
+
+    def initialize(operator, term)
+      self.operator = Operator.symbol(operator)
+      self.term = term
+    end
+  end
+
+  class Query
+    attr_accessor :should_terms, :must_not_terms, :must_terms
+
+    def initialize(clauses)
+      grouped = clauses.chunk { |c| c.operator }.to_h
+      self.should_terms = grouped.fetch(:should, []).map(&:term)
+      self.must_not_terms = grouped.fetch(:must_not, []).map(&:term)
+      self.must_terms = grouped.fetch(:must, []).map(&:term)
+    end
+
+    def to_elasticsearch
+      query = {}
+
+      if should_terms.any?
+        query[:should] = should_terms.map do |term|
+          match(term)
+        end
+      end
+
+      if must_terms.any?
+        query[:must] = must_terms.map do |term|
+          match(term)
+        end
+      end
+
+      if must_not_terms.any?
+        query[:must_not] = must_not_terms.map do |term|
+          match(term)
+        end
+      end
+
+      query
+    end
+
+    def match(term)
+      term
+    end
+  end
+end

data/lib/doing/configuration.rb

@@ -7,7 +7,11 @@ module Doing
   class Configuration
     attr_reader :settings
 
-    attr_writer :ignore_local
+    attr_writer :ignore_local, :config_file, :force_answer
+
+    def force_answer
+      @force_answer ||= false
+    end
 
     MissingConfigFile = Class.new(RuntimeError)
 
@@ -26,34 +30,37 @@ module Doing
         'command_path' => File.join(Util.user_home, '.config', 'doing', 'commands')
       },
       'doing_file' => '~/what_was_i_doing.md',
+      'backup_dir' => '~/.doing_backup',
       'current_section' => 'Currently',
       'paginate' => false,
       'never_time' => [],
       'never_finish' => [],
+      'date_tags' => ['done', 'defer(?:red)?', 'waiting'],
 
       'timer_format' => 'text',
+      'interval_format' => 'text',
 
       'templates' => {
         'default' => {
           'date_format' => '%Y-%m-%d %H:%M',
-          'template' => '%date | %title%note',
+          'template' => '%date | %title %interval%duration%note',
           'wrap_width' => 0,
           'order' => 'asc'
         },
         'today' => {
           'date_format' => '%_I:%M%P',
-          'template' => '%date: %title %interval%note',
+          'template' => '%date: %title %interval%duration%note',
           'wrap_width' => 0,
           'order' => 'asc'
         },
         'last' => {
           'date_format' => '%-I:%M%P on %a',
-          'template' => '%title (at %date)%odnote',
+          'template' => '%title (at %date) %interval%duration%odnote',
           'wrap_width' => 88
         },
         'recent' => {
           'date_format' => '%_I:%M%P',
-          'template' => '%shortdate: %title (%section)',
+          'template' => '%shortdate: %title (%section) %interval%duration%note',
           'wrap_width' => 88,
           'count' => 10,
           'order' => 'asc'
@@ -99,24 +106,21 @@ module Doing
       @config_file ||= default_config_file
     end
 
-    def config_file=(file)
-      @config_file = file
-    end
-
     def config_dir
       @config_dir ||= File.join(Util.user_home, '.config', 'doing')
-      # @config_dir ||= Util.user_home
     end
 
     def default_config_file
-      raise DoingRuntimeError, "#{config_dir} exists but is not a directory" if File.exist?(config_dir) && !File.directory?(config_dir)
+      if File.exist?(config_dir) && !File.directory?(config_dir)
+        raise DoingRuntimeError, "#{config_dir} exists but is not a directory"
+
+      end
 
       unless File.exist?(config_dir)
         FileUtils.mkdir_p(config_dir)
         Doing.logger.log_now(:warn, "Config directory created at #{config_dir}")
       end
 
-      # File.join(config_dir, 'config.yml')
       File.join(config_dir, 'config.yml')
     end
 
@@ -130,10 +134,13 @@ module Doing
     ## @return     [String] file path
     ##
     def choose_config
+      return @config_file if @force_answer
+
       if @additional_configs.count.positive?
-        choices = [@config_file]
-        choices.concat(@additional_configs)
-        res = Doing::Prompt.choose_from(choices.uniq.sort.reverse, sorted: false, prompt: 'Local configs found, select which to update > ')
+        choices = [@config_file].concat(@additional_configs)
+        res = Doing::Prompt.choose_from(choices.uniq.sort.reverse,
+                                        sorted: false,
+                                        prompt: 'Local configs found, select which to update > ')
 
         raise UserCancelled, 'Cancelled' unless res
 
@@ -153,7 +160,7 @@ module Doing
     ##                      matched, first match wins)
     ## @return     [Array] ordered array of resolved keys
     ##
-    def resolve_key_path(keypath)
+    def resolve_key_path(keypath, create: false)
       cfg = @settings
       real_path = []
       unless keypath =~ /^[.*]?$/
@@ -170,8 +177,18 @@ module Doing
           end
 
           if new_cfg.nil?
-            Doing.logger.error("Key match not found: #{path}")
-            break
+            return nil unless create
+
+            resolved = real_path.count.positive? ? "Resolved #{real_path.join('->')}, but " : ''
+            Doing.logger.log_now(:warn, "#{resolved}#{path} is unknown")
+            new_path = [*real_path, path, *paths].join('->')
+            Doing.logger.log_now(:warn, "Continuing will create the path #{new_path}")
+            res = Prompt.yn('Key path not found, create it?', default_response: true)
+            raise InvalidArgument, 'Invalid key path' unless res
+
+            real_path.push(path).concat(paths)
+            Doing.logger.debug('Config:', "translated key path #{keypath} to #{real_path.join('.')}")
+            return real_path
           end
           cfg = new_cfg
         end
@@ -194,7 +211,7 @@ module Doing
       cfg = @settings
       real_path = ['config']
       unless keypath =~ /^[.*]?$/
-        real_path = resolve_key_path(keypath)
+        real_path = resolve_key_path(keypath, create: false)
         return nil unless real_path&.count&.positive?
 
         cfg = cfg.dig(*real_path)

data/lib/doing/item.rb

@@ -31,6 +31,13 @@ module Doing
     #   @date = new_date.is_a?(Time) ? new_date : Time.parse(new_date)
     # end
 
+    ## If the entry doesn't have a @done date, return the elapsed time
+    def duration
+      return nil if @title =~ /(?<=^| )@done\b/
+
+      return Time.now - @date
+    end
+
     ##
     ## Get the difference between the item's start date and
     ## the value of its @done tag (if present)
@@ -109,7 +116,7 @@ module Doing
     ## Add (or remove) tags from the title of the item
     ##
     ## @param      tags    [Array] The tags to apply
-    ## @param      **options Additional options
+    ## @param      options Additional options
     ##
     ## @option options :date       [Boolean] Include timestamp?
     ## @option options :single     [Boolean] Log as a single change?
@@ -165,6 +172,13 @@ module Doing
     ## @return     [Boolean] true if tag/bool combination passes
     ##
     def tags?(tags, bool = :and, negate: false)
+      if bool == :pattern
+        tags = tags.join(' ') if tags.is_a?(Array)
+        matches = tag_pattern?(tags.gsub(/ *, */, ' '))
+
+        return negate ? !matches : matches
+      end
+
       tags = split_tags(tags)
       bool = bool.normalize_bool
 
@@ -179,6 +193,10 @@ module Doing
       negate ? !matches : matches
     end
 
+    def ignore_case(search, case_type)
+      (case_type == :smart && search !~ /[A-Z]/) || case_type == :ignore
+    end
+
     ##
     ## Test if item matches search string
     ##
@@ -190,9 +208,25 @@ module Doing
     ##
     ## @return     [Boolean] matches search criteria
     ##
-    def search(search, distance: 3, negate: false, case_type: :smart, fuzzy: false)
-      text = @title + @note.to_s
-      matches = text =~ search.to_rx(distance: distance, case_type: case_type)
+    def search(search, distance: 3, negate: false, case_type: :smart)
+      if search.is_rx?
+        matches = @title + @note.to_s =~ search.to_rx(distance: distance, case_type: case_type)
+      else
+        query = to_phrase_query(search.strip)
+
+        if query[:must].nil? && query[:must_not].nil?
+          query[:must] = query[:should]
+          query[:should] = []
+        end
+        matches = no_searches?(query[:must_not], case_type: case_type)
+        matches &&= all_searches?(query[:must], case_type: case_type)
+        matches &&= any_searches?(query[:should], case_type: case_type)
+      end
+      # if search =~ /(?<=\A| )[+-]\S/
+      # else
+      #   text = @title + @note.to_s
+      #   matches = text =~ search.to_rx(distance: distance, case_type: case_type)
+      # end
 
       # if search.is_rx? || !fuzzy
       #   matches = text =~ search.to_rx(distance: distance, case_type: case_type)
@@ -279,33 +313,92 @@ module Doing
       start = @date
 
       t = (done - start).to_i
-      t > 0 ? t : nil
+      t.positive? ? t : nil
+    end
+
+    def all_searches?(searches, case_type: :smart)
+      return true if searches.nil? || searches.empty?
+
+      text = @title + @note.to_s
+      searches.each do |s|
+        rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
+        return false unless text =~ rx
+      end
+      true
+    end
+
+    def no_searches?(searches, case_type: :smart)
+      return true if searches.nil? || searches.empty?
+
+      text = @title + @note.to_s
+      searches.each do |s|
+        rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
+        return false if text =~ rx
+      end
+      true
+    end
+
+    def any_searches?(searches, case_type: :smart)
+      return true if searches.nil? || searches.empty?
+
+      text = @title + @note.to_s
+      searches.each do |s|
+        rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
+        return true if text =~ rx
+      end
+      false
     end
 
     def all_tags?(tags)
+      return true if tags.nil? || tags.empty?
+
       tags.each do |tag|
-        return false unless @title =~ /@#{tag}/
+        return false unless @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       true
     end
 
     def no_tags?(tags)
+      return true if tags.nil? || tags.empty?
+
       tags.each do |tag|
-        return false if @title =~ /@#{tag}/
+        return false if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       true
     end
 
     def any_tags?(tags)
+      return true if tags.nil? || tags.empty?
+
       tags.each do |tag|
-        return true if @title =~ /@#{tag}/
+        return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       false
     end
 
+    def to_query(query)
+      parser = BooleanTermParser::QueryParser.new
+      transformer = BooleanTermParser::QueryTransformer.new
+      parse_tree = parser.parse(query)
+      transformer.apply(parse_tree).to_elasticsearch
+    end
+
+    def to_phrase_query(query)
+      parser = PhraseParser::QueryParser.new
+      transformer = PhraseParser::QueryTransformer.new
+      parse_tree = parser.parse(query)
+      transformer.apply(parse_tree).to_elasticsearch
+    end
+
+    def tag_pattern?(tags)
+      query = to_query(tags)
+
+      no_tags?(query[:must_not]) && all_tags?(query[:must]) && any_tags?(query[:should])
+    end
+
     def split_tags(tags)
       tags = tags.split(/ *, */) if tags.is_a? String
-      tags.map { |t| t.strip.sub(/^@/, '') }
+      tags.map { |t| t.strip.add_at }
     end
   end
 end

data/lib/doing/items.rb

@@ -105,6 +105,12 @@ module Doing
       new_item
     end
 
+    def all_tags
+      each_with_object([]) do |entry, tags|
+        tags.concat(entry.tags).sort!.uniq!
+      end
+    end
+
     # Output sections and items in Doing file format
     def to_s
       out = []

data/lib/doing/phrase_parser.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'parslet'
+
+module PhraseParser
+  # This parser adds quoted phrases (using matched double quotes) in addition to
+  # 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
+    rule(:term) { match('[^\s"]').repeat(1).as(:term) }
+    rule(:quote) { str('"') }
+    rule(:operator) { (str('+') | str('-')).as(:operator) }
+    rule(:phrase) do
+      (quote >> (term >> space.maybe).repeat >> quote).as(:phrase)
+    end
+    rule(:clause) { (operator.maybe >> (phrase | term)).as(:clause) }
+    rule(:space)  { match('\s').repeat(1) }
+    rule(:query) { (clause >> space.maybe).repeat.as(:query) }
+    root(:query)
+  end
+
+  class QueryTransformer < Parslet::Transform
+    rule(:clause => subtree(:clause)) do
+      if clause[:term]
+        TermClause.new(clause[:operator]&.to_s, clause[:term].to_s)
+      elsif clause[:phrase]
+        phrase = clause[:phrase].map { |p| p[:term].to_s }.join(' ')
+        PhraseClause.new(clause[:operator]&.to_s, phrase)
+      else
+        raise "Unexpected clause type: '#{clause}'"
+      end
+    end
+    rule(query: sequence(:clauses)) { Query.new(clauses) }
+  end
+
+  class Operator
+    def self.symbol(str)
+      case str
+      when '+'
+        :must
+      when '-'
+        :must_not
+      when nil
+        :should
+      else
+        raise "Unknown operator: #{str}"
+      end
+    end
+  end
+
+  class TermClause
+    attr_accessor :operator, :term
+
+    def initialize(operator, term)
+      self.operator = Operator.symbol(operator)
+      self.term = term
+    end
+  end
+
+  # Phrase
+  class PhraseClause
+    attr_accessor :operator, :phrase
+
+    def initialize(operator, phrase)
+      self.operator = Operator.symbol(operator)
+      self.phrase = phrase
+    end
+  end
+
+  ## Query object
+  class Query
+    attr_accessor :should_clauses, :must_not_clauses, :must_clauses
+
+    def initialize(clauses)
+      grouped = clauses.chunk(&:operator).to_h
+      self.should_clauses = grouped.fetch(:should, [])
+      self.must_not_clauses = grouped.fetch(:must_not, [])
+      self.must_clauses = grouped.fetch(:must, [])
+    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
+      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)
+      case clause
+      when TermClause
+        match(clause.term)
+      when PhraseClause
+        match_phrase(clause.phrase)
+      else
+        raise "Unknown clause type: #{clause}"
+      end
+    end
+
+    def match(term)
+      term
+    end
+
+    def match_phrase(phrase)
+      phrase
+    end
+  end
+end