redi_search 6.0.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44546188ac7648ecd413eea9c79c93fc76c23009476f585a2bf600e2da4afe3b
-  data.tar.gz: eb8b6db657a5f671a8d0da0f69653d97301f8c2d116cfc9427b5105133312495
+  metadata.gz: 779fa58ead3f1109819deb5b8884eb9bbcfccbd34017a8288450f19077abdac6
+  data.tar.gz: caad3d0dec14dfea3ad2098d406a90c1c3f2afa99c416379726f4361f41c7eb2
 SHA512:
-  metadata.gz: adda3ec25f90ea2a4b372549c1d1903a48774b890c9fd589e43ef87c7bccb11f19282f0e5b34df46026c7fffd4e3826ec4d6ef9d1a0216100846f5ece6f1bab7
-  data.tar.gz: a1dc85af4e881b0ad63ae54f4b36cbaead28f2558fdf48674d82ef996bd7bc4482f417c92df920ca4480a20ad05fc190c14300c45467b35c91db23b296fa6d0e
+  metadata.gz: 778f9c57db20bde51dc953baa1c73deb54f2fe4c7783c017e3f5c76ab1c9b467bc10359ae1614e0fab512acfb170e3f3565edb600b87d580a6e7d82c766875b9
+  data.tar.gz: 850c1f47ffadcadb6fd98de2fc7a550d1d770179c14e99ffd1fa81e6a9147c6dcbc632f6e798c53437d4997b381dbc273263000b33472a4dd89991d4dccf1433

data/.github/workflows/tests.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        redisearch: [ '2.0.14', '2.2.7' ]
+        redisearch: [ '2.4.7' ]
     services:
       redisearch:
         image: redislabs/redisearch:${{ matrix.redisearch }}

data/.rubocop.yml

@@ -619,10 +619,6 @@ Lint/BinaryOperatorWithIdenticalOperands:
   Description: Checks for comparison of something with itself.
   Enabled: true
 
-Lint/UselessElseWithoutRescue:
-  Description: Checks for useless `else` in `begin..end` without `rescue`.
-  Enabled: true
-
 Lint/ReturnInVoidContext:
   Description: Checks for return in void context.
   Enabled: true

data/Gemfile

@@ -17,4 +17,4 @@ gem "rubocop-rake"
 gem "simplecov"
 gem "sqlite3"
 
-gem "activerecord", "~> 6.1"
+gem "activerecord", "~> 7.0"

data/README.md

@@ -6,9 +6,6 @@
 
 # RediSearch
 
-![Build Status](https://github.com/npezza93/redi_search/workflows/tests/badge.svg)
-[![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
 Redis.
 

data/lib/redi_search/lazily_load.rb

@@ -53,7 +53,7 @@ module RediSearch
 
       @loaded = true
 
-      call!.yield_self do |response|
+      call!.then do |response|
         parse_response(response)
       end
     end

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

@@ -43,8 +43,8 @@ module RediSearch
         search_index.spellcheck(term, distance: distance)
       end
 
-      def reindex(recreate: false, only: [])
-        search_import.find_in_batches.all? do |group|
+      def reindex(recreate: false, only: [], batch_size: 1000)
+        search_import.find_in_batches(batch_size: batch_size).all? do |group|
           search_index.reindex(
             group.map { |record| record.search_document(only: only) },
             recreate: recreate

data/lib/redi_search/schema/field.rb

@@ -11,6 +11,10 @@ module RediSearch
         value
       end
 
+      def cast(value)
+        value
+      end
+
       def serialize(record)
         if value_block
           record.instance_exec(&value_block)
@@ -19,10 +23,6 @@ module RediSearch
         end
       end
 
-      def tag?
-        false
-      end
-
       private
 
       attr_reader :value_block

data/lib/redi_search/schema/numeric_field.rb

@@ -17,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

@@ -24,8 +24,8 @@ module RediSearch
         value.join(separator)
       end
 
-      def tag?
-        true
+      def cast(value)
+        value.split(separator)
       end
 
       private

data/lib/redi_search/schema.rb

@@ -40,7 +40,7 @@ module RediSearch
     end
 
     def [](name)
-      fields.find { |field| field.name == name }
+      fields.find { |field| field.name.to_sym == name.to_sym }
     end
 
     private

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

@@ -20,7 +20,7 @@ module RediSearch
 
       def to_s
         if term.is_a?(Range) then stringify_range
-        elsif !field.nil? && field.tag? then stringify_tag
+        elsif field.is_a?(Schema::TagField) then stringify_tag
         else
           stringify_query
         end
@@ -53,18 +53,14 @@ module RediSearch
       def stringify_query
         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
-        if term.is_a?(Array)
-          "{ #{term.join(' | ')} }"
-        else
-          "{ #{term} }"
-        end
+        "{ #{Array(term).join(' | ')} }"
       end
 
       def stringify_range

data/lib/redi_search/spellcheck.rb

@@ -31,7 +31,7 @@ module RediSearch
 
       @loaded = true
 
-      RediSearch.client.call!(*command).yield_self do |response|
+      RediSearch.client.call!(*command).then do |response|
         parse_response(response)
       end
     end

data/lib/redi_search/version.rb

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

data/lib/redi_search.rb

@@ -30,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails