redi_search 6.2.3 → 6.3.1

data/lib/redi_search/client.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "redis"
 require "active_support/notifications"
 
 module RediSearch
@@ -18,11 +17,12 @@ module RediSearch
     end
 
     def multi
-      Response.new(redis.multi do |pipeline|
-        instrument("pipeline", query: ["begin pipeline"])
+      instrument("pipeline", query: ["begin pipeline"])
+      Response.new(redis.pipelined do |pipeline|
         capture_pipeline(pipeline) { yield }
-        instrument("pipeline", query: ["finish pipeline"])
       end)
+    ensure
+      instrument("pipeline", query: ["finish pipeline"])
     end
 
     private
@@ -33,6 +33,7 @@ module RediSearch
     def capture_pipeline(pipeline)
       self.pipeline = pipeline
       yield
+    ensure
       self.pipeline = false
     end
 

data/lib/redi_search/index.rb

@@ -14,6 +14,10 @@ module RediSearch
       Search.new(self, term, **term_options)
     end
 
+    def aggregate(term = nil, **term_options)
+      Aggregate.new(self, term, **term_options)
+    end
+
     def spellcheck(query, distance: 1)
       Spellcheck.new(self, query, distance: distance)
     end

data/lib/redi_search/log_subscriber.rb

@@ -30,19 +30,20 @@ module RediSearch
       command = command_string(event)
       debug_color = action_color(event.payload[:action])
 
-      debug "  #{log_name(event)}  #{color(command, debug_color, true)}"
+      debug "  #{log_name(event)}  #{color(command, debug_color, bold: true)}"
     end
 
     private
 
     def log_name(event)
-      color("#{event.payload[:name]} (#{event.duration.round(1)}ms)", RED, true)
+      color("#{event.payload[:name]} (#{event.duration.round(1)}ms)",
+            RED, bold: true)
     end
 
     # rubocop:disable Metrics/MethodLength
     def action_color(action)
       case action.to_sym
-      when :search, :spellcheck then YELLOW
+      when :search, :spellcheck, :aggregate then YELLOW
       when :create, :hset then GREEN
       when :dropindex, :del then RED
       when :hgetall, :info then CYAN

data/lib/redi_search/model.rb

@@ -18,7 +18,7 @@ module RediSearch
         )
         register_search_commit_hooks
 
-        scope :search_import, -> { all }
+        scope :search_import, -> { all } unless defined?(search_import)
 
         include InstanceMethods
         extend ModelClassMethods
@@ -39,6 +39,10 @@ module RediSearch
         search_index.search(term, **term_options)
       end
 
+      def aggregate(term = nil, **term_options)
+        search_index.aggregate(term, **term_options)
+      end
+
       def spellcheck(term, distance: 1)
         search_index.spellcheck(term, distance: distance)
       end

data/lib/redi_search/schema/tag_field.rb

@@ -28,6 +28,14 @@ module RediSearch
         value.split(separator)
       end
 
+      def serialize(record)
+        if value_block
+          record.instance_exec(&value_block)
+        else
+          record.public_send(name)
+        end.to_a
+      end
+
       private
 
       attr_reader :separator, :sortable, :no_index

data/lib/redi_search/search/clauses/highlight.rb

@@ -3,7 +3,9 @@
 module RediSearch
   class Search
     module Clauses
-      class Highlight
+      class Highlight < ApplicationClause
+        clause_order 12
+
         def initialize(fields: [], opening_tag: "<b>", closing_tag: "</b>")
           @fields = fields
           @opening_tag = opening_tag

data/lib/redi_search/search/clauses/in_order.rb

@@ -4,6 +4,8 @@ module RediSearch
   class Search
     module Clauses
       class InOrder < ApplicationClause
+        clause_order 15
+
         def clause
           validate!
 

data/lib/redi_search/search/clauses/language.rb

@@ -5,6 +5,7 @@ module RediSearch
     module Clauses
       class Language < ApplicationClause
         clause_term :language, presence: true
+        clause_order 16
 
         def initialize(language:)
           @language = language

data/lib/redi_search/search/clauses/limit.rb

@@ -10,6 +10,7 @@ module RediSearch
         clause_term :offset, presence: true, numericality: {
           within: 0..Float::INFINITY, only_integer: true
         }
+        clause_order 22
 
         def initialize(total:, offset: 0)
           @total = total

data/lib/redi_search/search/clauses/no_content.rb

@@ -4,6 +4,8 @@ module RediSearch
   class Search
     module Clauses
       class NoContent < ApplicationClause
+        clause_order 1
+
         def clause
           validate!
 

data/lib/redi_search/search/clauses/no_stop_words.rb

@@ -4,6 +4,8 @@ module RediSearch
   class Search
     module Clauses
       class NoStopWords < ApplicationClause
+        clause_order 3
+
         def clause
           validate!
 

data/lib/redi_search/search/clauses/return.rb

@@ -5,6 +5,7 @@ module RediSearch
     module Clauses
       class Return < ApplicationClause
         clause_term :fields, presence: true
+        clause_order 10
 
         def initialize(fields:)
           @fields = fields

data/lib/redi_search/search/clauses/slop.rb

@@ -5,6 +5,7 @@ module RediSearch
     module Clauses
       class Slop < ApplicationClause
         clause_term :slop, numericality: { within: 0..Float::INFINITY }
+        clause_order 13
 
         def initialize(slop:)
           @slop = slop

data/lib/redi_search/search/clauses/sort_by.rb

@@ -6,6 +6,7 @@ module RediSearch
       class SortBy < ApplicationClause
         clause_term :field, presence: true
         clause_term :order, presence: true, inclusion: { within: %i(asc desc) }
+        clause_order 21
 
         def initialize(field:, order: :asc)
           @field = field

data/lib/redi_search/search/clauses/timeout.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Search
+    module Clauses
+      class Timeout < ApplicationClause
+        clause_term :timeout,
+                    numericality: { within: 0..Float::INFINITY,
+                                    only_integer: true }
+        clause_order 14
+
+        def initialize(timeout:)
+          @timeout = timeout
+        end
+
+        def clause
+          validate!
+
+          ["TIMEOUT", timeout]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/search/clauses/verbatim.rb

@@ -4,6 +4,8 @@ module RediSearch
   class Search
     module Clauses
       class Verbatim < ApplicationClause
+        clause_order 2
+
         def clause
           validate!
 

data/lib/redi_search/search/clauses/with_payloads.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Search
+    module Clauses
+      class WithPayloads < ApplicationClause
+        clause_order 5
+
+        def clause
+          validate!
+
+          ["WITHPAYLOADS"]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/search/clauses/with_scores.rb

@@ -4,6 +4,8 @@ module RediSearch
   class Search
     module Clauses
       class WithScores < ApplicationClause
+        clause_order 4
+
         def clause
           validate!
 

data/lib/redi_search/search/clauses/with_sort_keys.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Search
+    module Clauses
+      class WithSortKeys < ApplicationClause
+        clause_order 6
+
+        def clause
+          validate!
+
+          ["WITHSORTKEYS"]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/search/clauses.rb

@@ -3,96 +3,77 @@
 module RediSearch
   class Search
     module Clauses
-      def highlight(fields: [], opening_tag: "<b>", closing_tag: "</b>")
-        add_to_clause(Highlight.new(
-          fields: fields, opening_tag: opening_tag, closing_tag: closing_tag
-        ))
-      end
-
-      def slop(slop)
-        add_to_clause(Slop.new(slop: slop))
-      end
-
-      def in_order
-        add_to_clause(InOrder.new)
+      def no_content
+        add_to_clauses(NoContent.new)
       end
 
       def verbatim
-        add_to_clause(Verbatim.new)
+        add_to_clauses(Verbatim.new)
       end
 
       def no_stop_words
-        add_to_clause(NoStopWords.new)
+        add_to_clauses(NoStopWords.new)
       end
 
       def with_scores
-        add_to_clause(WithScores.new)
+        add_to_clauses(WithScores.new)
       end
 
-      def no_content
-        add_to_clause(NoContent.new)
+      def with_payloads
+        add_to_clauses(WithPayloads.new)
       end
 
-      def return(*fields)
-        add_to_clause(Return.new(fields: fields))
+      def with_sort_keys
+        add_to_clauses(WithSortKeys.new)
       end
 
-      def language(language)
-        add_to_clause(Language.new(language: language))
+      def return(*fields)
+        add_to_clauses(Return.new(fields: fields))
       end
 
-      def sort_by(field, order: :asc)
-        add_to_clause(SortBy.new(field: field, order: order))
+      def highlight(fields: [], opening_tag: "<b>", closing_tag: "</b>")
+        add_to_clauses(Highlight.new(
+          fields: fields, opening_tag: opening_tag, closing_tag: closing_tag
+        ))
       end
 
-      def limit(total, offset = 0)
-        add_to_clause(Limit.new(total: total, offset: offset))
+      def slop(slop)
+        add_to_clauses(Slop.new(slop: slop))
       end
 
-      def count
-        return to_a.size if loaded?
-
-        RediSearch.client.call!(
-          "SEARCH", index.name, term_clause.to_s, *Limit.new(total: 0).clause
-        ).first
+      def timeout(timeout)
+        add_to_clauses(Timeout.new(timeout: timeout))
       end
 
-      def where(**condition)
-        @term_clause = Where.new(self, condition, @term_clause)
-
-        self
+      def in_order
+        add_to_clauses(InOrder.new)
       end
 
-      def not(**condition)
-        raise NoMethodError unless @term_clause.is_a?(Where)
-
-        @term_clause.not(condition)
+      def language(language)
+        add_to_clauses(Language.new(language: language))
       end
 
-      def and(new_term = nil, **term_options)
-        @term_clause = And.new(self, new_term, @term_clause, **term_options)
+      def sort_by(field, order: :asc)
+        add_to_clauses(SortBy.new(field: field, order: order))
+      end
 
-        if new_term.nil?
-          @term_clause
-        else
-          self
-        end
+      def limit(total, offset = 0)
+        add_to_clauses(Limit.new(total: total, offset: offset))
       end
 
-      def or(new_term = nil, **term_options)
-        @term_clause = Or.new(self, new_term, @term_clause, **term_options)
+      def count
+        return to_a.size if loaded?
 
-        if new_term.nil?
-          @term_clause
-        else
-          self
-        end
+        RediSearch.client.call!(
+          "SEARCH", index.name, query.to_s, *Limit.new(total: 0).clause
+        ).first
       end
 
       private
 
-      def add_to_clause(clause)
-        clauses.push(*clause.clause) if used_clauses.add?(clause.class)
+      def add_to_clauses(clause)
+        clause.validate! && clauses.push(clause) if
+          used_clauses.add?(clause.class)
 
         self
       end

data/lib/redi_search/search/{clauses → queries}/and.rb

@@ -2,7 +2,7 @@
 
 module RediSearch
   class Search
-    module Clauses
+    module Queries
       class And < Boolean
         private
 

data/lib/redi_search/search/{clauses → queries}/boolean.rb

@@ -2,7 +2,7 @@
 
 module RediSearch
   class Search
-    module Clauses
+    module Queries
       class Boolean
         extend Forwardable
 
@@ -65,10 +65,10 @@ module RediSearch
         end
 
         def queryify_search
-          if term.term_clause.is_a?(RediSearch::Search::Clauses::Where)
-            term.term_clause
+          if term.query.is_a?(RediSearch::Search::Queries::Where)
+            term.query
           else
-            "(#{term.term_clause})"
+            "(#{term.query})"
           end
         end
       end

data/lib/redi_search/search/{clauses → queries}/or.rb

@@ -2,7 +2,7 @@
 
 module RediSearch
   class Search
-    module Clauses
+    module Queries
       class Or < Boolean
         def where(**condition)
           @term = search.dup.where(**condition)

data/lib/redi_search/search/{clauses → queries}/where.rb

@@ -2,7 +2,7 @@
 
 module RediSearch
   class Search
-    module Clauses
+    module Queries
       class Where
         extend Forwardable
 
@@ -39,7 +39,7 @@ module RediSearch
 
         def queryify_term
           if term.is_a? RediSearch::Search
-            "(#{term.term_clause})"
+            "(#{term.query})"
           else
             term.to_s
           end

data/lib/redi_search/search/queries.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Search
+    module Queries
+      def where(**condition)
+        @query = Search::Queries::Where.new(self, condition, @query)
+
+        self
+      end
+
+      def not(**condition)
+        raise NoMethodError unless @query.is_a?(Search::Queries::Where)
+
+        @query.not(condition)
+      end
+
+      def and(new_term = nil, **term_options)
+        @query = Queries::And.new(self, new_term, @query, **term_options)
+
+        if new_term.nil?
+          @query
+        else
+          self
+        end
+      end
+
+      def or(new_term = nil, **term_options)
+        @query = Queries::Or.new(self, new_term, @query, **term_options)
+
+        if new_term.nil?
+          @query
+        else
+          self
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/search/term.rb

@@ -21,6 +21,7 @@ module RediSearch
       def to_s
         if term.is_a?(Range) then stringify_range
         elsif field.is_a?(Schema::TagField) then stringify_tag
+        elsif term.is_a?(Array) then stringify_array
         else
           stringify_query
         end
@@ -63,6 +64,10 @@ module RediSearch
         "{ #{Array(term).join(' | ')} }"
       end
 
+      def stringify_array
+        Array(term).map { |str| "`#{str}`" }.join(" | ")
+      end
+
       def stringify_range
         first, last = term.first, term.last
         first = "-inf" if first == -Float::INFINITY

data/lib/redi_search/search.rb

@@ -5,8 +5,9 @@ module RediSearch
     extend Forwardable
     include LazilyLoad
     include Clauses
+    include Queries
 
-    attr_reader :term_clause, :used_clauses, :index, :clauses
+    attr_reader :query, :used_clauses, :index, :clauses
 
     def_delegator :index, :model
 
@@ -15,8 +16,7 @@ module RediSearch
       @clauses = []
       @used_clauses = Set.new
 
-      @term_clause = term &&
-        And.new(self, term, nil, **term_options)
+      @query = term && And.new(self, term, nil, **term_options)
     end
 
     def results
@@ -31,7 +31,7 @@ module RediSearch
 
     def explain
       RediSearch.client.call!(
-        "EXPLAINCLI", index.name, term_clause.to_s
+        "EXPLAINCLI", index.name, query.to_s
       ).join(" ").strip
     end
 
@@ -44,7 +44,8 @@ module RediSearch
     attr_writer :index, :clauses
 
     def command
-      ["SEARCH", index.name, term_clause.to_s, *clauses]
+      ["SEARCH", index.name, query.to_s,
+       *clauses.sort_by(&:clause_order).flat_map(&:clause)]
     end
 
     def parse_response(response)
@@ -52,7 +53,7 @@ module RediSearch
     end
 
     def valid?
-      !term_clause.to_s.empty?
+      !query.to_s.empty?
     end
   end
 end

data/lib/redi_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RediSearch
-  VERSION = "6.2.3"
+  VERSION = "6.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.3.1
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -141,6 +141,25 @@ files:
 - gemfiles/activerecord_70.gemfile
 - lib/redi_search.rb
 - lib/redi_search/add_field.rb
+- lib/redi_search/aggregate.rb
+- lib/redi_search/aggregate/clauses/apply.rb
+- lib/redi_search/aggregate/clauses/filter.rb
+- lib/redi_search/aggregate/clauses/group_by.rb
+- lib/redi_search/aggregate/clauses/limit.rb
+- lib/redi_search/aggregate/clauses/load.rb
+- lib/redi_search/aggregate/clauses/sort_by.rb
+- lib/redi_search/aggregate/clauses/verbatim.rb
+- lib/redi_search/aggregate/reducers/average.rb
+- lib/redi_search/aggregate/reducers/count.rb
+- lib/redi_search/aggregate/reducers/distinct_count.rb
+- lib/redi_search/aggregate/reducers/distinctish_count.rb
+- lib/redi_search/aggregate/reducers/max.rb
+- lib/redi_search/aggregate/reducers/min.rb
+- lib/redi_search/aggregate/reducers/quantile.rb
+- lib/redi_search/aggregate/reducers/stdev.rb
+- lib/redi_search/aggregate/reducers/sum.rb
+- lib/redi_search/aggregate/reducers/to_list.rb
+- lib/redi_search/application_clause.rb
 - lib/redi_search/client.rb
 - lib/redi_search/client/response.rb
 - lib/redi_search/configuration.rb
@@ -161,22 +180,25 @@ files:
 - lib/redi_search/schema/text_field.rb
 - lib/redi_search/search.rb
 - lib/redi_search/search/clauses.rb
-- lib/redi_search/search/clauses/and.rb
-- lib/redi_search/search/clauses/application_clause.rb
-- lib/redi_search/search/clauses/boolean.rb
 - lib/redi_search/search/clauses/highlight.rb
 - lib/redi_search/search/clauses/in_order.rb
 - lib/redi_search/search/clauses/language.rb
 - lib/redi_search/search/clauses/limit.rb
 - lib/redi_search/search/clauses/no_content.rb
 - lib/redi_search/search/clauses/no_stop_words.rb
-- lib/redi_search/search/clauses/or.rb
 - lib/redi_search/search/clauses/return.rb
 - lib/redi_search/search/clauses/slop.rb
 - lib/redi_search/search/clauses/sort_by.rb
+- lib/redi_search/search/clauses/timeout.rb
 - lib/redi_search/search/clauses/verbatim.rb
-- lib/redi_search/search/clauses/where.rb
+- lib/redi_search/search/clauses/with_payloads.rb
 - lib/redi_search/search/clauses/with_scores.rb
+- lib/redi_search/search/clauses/with_sort_keys.rb
+- lib/redi_search/search/queries.rb
+- lib/redi_search/search/queries/and.rb
+- lib/redi_search/search/queries/boolean.rb
+- lib/redi_search/search/queries/or.rb
+- lib/redi_search/search/queries/where.rb
 - lib/redi_search/search/result.rb
 - lib/redi_search/search/term.rb
 - lib/redi_search/spellcheck.rb
@@ -211,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails