redi_search 4.1.0 → 6.0.1

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
@@ -54,7 +48,7 @@ module RediSearch
     end
 
     def parse_response(response)
-      @documents = Result.new(self, response[0], response[1..-1])
+      @documents = Result.new(self, response[0], response[1..])
     end
 
     def valid?

data/lib/redi_search/spellcheck/result.rb

@@ -15,14 +15,14 @@ module RediSearch
       end
 
       def inspect
-        inspection = %w(term suggestions).map do |field_name|
+        inspection = %w(term suggestions).filter_map do |field_name|
           "#{field_name}: #{public_send(field_name)}"
-        end.compact.join(", ")
+        end.join(", ")
 
         "#<#{self.class} #{inspection}>"
       end
 
-      #:nocov:
+      # :nocov:
       def pretty_print(printer) # rubocop:disable Metrics/MethodLength
         printer.object_address_group(self) do
           printer.seplist(
@@ -38,7 +38,7 @@ module RediSearch
           end
         end
       end
-      #:nocov:
+      # :nocov:
     end
   end
 end

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
@@ -27,7 +23,7 @@ module RediSearch
     end
 
     def parsed_terms
-      terms.split(Regexp.union(",.<>{}[]\"':;!@#$%^&*()-+=~\s".split("")))
+      terms.split(Regexp.union(",.<>{}[]\"':;!@#$%^&*()-+=~\s".chars))
     end
 
     def execute
@@ -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 = "4.1.0"
+  VERSION = "6.0.1"
 end

data/lib/redi_search.rb

@@ -4,14 +4,10 @@ require "delegate"
 require "forwardable"
 require "redis"
 require "active_support/lazy_load_hooks"
+require "zeitwerk"
 
-require "redi_search/configuration"
-require "redi_search/client"
-
-require "redi_search/model"
-require "redi_search/index"
-require "redi_search/log_subscriber"
-require "redi_search/document"
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 module RediSearch
   class << self
@@ -34,7 +30,7 @@ module RediSearch
     end
 
     def env
-      ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+      ENV.fetch("RAILS_ENV") { ENV.fetch("RACK_ENV", "development") }
     end
   end
 end

data/redi_search.gemspec

@@ -18,16 +18,19 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
   end
 
-  spec.metadata["github_repo"] = "ssh://github.com/npezza93/redi_search"
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] =
-    "https://github.com/npezza93/redi_search/releases"
+  spec.metadata = {
+    "rubygems_mfa_required" => "true",
+    "github_repo" => "ssh://github.com/npezza93/redi_search",
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => spec.homepage,
+    "changelog_uri" => "https://github.com/npezza93/redi_search/releases",
+  }
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.2"
+  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 7.1"
   spec.add_runtime_dependency "redis", ">= 4.0", "< 5.0"
+  spec.add_runtime_dependency "zeitwerk"
 
   spec.add_development_dependency "bundler", ">= 1.17", "< 3"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2022-05-15 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: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/activerecord_60.gemfile
 - gemfiles/activerecord_61.gemfile
+- gemfiles/activerecord_70.gemfile
 - lib/redi_search.rb
 - lib/redi_search/add_field.rb
 - lib/redi_search/client.rb
@@ -175,6 +190,7 @@ homepage: https://github.com/npezza93/redi_search
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   github_repo: ssh://github.com/npezza93/redi_search
   homepage_uri: https://github.com/npezza93/redi_search
   source_code_uri: https://github.com/npezza93/redi_search
@@ -187,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.8
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails