redi_search 5.0.0 → 6.1.0

data/lib/redi_search/log_subscriber.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require "active_support/version"
 require "active_support/log_subscriber"
+if ActiveSupport::VERSION::MAJOR > 6
+  require "active_support/isolated_execution_state"
+end
 
 module RediSearch
   class LogSubscriber < ActiveSupport::LogSubscriber

data/lib/redi_search/model.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/index"
-
 module RediSearch
   module Model
     def self.included(base)
@@ -9,18 +7,16 @@ module RediSearch
     end
 
     module ClassMethods
-      attr_reader :redi_search_index, :redi_search_serializer
+      attr_reader :search_index
 
       # rubocop:disable Metrics/MethodLength
-      def redi_search(schema:, **options)
-        @redi_search_index = Index.new(
-          [options[:index_prefix],
-           model_name.plural, RediSearch.env].compact.join("_"),
-          schema,
-          self
+      def redi_search(**options, &schema)
+        @search_index = Index.new(
+          [options[:index_prefix], model_name.plural, RediSearch.env].
+            compact.join("_"),
+          self, &schema
         )
-        @redi_search_serializer = options[:serializer]
-        register_redi_search_commit_hooks
+        register_search_commit_hooks
 
         scope :search_import, -> { all }
 
@@ -31,27 +27,26 @@ module RediSearch
 
       private
 
-      def register_redi_search_commit_hooks
-        after_commit(:redi_search_add_document, on: %i(create update)) if
-          respond_to?(:after_commit)
-        after_destroy_commit(:redi_search_delete_document) if
+      def register_search_commit_hooks
+        after_save_commit(:add_to_index) if respond_to?(:after_save_commit)
+        after_destroy_commit(:remove_from_index) if
           respond_to?(:after_destroy_commit)
       end
     end
 
     module ModelClassMethods
       def search(term = nil, **term_options)
-        redi_search_index.search(term, **term_options)
+        search_index.search(term, **term_options)
       end
 
       def spellcheck(term, distance: 1)
-        redi_search_index.spellcheck(term, distance: distance)
+        search_index.spellcheck(term, distance: distance)
       end
 
-      def reindex(recreate: false, only: [])
-        search_import.find_in_batches.all? do |group|
-          redi_search_index.reindex(
-            group.map { |record| record.redi_search_document(only: only) },
+      def reindex(recreate: false, only: [], batch_size: 1000)
+        search_import.find_in_batches(batch_size:).all? do |group|
+          search_index.reindex(
+            group.map { |record| record.search_document(only: only) },
             recreate: recreate
           )
         end
@@ -59,19 +54,16 @@ module RediSearch
     end
 
     module InstanceMethods
-      def redi_search_document(only: [])
-        Document.for_object(
-          self.class.redi_search_index, self,
-          only: only, serializer: self.class.redi_search_serializer
-        )
+      def search_document(only: [])
+        Document.for_object(self.class.search_index, self, only: only)
       end
 
-      def redi_search_delete_document
-        self.class.redi_search_index.del(redi_search_document)
+      def remove_from_index
+        self.class.search_index.del(search_document)
       end
 
-      def redi_search_add_document
-        self.class.redi_search_index.add(redi_search_document)
+      def add_to_index
+        self.class.search_index.add(search_document)
       end
     end
   end

data/lib/redi_search/schema/field.rb

@@ -7,12 +7,26 @@ module RediSearch
         @name&.to_sym
       end
 
-      def serialize(value)
+      def coerce(value)
         value
       end
 
+      def cast(value)
+        value
+      end
+
+      def serialize(record)
+        if value_block
+          record.instance_exec(&value_block)
+        else
+          record.public_send(name)
+        end
+      end
+
       private
 
+      attr_reader :value_block
+
       FALSES = [
         nil, "", false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"
       ].freeze

data/lib/redi_search/schema/geo_field.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require "redi_search/schema/field"
-
 module RediSearch
   class Schema
     class GeoField < Field
-      def initialize(name, sortable: false, no_index: false)
-        @name = name
-        @sortable = sortable
-        @no_index = no_index
+      def initialize(name, sortable: false, no_index: false, &block)
+        @name        = name
+        @sortable    = sortable
+        @no_index    = no_index
+        @value_block = block
       end
 
       def to_a

data/lib/redi_search/schema/numeric_field.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require "redi_search/schema/field"
-
 module RediSearch
   class Schema
     class NumericField < Field
-      def initialize(name, sortable: false, no_index: false)
-        @name = name
-        @sortable = sortable
-        @no_index = no_index
+      def initialize(name, sortable: false, no_index: false, &block)
+        @name        = name
+        @sortable    = sortable
+        @no_index    = no_index
+        @value_block = block
       end
 
       def to_a
@@ -18,6 +17,14 @@ module RediSearch
         query
       end
 
+      def cast(value)
+        if value.to_s.include?(".")
+          value.to_f
+        else
+          value.to_i
+        end
+      end
+
       private
 
       attr_reader :sortable, :no_index

data/lib/redi_search/schema/tag_field.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require "redi_search/schema/field"
-
 module RediSearch
   class Schema
     class TagField < Field
-      def initialize(name, separator: ",", sortable: false, no_index: false)
-        @name = name
-        @separator = separator
-        @sortable = sortable
-        @no_index = no_index
+      def initialize(name, separator: ",", sortable: false, no_index: false,
+                     &block)
+        @name        = name
+        @separator   = separator
+        @sortable    = sortable
+        @no_index    = no_index
+        @value_block = block
       end
 
       def to_a
@@ -20,10 +20,14 @@ module RediSearch
         query
       end
 
-      def serialize(value)
+      def coerce(value)
         value.join(separator)
       end
 
+      def cast(value)
+        value.split(separator)
+      end
+
       private
 
       attr_reader :separator, :sortable, :no_index

data/lib/redi_search/schema/text_field.rb

@@ -4,13 +4,14 @@ module RediSearch
   class Schema
     class TextField < Field
       def initialize(name, weight: 1.0, phonetic: nil, sortable: false,
-                     no_index: false, no_stem: false)
+                     no_index: false, no_stem: false, &block)
         @name = name
-        @weight = weight
-        @phonetic = phonetic
-        @sortable = sortable
-        @no_index = no_index
-        @no_stem = no_stem
+        @value_block = block
+
+        { weight: weight, phonetic: phonetic, sortable: sortable,
+          no_index: no_index, no_stem: no_stem }.each do |attr, value|
+            instance_variable_set("@#{attr}", value)
+          end
       end
 
       def to_a

data/lib/redi_search/schema.rb

@@ -1,46 +1,54 @@
 # frozen_string_literal: true
 
-require "redi_search/schema/geo_field"
-require "redi_search/schema/numeric_field"
-require "redi_search/schema/tag_field"
-require "redi_search/schema/text_field"
-
 module RediSearch
   class Schema
-    def self.make_field(field_name, options)
-      options = [options] if options.is_a? Symbol
-      schema, options = options.to_a.flatten
+    attr_reader :fields
+
+    def initialize(&block)
+      @fields = []
 
-      Object.const_get("RediSearch::Schema::#{schema.to_s.capitalize}Field").
-        new(field_name, **options.to_h)
+      instance_exec(&block)
     end
 
-    def initialize(raw)
-      @raw = raw
+    def text_field(name, **options, &block)
+      self[name] || push(Schema::TextField.new(name, **options, &block))
     end
 
-    def to_a
-      fields.map(&:to_a).flatten
+    def numeric_field(name, **options, &block)
+      self[name] || push(Schema::NumericField.new(name, **options, &block))
+    end
+
+    def tag_field(name, **options, &block)
+      self[name] || push(Schema::TagField.new(name, **options, &block))
     end
 
-    def [](field)
-      fields.group_by(&:name)[field]&.first
+    def geo_field(name, **options, &block)
+      self[name] || push(Schema::GeoField.new(name, **options, &block))
     end
 
-    def fields
-      @fields ||= raw.map do |field_name, options|
-        self.class.make_field(field_name, options)
-      end.flatten
+    def add_field(name, type, **options, &block)
+      case type
+      when :text then method(:text_field)
+      when :numeric then method(:numeric_field)
+      when :tag then method(:tag_field)
+      when :geo then method(:geo_field)
+      end.call(name, **options, &block)
     end
 
-    def add_field(field_name, options)
-      raw[field_name] = options
-      @fields = nil
-      self
+    def to_a
+      fields.map(&:to_a).flatten
+    end
+
+    def [](name)
+      fields.find { |field| field.name.to_sym == name.to_sym }
     end
 
     private
 
-    attr_accessor :raw
+    def push(field)
+      @fields.push(field)
+
+      field
+    end
   end
 end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/boolean"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/validatable"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -48,7 +48,7 @@ module RediSearch
           @term = if term.is_a? RediSearch::Search
                     term
                   else
-                    Term.new(term, **term_options)
+                    Term.new(term, nil, **term_options)
                   end
         end
 

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/boolean"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

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

@@ -62,7 +62,7 @@ module RediSearch
           if condition[1].is_a? RediSearch::Search
             condition[1]
           else
-            Term.new(condition[1], **options.to_h)
+            Term.new(condition[1], search.index.schema[@field], **options.to_h)
           end
         end
 

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/clauses/application_clause"
-
 module RediSearch
   class Search
     module Clauses

data/lib/redi_search/search/clauses.rb

@@ -1,21 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/search/term"
-require "redi_search/search/clauses/slop"
-require "redi_search/search/clauses/in_order"
-require "redi_search/search/clauses/language"
-require "redi_search/search/clauses/sort_by"
-require "redi_search/search/clauses/limit"
-require "redi_search/search/clauses/no_content"
-require "redi_search/search/clauses/verbatim"
-require "redi_search/search/clauses/no_stop_words"
-require "redi_search/search/clauses/return"
-require "redi_search/search/clauses/with_scores"
-require "redi_search/search/clauses/highlight"
-require "redi_search/search/clauses/and"
-require "redi_search/search/clauses/or"
-require "redi_search/search/clauses/where"
-
 module RediSearch
   class Search
     module Clauses

data/lib/redi_search/search/result.rb

@@ -21,6 +21,8 @@ module RediSearch
       end
 
       def_delegators :results, :each, :empty?, :[], :last
+      def_delegator :search, :index
+      def_delegator :index, :schema
 
       def inspect
         results
@@ -58,9 +60,17 @@ module RediSearch
           fields = slice.last unless no_content?
           score = slice[1].to_f if with_scores?
 
-          Document.new(search.index, document_id, Hash[*fields.to_a], score)
+          parse_result(document_id, fields, score)
         end
       end
+
+      def parse_result(document_id, fields, score)
+        field_values = fields.to_a.each_slice(2).to_h do |name, value|
+          [name, schema[name].cast(value)]
+        end
+
+        Document.new(search.index, document_id, field_values, score)
+      end
     end
   end
 end

data/lib/redi_search/search/term.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/validatable"
-
 module RediSearch
   class Search
     class Term
@@ -12,16 +10,17 @@ module RediSearch
       validates_inclusion_of :option, within: %i(fuzziness optional prefix),
                                       allow_nil: true
 
-      def initialize(term, **options)
-        @term = term
+      def initialize(term, field = nil, **options)
+        @term    = term
+        @field   = field
         @options = options
 
         validate!
       end
 
       def to_s
-        if @term.is_a? Range
-          stringify_range
+        if term.is_a?(Range) then stringify_range
+        elsif field.is_a?(Schema::TagField) then stringify_tag
         else
           stringify_query
         end
@@ -29,7 +28,7 @@ module RediSearch
 
       private
 
-      attr_accessor :term, :options
+      attr_accessor :term, :field, :options
 
       def fuzziness
         @fuzziness ||= options[:fuzziness]
@@ -52,16 +51,20 @@ module RediSearch
       end
 
       def stringify_query
-        @term.to_s.
+        term.to_s.
           tr("`", "\`").
-          yield_self { |str| "#{fuzzy_operator}#{str}#{fuzzy_operator}" }.
-          yield_self { |str| "#{optional_operator}#{str}" }.
-          yield_self { |str| "#{str}#{prefix_operator}" }.
-          yield_self { |str| "`#{str}`" }
+          then { |str| "#{fuzzy_operator}#{str}#{fuzzy_operator}" }.
+          then { |str| "#{optional_operator}#{str}" }.
+          then { |str| "#{str}#{prefix_operator}" }.
+          then { |str| "`#{str}`" }
+      end
+
+      def stringify_tag
+        "{ #{Array(term).join(' | ')} }"
       end
 
       def stringify_range
-        first, last = @term.first, @term.last
+        first, last = term.first, term.last
         first = "-inf" if first == -Float::INFINITY
         last = "+inf" if last == Float::INFINITY
 

data/lib/redi_search/search.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/lazily_load"
-
-require "redi_search/search/clauses"
-require "redi_search/search/term"
-require "redi_search/search/result"
-
 module RediSearch
   class Search
     extend Forwardable

data/lib/redi_search/spellcheck.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/lazily_load"
-require "redi_search/spellcheck/result"
-require "redi_search/validatable"
-
 module RediSearch
   class Spellcheck
     include LazilyLoad
@@ -35,15 +31,15 @@ module RediSearch
 
       @loaded = true
 
-      RediSearch.client.call!(*command).yield_self do |response|
+      RediSearch.client.call!(*command).then do |response|
         parse_response(response)
       end
     end
 
     def parse_response(response)
-      suggestions = response.map do |suggestion|
+      suggestions = response.to_h do |suggestion|
         suggestion[1..2]
-      end.to_h
+      end
 
       @documents = parsed_terms.map do |term|
         Result.new(term, suggestions[term] || [])

data/lib/redi_search/validatable.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/validations/inclusion"
-require "redi_search/validations/presence"
-require "redi_search/validations/numericality"
-
 module RediSearch
   class ValidationError < StandardError
   end

data/lib/redi_search/validations/numericality.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "redi_search/validations/inclusion"
-
 module RediSearch
   module Validations
     class Numericality

data/lib/redi_search/version.rb

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