redi_search 2.0.2 → 5.0.0

data/lib/redi_search/schema/geo_field.rb

@@ -20,7 +20,7 @@ module RediSearch
 
       private
 
-      attr_reader :name, :sortable, :no_index
+      attr_reader :sortable, :no_index
 
       def boolean_options
         %i(sortable no_index)

data/lib/redi_search/schema/numeric_field.rb

@@ -20,7 +20,7 @@ module RediSearch
 
       private
 
-      attr_reader :name, :sortable, :no_index
+      attr_reader :sortable, :no_index
 
       def boolean_options
         %i(sortable no_index)

data/lib/redi_search/schema/tag_field.rb

@@ -20,9 +20,13 @@ module RediSearch
         query
       end
 
+      def serialize(value)
+        value.join(separator)
+      end
+
       private
 
-      attr_reader :name, :separator, :sortable, :no_index
+      attr_reader :separator, :sortable, :no_index
 
       def boolean_options
         %i(sortable no_index)

data/lib/redi_search/schema/text_field.rb

@@ -24,7 +24,7 @@ module RediSearch
 
       private
 
-      attr_reader :name, :weight, :phonetic, :sortable, :no_index, :no_stem
+      attr_reader :weight, :phonetic, :sortable, :no_index, :no_stem
 
       def boolean_options
         %i(sortable no_index no_stem)

data/lib/redi_search/schema.rb

@@ -12,7 +12,7 @@ module RediSearch
       schema, options = options.to_a.flatten
 
       Object.const_get("RediSearch::Schema::#{schema.to_s.capitalize}Field").
-        new(field_name, **options.to_h).to_a
+        new(field_name, **options.to_h)
     end
 
     def initialize(raw)
@@ -20,17 +20,22 @@ module RediSearch
     end
 
     def to_a
-      raw.map do |field_name, options|
-        self.class.make_field(field_name, options)
-      end.flatten
+      fields.map(&:to_a).flatten
+    end
+
+    def [](field)
+      fields.group_by(&:name)[field]&.first
     end
 
     def fields
-      raw.keys
+      @fields ||= raw.map do |field_name, options|
+        self.class.make_field(field_name, options)
+      end.flatten
     end
 
     def add_field(field_name, options)
       raw[field_name] = options
+      @fields = nil
       self
     end
 

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, **term_options)
                   end
         end
 
@@ -65,10 +65,10 @@ module RediSearch
         end
 
         def queryify_search
-          if !term.term_clause.is_a?(RediSearch::Search::Clauses::Where)
-            "(#{term.term_clause})"
-          else
+          if term.term_clause.is_a?(RediSearch::Search::Clauses::Where)
             term.term_clause
+          else
+            "(#{term.term_clause})"
           end
         end
       end

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

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

data/lib/redi_search/search/result.rb

@@ -26,11 +26,11 @@ module RediSearch
         results
       end
 
-      #:nocov:
+      # :nocov:
       def pretty_print(printer)
         printer.pp(results)
       end
-      #:nocov:
+      # :nocov:
 
       private
 

data/lib/redi_search/search.rb

@@ -54,7 +54,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

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

data/lib/redi_search/version.rb

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

data/redi_search.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = "redi_search"
   spec.version       = RediSearch::VERSION
   spec.authors       = "Nick Pezza"
-  spec.email         = "npezza93@gmail.com"
+  spec.email         = "pezza@hey.com"
 
   spec.summary       = %q(RediSearch ruby wrapper that can integrate with Rails)
   spec.homepage      = "https://github.com/npezza93/redi_search"
@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.metadata["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.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 7.1"
   spec.add_runtime_dependency "redis", ">= 4.0", "< 5.0"
 
   spec.add_development_dependency "bundler", ">= 1.17", "< 3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Nick Pezza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2021-09-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.1'
+        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.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -98,8 +98,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
-email: npezza93@gmail.com
+description:
+email: pezza@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -121,10 +121,10 @@ files:
 - bin/publish
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/activerecord_51.gemfile
-- gemfiles/activerecord_52.gemfile
+- gemfiles/activerecord_60.gemfile
+- gemfiles/activerecord_61.gemfile
+- gemfiles/activerecord_70.gemfile
 - lib/redi_search.rb
-- lib/redi_search/add.rb
 - lib/redi_search/add_field.rb
 - lib/redi_search/client.rb
 - lib/redi_search/client/response.rb
@@ -133,6 +133,7 @@ files:
 - lib/redi_search/document.rb
 - lib/redi_search/document/display.rb
 - lib/redi_search/document/finder.rb
+- lib/redi_search/hset.rb
 - lib/redi_search/index.rb
 - lib/redi_search/lazily_load.rb
 - lib/redi_search/log_subscriber.rb
@@ -179,7 +180,7 @@ metadata:
   homepage_uri: https://github.com/npezza93/redi_search
   source_code_uri: https://github.com/npezza93/redi_search
   changelog_uri: https://github.com/npezza93/redi_search/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,15 +188,15 @@ 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.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails
 test_files: []

data/lib/redi_search/add.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require "redi_search/validatable"
-
-module RediSearch
-  class Add
-    include Validatable
-
-    validates_numericality_of :score, within: 0.0..1.0
-
-    def initialize(index, document, score: 1.0, replace: {}, language: nil,
-                   no_save: false)
-      @index = index
-      @document = document
-      @score = score || 1.0
-      @replace = replace
-      @language = language
-      @no_save = no_save
-    end
-
-    def call!
-      validate!
-
-      RediSearch.client.call!(*command).ok?
-    end
-
-    def call
-      call!
-    rescue Redis::CommandError
-      false
-    end
-
-    private
-
-    attr_reader :index, :document, :score, :replace, :language, :no_save
-
-    def command
-      ["ADD", index.name, document.document_id, score, *extract_options,
-       "FIELDS", document.redis_attributes].compact
-    end
-
-    def extract_options
-      opts = []
-      opts << ["LANGUAGE", language] if language
-      opts << "NOSAVE" if no_save
-      opts << replace_options if replace?
-      opts
-    end
-
-    def replace?
-      if replace.respond_to?(:empty?)
-        !replace.empty?
-      else
-        replace
-      end
-    end
-
-    def replace_options
-      ["REPLACE"].tap do |replace_option|
-        if replace.is_a?(Hash)
-          replace_option << "PARTIAL" if replace[:partial]
-          # replace_option << "NOCREATE" if replace[:no_create]
-        end
-      end
-    end
-  end
-end