redi_search 2.0.0 → 4.1.0

data/lib/redi_search/index.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "redi_search/add"
+require "redi_search/hset"
 require "redi_search/create"
 require "redi_search/schema"
 require "redi_search/search"
@@ -33,34 +33,36 @@ module RediSearch
       Create.new(self, schema, options).call!
     end
 
-    def drop
-      drop!
+    def drop(keep_docs: false)
+      drop!(keep_docs: keep_docs)
     rescue Redis::CommandError
       false
     end
 
-    def drop!
-      client.call!("DROP", name).ok?
+    def drop!(keep_docs: false)
+      command = ["DROPINDEX", name]
+      command << "DD" unless keep_docs
+      client.call!(*command.compact).ok?
     end
 
-    def add(document, **options)
-      Add.new(self, document, **options).call
+    def add(document)
+      Hset.new(self, document).call
     end
 
-    def add!(document, **options)
-      Add.new(self, document, **options).call!
+    def add!(document)
+      Hset.new(self, document).call!
     end
 
-    def add_multiple(documents, **options)
+    def add_multiple(documents)
       client.multi do
         documents.each do |document|
-          add(document, **options)
+          add(document)
         end
-      end.ok?
+      end.all? { |response| response >= 0 }
     end
 
-    def del(document, delete_document: false)
-      document.del(delete_document: delete_document)
+    def del(document)
+      document.del
     end
 
     def exist?
@@ -78,14 +80,14 @@ module RediSearch
     end
 
     def fields
-      schema.fields.map(&:to_s)
+      schema.fields.map { |field| field.name.to_s }
     end
 
-    def reindex(documents, recreate: false, **options)
+    def reindex(documents, recreate: false)
       drop if recreate
       create unless exist?
 
-      add_multiple documents, **options
+      add_multiple documents
     end
 
     def document_count

data/lib/redi_search/log_subscriber.rb

@@ -35,23 +35,24 @@ module RediSearch
       color("#{event.payload[:name]} (#{event.duration.round(1)}ms)", RED, true)
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
     def action_color(action)
       case action.to_sym
       when :search, :spellcheck then YELLOW
-      when :create, :add then GREEN
-      when :drop, :del then RED
-      when :get, :mget, :info then CYAN
+      when :create, :hset then GREEN
+      when :dropindex, :del then RED
+      when :hgetall, :info then CYAN
       when :pipeline then MAGENTA
       when :explaincli then BLUE
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     def command_string(event)
       event.payload[:query].flatten.map.with_index do |arg, i|
         arg = "FT.#{arg}" if prepend_ft?(arg, i)
         arg = arg.inspect if inspect_arg?(event.payload, arg)
+        arg = "  #{arg}"  if event.payload[:inside_pipeline]
         arg
       end.join(" ")
     end
@@ -61,7 +62,7 @@ module RediSearch
     end
 
     def prepend_ft?(arg, index)
-      index.zero? && !multiword?(arg)
+      index.zero? && !multiword?(arg) && %w(HSET HGETALL DEL).exclude?(arg.to_s)
     end
 
     def inspect_arg?(payload, arg)

data/lib/redi_search/model.rb

@@ -48,11 +48,11 @@ module RediSearch
         redi_search_index.spellcheck(term, distance: distance)
       end
 
-      def reindex(only: [], **options)
+      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) },
-            **options.deep_merge(replace: { partial: true })
+            recreate: recreate
           )
         end
       end
@@ -67,17 +67,11 @@ module RediSearch
       end
 
       def redi_search_delete_document
-        return unless self.class.redi_search_index.exist?
-
-        self.class.redi_search_index.del(
-          redi_search_document, delete_document: true
-        )
+        self.class.redi_search_index.del(redi_search_document)
       end
 
       def redi_search_add_document
-        return unless self.class.redi_search_index.exist?
-
-        self.class.redi_search_index.add(redi_search_document, replace: true)
+        self.class.redi_search_index.add(redi_search_document)
       end
     end
   end

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/schema/field.rb

@@ -3,6 +3,14 @@
 module RediSearch
   class Schema
     class Field
+      def name
+        @name&.to_sym
+      end
+
+      def serialize(value)
+        value
+      end
+
       private
 
       FALSES = [
@@ -11,9 +19,8 @@ module RediSearch
 
       def boolean_options_string
         boolean_options.map do |option|
-          unless FALSES.include?(send(option))
-            option.to_s.upcase.split("_").join
-          end
+          option.to_s.upcase.split("_").join unless
+            FALSES.include?(send(option))
         end.compact
       end
     end

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/search.rb

@@ -13,6 +13,7 @@ module RediSearch
     include Clauses
 
     attr_reader :term_clause, :used_clauses, :index, :clauses
+
     def_delegator :index, :model
 
     def initialize(index, term = nil, **term_options)
@@ -26,6 +27,8 @@ module RediSearch
 
     def results
       if model
+        no_content unless loaded?
+
         model.where(id: to_a.map(&:document_id_without_index))
       else
         to_a

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RediSearch
-  VERSION = "2.0.0"
+  VERSION = "4.1.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"
@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.2"
   spec.add_runtime_dependency "redis", ">= 4.0", "< 5.0"
 
   spec.add_development_dependency "bundler", ">= 1.17", "< 3"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 12.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: 2.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Nick Pezza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2021-03-14 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: '6.2'
   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: '6.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +90,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-description: 
-email: npezza93@gmail.com
+        version: '13.0'
+description:
+email: pezza@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -107,9 +107,10 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/logo.svg"
+- ".github/workflows/lint.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -120,10 +121,9 @@ files:
 - bin/publish
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/activerecord_51.gemfile
-- gemfiles/activerecord_52.gemfile
+- gemfiles/activerecord_60.gemfile
+- gemfiles/activerecord_61.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
@@ -132,6 +132,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
@@ -178,7 +179,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
@@ -193,8 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.8
+signing_key:
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails
 test_files: []