redi_search 6.3.0 → 7.0.0

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.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.3.0"
+  VERSION = "7.0.0"
 end

data/redi_search.gemspec

@@ -26,13 +26,9 @@ Gem::Specification.new do |spec|
     "changelog_uri" => "https://github.com/npezza93/redi_search/releases",
   }
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0"
 
-  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 7.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 8.0"
   spec.add_runtime_dependency "redis", ">= 4.0", "< 6.0"
   spec.add_runtime_dependency "zeitwerk"
-
-  spec.add_development_dependency "bundler", ">= 1.17", "< 3"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -64,54 +64,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 description:
 email: pezza@hey.com
 executables: []
@@ -136,11 +88,30 @@ files:
 - bin/publish
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/activerecord_60.gemfile
 - gemfiles/activerecord_61.gemfile
 - gemfiles/activerecord_70.gemfile
+- gemfiles/activerecord_71.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 +132,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
@@ -204,14 +178,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module RediSearch
-  class Search
-    module Clauses
-      class ApplicationClause
-        include Validatable
-
-        class << self
-          def clause_term(term, **validations)
-            attr_reader term
-
-            validations.each do |validation_type, options|
-              define_validation(term, validation_type, options)
-            end
-          end
-
-          private
-
-          def define_validation(term, type, options)
-            if options.is_a? Hash
-              public_send("validates_#{type}_of", term, **options)
-            else
-              public_send("validates_#{type}_of", term)
-            end
-          end
-        end
-      end
-    end
-  end
-end