redi_search 6.3.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d005b7e0b289004277bf5526a4270aa7dd707df16520ae0e2b9df577b12601c2
-  data.tar.gz: 9b3954997aa84e9e25037c6b332c00139d7d112dad9fffbbe32281f9da0fdfe1
+  metadata.gz: faa46eaff63a1c9a9f0cdc17773a40130973dd995155239ce2c9c6e87c6418e4
+  data.tar.gz: ff20e1f29a52ed43cf820f1fe9d95268ccae19f414861ad8082c6fadbd9382db
 SHA512:
-  metadata.gz: dfcbe3552fef2dcb9abda2ad3e51c2bf35a2d2a16a631f249d1f1a89e5ed3aab5f0815387ab5a472f13db9c1d8a430f114840e81147e2b44160b1890be0f6c94
-  data.tar.gz: 3e2c1b66bb0053f42d886ab765468a213ab576b31d7d95a08f8bd216dcb8a933abbd76670207b2c9b366e988622a0aa1ece981901bb368916087c85a75b0726f
+  metadata.gz: '0293276b8df50570c9181419e8e91c6c710b5fdf4ec24ce64f218d5c3fdd47934c7a6885783096962ee459cd9c5a831bd1b81e1d88ba01bed58a2288d0155713'
+  data.tar.gz: 51859dbf694e71bab98895e4ff8400a76312e6c2e647f7fa0cef74cf87dde90d0974e943296531c6de44b4ce658114f2fd83b6e4fc48c55147b50563f6e52688

data/.github/workflows/lint.yml

@@ -10,11 +10,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 3.1
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.2
     - name: Install rubocop
       run: |
         gem install rubocop rubocop-performance rubocop-minitest rubocop-rake

data/.github/workflows/tests.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        gemfile: [ 'Gemfile', 'gemfiles/activerecord_60.gemfile', 'gemfiles/activerecord_61.gemfile', 'gemfiles/activerecord_70.gemfile'  ]
+        ruby: [ '3.0', '3.1', '3.2' ]
+        gemfile: [ 'Gemfile', 'gemfiles/activerecord_61.gemfile', 'gemfiles/activerecord_70.gemfile', 'gemfiles/activerecord_71.gemfile'  ]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
@@ -38,11 +38,11 @@ jobs:
         ports:
           - 6379:6379
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 3.1
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.2
     - name: Install dependencies
       run: |
         sudo apt-get install libsqlite3-dev -y

data/.rubocop.yml

@@ -13,7 +13,7 @@ AllCops:
     - test/dummy/db/schema.rb
     - gemfiles/**/*
     - bin/**/*
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
 # Department Bundler
 Bundler/DuplicatedGem:

data/.ruby-version

@@ -1 +1 @@
-3.2.0-preview3
+3.2.2

data/Appraisals

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-appraise "activerecord-60" do
-  gem "activerecord", "< 6.1", ">= 6.0"
-end
-
 appraise "activerecord-61" do
   gem "activerecord", "< 6.2", ">= 6.1"
 end
 
 appraise "activerecord-70" do
-  gem "activerecord", "~> 7.0.0.alpha1"
+  gem "activerecord", "~> 7.0.0"
+end
+
+appraise "activerecord-70" do
+  gem "activerecord", "~> 7.1.0"
 end

data/Gemfile

@@ -7,9 +7,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem "appraisal", "~> 2.2"
+gem "bundler", ">= 1.17", "< 3"
 gem "debug"
 gem "faker"
+gem "minitest", "~> 5.0"
 gem "mocha"
+gem "rake", "~> 13.0"
 gem "rubocop"
 gem "rubocop-minitest"
 gem "rubocop-performance"
@@ -17,4 +20,4 @@ gem "rubocop-rake"
 gem "simplecov"
 gem "sqlite3"
 
-gem "activerecord", "~> 7.0"
+gem "activerecord", "~> 7.1"

data/gemfiles/{activerecord_60.gemfile → activerecord_71.gemfile}

@@ -11,6 +11,6 @@ gem "rubocop-minitest"
 gem "rubocop-performance"
 gem "simplecov"
 gem "sqlite3"
-gem "activerecord", "< 6.1", ">= 6.0"
+gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"

data/lib/redi_search/aggregate/clauses/apply.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class Apply < ApplicationClause
+        clause_term :expression, presence: true
+        clause_term :as, presence: true
+        clause_order 5
+
+        def initialize(expression:, as:)
+          @expression = expression
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          ["APPLY", expression, "AS", as]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/clauses/filter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class Filter < ApplicationClause
+        clause_term :expression, presence: true
+        clause_order 6
+
+        def initialize(expression:)
+          @expression = expression
+        end
+
+        def clause
+          validate!
+
+          ["FILTER", expression]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/clauses/group_by.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class GroupBy < ApplicationClause
+        clause_term :fields, presence: true
+        clause_order 3
+
+        def initialize(fields:)
+          @fields = fields.map(&:to_s).map do |field|
+            field.prepend("@") unless field.start_with?("@")
+          end
+          @reducer = nil
+        end
+
+        def clause
+          validate!
+
+          ["GROUPBY", fields.count, *fields, *reducer&.clause].compact
+        end
+
+        def count(as: nil)
+          self.reducer = Reducers::Count.new(as: as).tap(&:validate!)
+        end
+
+        def distinct_count(property:, as: nil)
+          self.reducer = Reducers::DistinctCount.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def distinctish_count(property:, as: nil)
+          self.reducer = Reducers::DistinctishCount.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def sum(property:, as: nil)
+          self.reducer = Reducers::Sum.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def min(property:, as: nil)
+          self.reducer = Reducers::Min.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def max(property:, as: nil)
+          self.reducer = Reducers::Max.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def average(property:, as: nil)
+          self.reducer = Reducers::Average.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def stdev(property:, as: nil)
+          self.reducer = Reducers::Stdev.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        def quantile(property:, quantile:, as: nil)
+          self.reducer = Reducers::Quantile.new(
+            property: property, quantile: quantile, as: as
+          ).tap(&:validate!)
+        end
+
+        def to_list(property:, as: nil)
+          self.reducer = Reducers::ToList.
+                         new(property: property, as: as).tap(&:validate!)
+        end
+
+        private
+
+        attr_accessor :reducer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class Limit < ApplicationClause
+        clause_term :total, presence: true, numericality: {
+          within: 0..Float::INFINITY, only_integer: true
+        }
+        clause_term :offset, presence: true, numericality: {
+          within: 0..Float::INFINITY, only_integer: true
+        }
+        clause_order 7
+
+        def initialize(total:, offset: 0)
+          @total = total
+          @offset = offset
+        end
+
+        def clause
+          validate!
+
+          ["LIMIT", offset, total]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/clauses/load.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class Load < ApplicationClause
+        clause_term :fields, presence: true
+        clause_order 2
+
+        def initialize(fields:)
+          @fields = fields
+        end
+
+        def clause
+          validate!
+
+          ["LOAD", fields.size, *fields]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class SortBy < ApplicationClause
+        class Sortable < ApplicationClause
+          clause_term :field, presence: true
+          clause_term :order, presence: true,
+                              inclusion: { within: %i(asc desc) }
+
+          def initialize(field, order = :asc)
+            @field = field.to_s
+            @field.prepend("@") unless @field.start_with?("@")
+            @order = order.to_sym
+          end
+
+          def clause
+            [field, order.to_s.upcase]
+          end
+        end
+
+        clause_term :fields, presence: true
+        clause_order 4
+
+        def initialize(fields:)
+          @fields = fields.flat_map do |field|
+            if field.is_a?(Hash) then field.map { |k, v| Sortable.new(k, v) }
+            else
+              Sortable.new(field)
+            end
+          end
+        end
+
+        def clause
+          validate! && fields.each(&:validate!)
+
+          ["SORTBY", fields.count * 2, *fields.flat_map(&:clause)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Clauses
+      class Verbatim < ApplicationClause
+        clause_order 1
+
+        def clause
+          validate!
+
+          ["VERBATIM"]
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/average.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Average < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "AVG", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/count.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Count < ApplicationClause
+        clause_term :as
+
+        def initialize(as:)
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "COUNT", 0]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/distinct_count.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class DistinctCount < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "COUNT_DISTINCT", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/distinctish_count.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class DistinctishCount < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "COUNT_DISTINCTISH", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/max.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Max < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "MAX", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/min.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Min < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "MIN", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/quantile.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Quantile < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :quantile, presence: true, inclusion: {
+          within: 0.0..1.0
+        }
+        clause_term :as
+
+        def initialize(property:, quantile:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @quantile = quantile
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "QUANTILE", 2, property, quantile]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/stdev.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Stdev < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "STDEV", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/sum.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class Sum < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "SUM", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end

data/lib/redi_search/aggregate/reducers/to_list.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Aggregate
+    module Reducers
+      class ToList < ApplicationClause
+        clause_term :property, presence: true
+        clause_term :as
+
+        def initialize(property:, as:)
+          @property = property.to_s
+          @property.prepend("@") unless @property.start_with?("@")
+          @as = as
+        end
+
+        def clause
+          validate!
+
+          command =  ["REDUCE", "TOLIST", 1, property]
+          command += ["AS", as] if as
+          command
+        end
+      end
+    end
+  end
+end