redi_search 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7bc12a1d3a50de259ae10c27658e164d3ef84b65f0c4108c925138e53c1239
-  data.tar.gz: 899ac067a70ee3f5d43c833a59aa32546ca4e18a57beaba3bccabc496ffff96a
+  metadata.gz: d3903d2f2ac5a8e6e8c82a507fbef8cad83d11b28a8e68dca6441844dc0b89cd
+  data.tar.gz: 6357b63845acdaea9df5d441154f77a3d5e353b2fed2c5e4cbbe58a5a6ad5071
 SHA512:
-  metadata.gz: 131f1b1c9a4e2dad0740da6398a41a5ea01725e6e7dc02b9d604b252d3ad2612d3d23946fa1029e2d897c879b9b8c1c2951a73b1d7e4bca415d65998c0d8d0b8
-  data.tar.gz: c1a6d747b27f77054c797feee442359306a36609fe1d8d8483467df93916ea4b2e7af7a1db5c3bd442aba04e54dad0131ac673dc6aa10ddba89b63ef48dbad37
+  metadata.gz: 94dc557ed0ee0ce1868ef92401928e68442eae74990595bfa26a26de4358f57526a8ef012203b67eae3ddbc6d576a2816b9715f41d140789d8fa3eed6ad09832
+  data.tar.gz: ae05dd2140a22dc5a73e9d90014eb580c0b3bc2276dc515d176efb767cb267a5ffa113cbabbf01fb1b7281e506dbf7798d26f9cbdad167b26afe550e608ecd8d

data/.github/workflows/lint.yml

@@ -1,20 +1,18 @@
 name: lint
 
-on: [push]
+on: [push,pull_request]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.x
-    - name: Install dependencies
+        ruby-version: 2.7
+    - name: Install rubocop
       run: |
-        sudo apt-get install libsqlite3-dev
-        gem install bundler --no-document
-        bundle install
-    - name: Run tests
-      run: bundle exec rubocop --config=./.rubocop.yml --parallel
+        gem install rubocop rubocop-performance rubocop-minitest
+    - name: Lint
+      run: rubocop --config=./.rubocop.yml --parallel

data/.github/workflows/tests.yml

@@ -1,20 +1,21 @@
 name: tests
 
-on: [push]
+on: [push,pull_request]
 
 jobs:
   unit:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5.x', '2.6.x', '2.7.x' ]
-        gemfile: [ 'Gemfile', 'gemfiles/activerecord_51.gemfile', 'gemfiles/activerecord_52.gemfile' ]
+        ruby: [ '2.5', '2.6', '2.7' ]
+        gemfile: [ 'Gemfile', 'gemfiles/activerecord_51.gemfile', 'gemfiles/activerecord_52.gemfile', 'gemfiles/activerecord_61.gemfile' ]
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: false
     - name: Install dependencies
       run: |
         sudo apt-get install libsqlite3-dev -y
@@ -24,21 +25,21 @@ jobs:
       run: BUNDLE_GEMFILE=${{ matrix.gemfile }} bundle exec rake test:unit
   integration:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        redi_search: [ '1.4.28', '1.6.13', 'edge' ]
+    services:
+      redisearch:
+        image: redislabs/redisearch:2.0.2
+        ports:
+          - 6379:6379
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.x
+        ruby-version: 2.7
     - name: Install dependencies
       run: |
         sudo apt-get install libsqlite3-dev -y
-        gem install bundler --no-document
         bundle install
-        docker run -d -p 6379:6379 redislabs/redisearch:${{ matrix.redi_search }} --protected-mode no --loadmodule /usr/lib/redis/modules/redisearch.so
     - name: Run tests
       run: |
         bundle exec rake test:integration

data/.rubocop.yml

@@ -1,6 +1,8 @@
 require:
+  - rubocop-minitest
   - rubocop-performance
 AllCops:
+  NewCops: enable
   Exclude:
     - vendor/**/*
     - Gemfile.lock
@@ -9,6 +11,7 @@ AllCops:
     - tmp/**/*
     - test/dummy/db/schema.rb
     - gemfiles/**/*
+    - bin/**/*
   TargetRubyVersion: 2.5
 
 # Department Bundler
@@ -611,7 +614,7 @@ Lint/UselessAssignment:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars
   Enabled: true
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Description: Checks for comparison of something with itself.
   Enabled: true
 
@@ -1197,9 +1200,6 @@ Style/MethodDefParentheses:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#method-parens
   Enabled: true
 
-Style/MethodMissingSuper:
-  Enabled: true
-
 Style/MissingRespondToMissing:
   Enabled: true
 
@@ -1630,5 +1630,70 @@ Style/RedundantRegexpCharacterClass:
   Enabled: true
 Style/RedundantRegexpEscape:
   Enabled: true
+Lint/MissingSuper:
+  Enabled: false
+
+
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+Lint/DuplicateRescueException:
+  Enabled: true
+Lint/EmptyConditionalBody:
+  Enabled: true
+Lint/FloatComparison:
+  Enabled: true
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+Lint/SelfAssignment:
+  Enabled: true
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+Lint/UnreachableLoop:
+  Enabled: true
+Style/AccessorGrouping:
+  Enabled: true
+Style/ArrayCoercion:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/CaseLikeIf:
+  Enabled: true
+Style/ExplicitBlockArgument:
+  Enabled: false
+Style/GlobalStdStream:
+  Enabled: true
+Style/HashAsLastArrayItem:
+  Enabled: false
+Style/HashLikeCase:
+  Enabled: true
+Style/OptionalBooleanParameter:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
 Style/RedundantFetchBlock:
   Enabled: true
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+Style/SingleArgumentDig:
+  Enabled: true
+Style/StringConcatenation:
+  Enabled: true
+Performance/AncestorsInclude:
+  Enabled: true
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true
+Minitest/AssertionInLifecycleHook:
+  Enabled: false

data/Appraisals

@@ -7,3 +7,7 @@ end
 appraise "activerecord-51" do
   gem "activerecord", "< 5.2", ">= 5.1"
 end
+
+appraise "activerecord-61" do
+  gem "activerecord", "6.1.0.rc1"
+end

data/Gemfile

@@ -11,6 +11,7 @@ gem "faker"
 gem "mocha"
 gem "pry"
 gem "rubocop"
+gem "rubocop-minitest"
 gem "rubocop-performance"
 gem "simplecov"
 gem "sqlite3"

data/README.md

@@ -7,7 +7,6 @@
 # RediSearch
 
 ![Build Status](https://github.com/npezza93/redi_search/workflows/tests/badge.svg)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/c6437acac5684de2549d/test_coverage)](https://codeclimate.com/github/npezza93/redi_search/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/c6437acac5684de2549d/maintainability)](https://codeclimate.com/github/npezza93/redi_search/maintainability)
 
 A simple, but powerful, Ruby wrapper around RediSearch, a search engine on top of
@@ -244,13 +243,11 @@ With no options: `{ place: :geo }`
 
 ## Document
 
-A `Document` is the Ruby representation of a RediSearch document.
+A `Document` is the Ruby representation of a Redis hash.
 
-You can fetch a `Document` using `.get` or `.mget` class methods.
+You can fetch a `Document` using `.get` class methods.
 - `get(index, document_id)` fetches a single `Document` in an `Index` for a
 given `document_id`.
-- `mget(index, *document_ids)` fetches a collection of `Document`s
-in an `Index` for the given `document_ids`.
 
 You can also make a `Document` instance using the
 `.for_object(index, record, serializer: nil, only: [])` class method. It takes
@@ -269,10 +266,7 @@ to override each other. There is also a `#document_id_without_index` method
 which removes the prepended index name.
 
 Finally there is a `#del` method that will remove the `Document` from the
-`Index`. It optionally accepts a `delete_document` named argument that signifies
-whether the `Document` should be completely removed from the Redis instance vs
-just the `Index`.
-
+`Index`.
 
 ## Index
 
@@ -314,42 +308,32 @@ RediSearch::Index.new(name_of_index, schema)
         - If set, we avoid saving the term frequencies in the index. This saves
           memory but does not allow sorting based on the frequencies of a given
           term within the document.
-- `drop`
+- `drop(keep_docs: false)`
   - Drops the `Index` from the Redis instance, returns a boolean. Has an
     accompanying bang method that will raise an exception upon failure. Will
-    return `false` if the `Index` has already been dropped.
+    return `false` if the `Index` has already been dropped. Takes an option
+    keyword arg, `keep_docs`, that will by default remove all the document
+    hashes in Redis.
 - `exist?`
   - Returns a boolean signifying `Index` existence.
 - `info`
   - Returns a struct object with all the information about the `Index`.
 - `fields`
   - Returns an array of the field names in the `Index`.
-- `add(document, score: 1.0, replace: {}, language: nil, no_save: false)`
-  - Takes a `Document` object and options. Has an
+- `add(document)`
+  - Takes a `Document` object. Has an
     accompanying bang method that will raise an exception upon failure.
-    - `score` -> The `Document`'s rank, a value between 0.0 and 1.0
-    - `language` -> Use a stemmer for the supplied language during indexing.
-    - `no_save` -> Don't save the actual `Document` in the database and only index it.
-    - `replace` -> Accepts a boolean or a hash. If a truthy value is passed, we
-      will do an UPSERT style insertion - and delete an older version of the
-      `Document` if it exists.
-    - `replace: { partial: true }` -> Allows you to not have to specify all
-      fields for reindexing. Fields not given to the command will be loaded from
-      the current version of the `Document`.
-- `add_multiple(documents, score: 1.0, replace: {}, language: nil, no_save: false)`
+- `add_multiple(documents)`
   - Takes an array of `Document` objects. This provides a more performant way to
     add multiple documents to the `Index`. Accepts the same options as `add`.
-- `del(document, delete_document: false)`
-  - Removes a `Document` from the `Index`. `delete_document` signifies whether the
-    `Document` should be completely removed from the Redis instance vs just the
-    `Index`.
+- `del(document)`
+  - Removes a `Document` from the `Index`.
 - `document_count`
   - Returns the number of `Document`s in the `Index`
 - `add_field(field_name, schema)`
   - Adds a new field to the `Index`. Ex: `index.add_field(:first_name, text: { phonetic: "dm:en" })`
-- `reindex(documents, recreate: false, **options)`
+- `reindex(documents, recreate: false)`
    - If `recreate` is `true` the `Index` will be dropped and recreated
-   - `options` accepts the same options as `add`
 
 
 ## Searching
@@ -521,11 +505,9 @@ end
 This will automatically add `User.search` and `User.spellcheck`
 methods which behave the same as if you called them on an `Index` instance.
 
-`User.reindex(recreate: false, only: [], **options)` is also added and behaves
+`User.reindex(recreate: false, only: [])` is also added and behaves
 similarly to `RediSearch::Index#reindex`. Some of the differences include:
-  - By default, does an upsert for all `Document`s added using the
-    option `replace: { partial: true }`.
-  - `Document`s do not to be passed as the first parameter. The `search_import`
+  - `Document`s do not need to be passed as the first parameter. The `search_import`
     scope is automatically called and all the records are converted
     to `Document`s.
   - Accepts an optional `only` parameter where you can specify a limited number

data/gemfiles/activerecord_51.gemfile

@@ -2,9 +2,12 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.2"
+gem "faker"
 gem "mocha"
 gem "pry"
 gem "rubocop"
+gem "rubocop-minitest"
 gem "rubocop-performance"
 gem "simplecov"
 gem "sqlite3"

data/gemfiles/activerecord_52.gemfile

@@ -2,9 +2,12 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.2"
+gem "faker"
 gem "mocha"
 gem "pry"
 gem "rubocop"
+gem "rubocop-minitest"
 gem "rubocop-performance"
 gem "simplecov"
 gem "sqlite3"

data/gemfiles/activerecord_61.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.2"
+gem "faker"
+gem "mocha"
+gem "pry"
+gem "rubocop"
+gem "rubocop-minitest"
+gem "rubocop-performance"
+gem "simplecov"
+gem "sqlite3"
+gem "activerecord", "6.1.0.rc1"
+
+gemspec path: "../"

data/lib/redi_search/client.rb

@@ -9,10 +9,12 @@ module RediSearch
   class Client
     def initialize(redis = Redis.new)
       @redis = redis
+      @pipeline = false
     end
 
-    def call!(command, *params)
+    def call!(command, *params, skip_ft: false)
       instrument(command.downcase, query: [command, params]) do
+        command = "FT.#{command}" unless skip_ft
         send_command(command, *params)
       end
     end
@@ -20,24 +22,32 @@ module RediSearch
     def multi
       Response.new(redis.multi do
         instrument("pipeline", query: ["begin pipeline"])
-        yield
+        capture_pipeline { yield }
         instrument("pipeline", query: ["finish pipeline"])
       end)
     end
 
     private
 
-    attr_reader :redis
+    attr_reader   :redis
+    attr_accessor :pipeline
+
+    def capture_pipeline
+      self.pipeline = true
+      yield
+      self.pipeline = false
+    end
 
     def send_command(command, *params)
-      Response.new(redis.call("FT.#{command}", *params))
+      Response.new(redis.call(command, *params))
     end
 
     def instrument(action, payload, &block)
       ActiveSupport::Notifications.instrument(
         "action.redi_search",
-        { name: "RediSearch", action: action }.merge(payload),
-        &Proc.new(&(block || proc {}))
+        { name: "RediSearch", action: action, inside_pipeline: pipeline }.
+          merge(payload),
+        &Proc.new(&(block || proc {})) # rubocop:disable Lint/EmptyBlock
       )
     end
   end

data/lib/redi_search/client/response.rb

@@ -6,7 +6,7 @@ module RediSearch
       def ok?
         case response
         when String then response == "OK"
-        when Integer then response == 1
+        when Integer then response >= 1
         when Array then array_ok?
         else response
         end

data/lib/redi_search/create.rb

@@ -31,7 +31,8 @@ module RediSearch
     attr_reader :index, :schema, :options
 
     def command
-      ["CREATE", index.name, *extract_options.compact, "SCHEMA", schema.to_a]
+      ["CREATE", index.name, "ON", "HASH", "PREFIX", 1, index.name,
+       *extract_options.compact, "SCHEMA", schema.to_a]
     end
 
     def extract_options

data/lib/redi_search/document.rb

@@ -23,10 +23,6 @@ module RediSearch
       def get(index, document_id)
         Finder.new(index, document_id).find
       end
-
-      def mget(index, *document_ids)
-        Finder.new(index, *document_ids).find
-      end
     end
 
     attr_reader :attributes, :score
@@ -40,9 +36,8 @@ module RediSearch
       load_attributes
     end
 
-    def del(delete_document: false)
-      command = ["DEL", index.name, document_id, ("DD" if delete_document)]
-      call!(*command.compact).ok?
+    def del
+      RediSearch.client.call!("DEL", document_id, skip_ft: true).ok?
     end
 
     def schema_fields
@@ -73,10 +68,6 @@ module RediSearch
 
     attr_reader :index
 
-    def call!(*command)
-      RediSearch.client.call!(*command)
-    end
-
     def load_attributes
       attributes.each do |field, value|
         next unless schema_fields.include? field.to_s

data/lib/redi_search/document/finder.rb

@@ -3,75 +3,37 @@
 module RediSearch
   class Document
     class Finder
-      def initialize(index, *document_ids)
+      def initialize(index, document_id)
         @index = index
-        @document_ids = [*document_ids]
+        @document_id = document_id
       end
 
       def find
-        if multi?
-          parse_multi_documents
-        else
-          parse_document(document_ids.first, response)
-        end
+        Document.new(index, document_id, Hash[*response]) if response?
       end
 
       private
 
-      attr_reader :index, :document_ids
+      attr_reader :index, :document_id
 
       def response
-        @response ||= call!(get_command, index.name, *prepended_document_ids)
+        @response ||= call!("HGETALL", prepended_document_id)
       end
 
       def call!(*command)
-        RediSearch.client.call!(*command)
-      end
-
-      def get_command
-        if multi?
-          "MGET"
-        else
-          "GET"
-        end
-      end
-
-      def multi?
-        document_ids.size > 1
-      end
-
-      def prepended_document_ids
-        document_ids.map do |document_id|
-          prepend_document_id(document_id)
-        end
+        RediSearch.client.call!(*command, skip_ft: true)
       end
 
-      def prepend_document_id(id)
-        if id.to_s.start_with? index.name
-          id
+      def prepended_document_id
+        if document_id.to_s.start_with? index.name
+          document_id
         else
-          "#{index.name}#{id}"
+          "#{index.name}#{document_id}"
         end
       end
 
-      def parse_multi_documents
-        document_ids.map.with_index do |document_id, index|
-          parse_document(document_id, response[index])
-        end.compact
-      end
-
-      def parse_document(document_id, document_response)
-        return unless document_response?(document_response)
-
-        Document.new(index, document_id, Hash[*document_response])
-      end
-
-      def document_response?(document_response)
-        if document_response.respond_to?(:empty?)
-          !document_response.empty?
-        else
-          !document_response.nil?
-        end
+      def response?
+        !response.to_a.empty?
       end
     end
   end

data/lib/redi_search/hset.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module RediSearch
+  class Hset
+    def initialize(index, document)
+      @index = index
+      @document = document
+    end
+
+    def call!
+      RediSearch.client.call!(*command, skip_ft: true)
+    end
+
+    def call
+      call!
+    rescue Redis::CommandError
+      false
+    end
+
+    private
+
+    attr_reader :index, :document
+
+    def command
+      ["HSET", document.document_id, document.redis_attributes].compact
+    end
+  end
+end

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?
@@ -81,11 +83,11 @@ module RediSearch
       schema.fields.map(&: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

@@ -39,9 +39,9 @@ module RediSearch
     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
@@ -52,6 +52,7 @@ module RediSearch
       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(recreate: false, 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) },
-            recreate: recreate, **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/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.2"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Nick Pezza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,7 +98,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
+description:
 email: npezza93@gmail.com
 executables: []
 extensions: []
@@ -123,8 +123,8 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/activerecord_51.gemfile
 - gemfiles/activerecord_52.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
@@ -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
@@ -194,8 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+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