redi_search 1.0.5 → 2.0.0

data/Rakefile

@@ -1,12 +1,24 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
+require "rubocop/rake_task"
 require "rake/testtask"
 
-Rake::TestTask.new(:test) do |t|
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ["--display-cop-names"]
+end
+
+Rake::TestTask.new("test:unit") do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/unit/**/*_test.rb"]
+end
+
+Rake::TestTask.new("test:integration") do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList["test/integration/**/*_test.rb"]
 end
 
-task default: :test
+task test: [:default]
+task default: ["test:integration", "test:unit", :rubocop]

data/bin/console

@@ -4,5 +4,41 @@
 require "bundler/setup"
 require "redi_search"
 
+require "faker"
 require "pry"
+require "active_support/logger"
+require "active_record"
+
+ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT)
+
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+ActiveRecord::Migration.create_table :users do |t|
+  t.string :first
+  t.string :last
+end
+
+class User < ActiveRecord::Base
+  redi_search schema: {
+    first: { text: { phonetic: "dm:en" } },
+    last: { text: { phonetic: "dm:en" } }
+  }
+end
+
+def seed_users(count = 10_000)
+  User.insert_all(
+    Array.new(count).map do
+      { first: Faker::Name.first_name, last: Faker::Name.last_name }
+    end
+  )
+  User.reindex
+end
+
+def reload!
+  Object.send :remove_const, :RediSearch
+  files = $LOADED_FEATURES.select { |feat| feat =~ /\/redi_search\// }
+  files.each { |file| load file }
+  true
+end
+
 Pry.start

data/gemfiles/{rails_6.gemfile → activerecord_51.gemfile}

@@ -2,16 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "faker"
-gem "minitest", "~> 5.0"
 gem "mocha"
 gem "pry"
-gem "pry-rails"
 gem "rubocop"
 gem "rubocop-performance"
-gem "rubocop-rails"
 gem "simplecov"
 gem "sqlite3"
-gem "rails", "6.0.0.rc1"
+gem "activerecord", "< 5.2", ">= 5.1"
 
 gemspec path: "../"

data/gemfiles/{rails_51.gemfile → activerecord_52.gemfile}

@@ -2,16 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "faker"
-gem "minitest", "~> 5.0"
 gem "mocha"
 gem "pry"
-gem "pry-rails"
 gem "rubocop"
 gem "rubocop-performance"
-gem "rubocop-rails"
 gem "simplecov"
 gem "sqlite3"
-gem "rails", "< 5.2", ">= 5.1"
+gem "activerecord", "< 6.0", ">= 5.2"
 
 gemspec path: "../"

data/lib/redi_search.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require "redis"
-require "active_support"
-require "active_model"
-require "active_support/core_ext/object/blank"
+require "active_support/lazy_load_hooks"
 
 require "redi_search/configuration"
+require "redi_search/client"
 
 require "redi_search/model"
 require "redi_search/index"
@@ -14,8 +13,6 @@ require "redi_search/document"
 
 module RediSearch
   class << self
-    extend Forwardable
-
     attr_writer :configuration
 
     def configuration
@@ -30,10 +27,12 @@ module RediSearch
       yield(configuration)
     end
 
-    def_delegator :configuration, :client
+    def client
+      @client ||= Client.new(Redis.new(configuration.redis_config.to_h))
+    end
 
     def env
-      @env ||= ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+      ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
     end
   end
 end

data/lib/redi_search/add.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
+require "redi_search/validatable"
+
 module RediSearch
   class Add
-    include ActiveModel::Validations
+    include Validatable
 
-    validates :score, numericality: {
-      greater_than_or_equal_to: 0.0, less_than_or_equal_to: 1.0
-    }
+    validates_numericality_of :score, within: 0.0..1.0
 
     def initialize(index, document, score: 1.0, replace: {}, language: nil,
                    no_save: false)
@@ -48,7 +48,11 @@ module RediSearch
     end
 
     def replace?
-      replace.present?
+      if replace.respond_to?(:empty?)
+        !replace.empty?
+      else
+        replace
+      end
     end
 
     def replace_options

data/lib/redi_search/{alter.rb → add_field.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RediSearch
-  class Alter
+  class AddField
     def initialize(index, field_name, schema)
       @index = index
       @field_name = field_name
@@ -9,17 +9,25 @@ module RediSearch
     end
 
     def call!
-      index.schema.alter(field_name, raw_schema)
+      index.schema.add_field(field_name, raw_schema)
 
-      RediSearch.client.call!(
-        "ALTER", index.name, "SCHEMA", "ADD", *field_schema
-      ).ok?
+      RediSearch.client.call!(*command).ok?
+    end
+
+    def call
+      call!
+    rescue Redis::CommandError
+      false
     end
 
     private
 
     attr_reader :index, :field_name, :raw_schema
 
+    def command
+      ["ALTER", index.name, "SCHEMA", "ADD", *field_schema]
+    end
+
     def field_schema
       @field_schema ||= Schema.make_field(field_name, raw_schema)
     end

data/lib/redi_search/client.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require "redis"
+require "active_support/notifications"
+
 require "redi_search/client/response"
 
 module RediSearch
   class Client
-    def initialize(redis_config)
-      @redis = Redis.new(redis_config)
+    def initialize(redis = Redis.new)
+      @redis = redis
     end
 
     def call!(command, *params)
@@ -15,8 +17,8 @@ module RediSearch
       end
     end
 
-    def pipelined
-      Response.new(redis.pipelined do
+    def multi
+      Response.new(redis.multi do
         instrument("pipeline", query: ["begin pipeline"])
         yield
         instrument("pipeline", query: ["finish pipeline"])
@@ -33,8 +35,8 @@ module RediSearch
 
     def instrument(action, payload, &block)
       ActiveSupport::Notifications.instrument(
-        "#{action}.redi_search",
-        { name: "RediSearch" }.merge(payload),
+        "action.redi_search",
+        { name: "RediSearch", action: action }.merge(payload),
         &Proc.new(&(block || proc {}))
       )
     end

data/lib/redi_search/client/response.rb

@@ -12,6 +12,10 @@ module RediSearch
         end
       end
 
+      def nil?
+        response.nil?
+      end
+
       private
 
       def array_ok?

data/lib/redi_search/configuration.rb

@@ -1,17 +1,7 @@
 # frozen_string_literal: true
 
-require "redi_search/client"
-
 module RediSearch
   class Configuration
-    attr_writer :redis_config
-
-    def client
-      @client ||= Client.new(redis_config)
-    end
-
-    def redis_config
-      @redis_config ||= { host: "127.0.0.1", port: "6379" }
-    end
+    attr_accessor :redis_config
   end
 end

data/lib/redi_search/create.rb

@@ -17,9 +17,7 @@ module RediSearch
     end
 
     def call!
-      RediSearch.client.call!(
-        "CREATE", index.name, *extract_options.compact, "SCHEMA", schema.to_a
-      ).ok?
+      RediSearch.client.call!(*command).ok?
     end
 
     def call
@@ -32,12 +30,16 @@ module RediSearch
 
     attr_reader :index, :schema, :options
 
+    def command
+      ["CREATE", index.name, *extract_options.compact, "SCHEMA", schema.to_a]
+    end
+
     def extract_options
       options.map do |clause, switch|
         next unless OPTION_MAPPER.key?(clause.to_sym) && switch
 
         OPTION_MAPPER[clause.to_sym]
-      end << temporary_option
+      end + temporary_option
     end
 
     def temporary_option

data/lib/redi_search/document.rb

@@ -12,7 +12,7 @@ module RediSearch
         object_to_serialize = serializer&.new(record) || record
 
         field_values = index.schema.fields.map do |field|
-          next if only.present? && !only.include?(field.to_sym)
+          next unless only.empty? || only.include?(field.to_sym)
 
           [field.to_s, object_to_serialize.public_send(field)]
         end.compact.to_h
@@ -41,7 +41,8 @@ module RediSearch
     end
 
     def del(delete_document: false)
-      call!("DEL", index.name, document_id, ("DD" if delete_document)).ok?
+      command = ["DEL", index.name, document_id, ("DD" if delete_document)]
+      call!(*command.compact).ok?
     end
 
     def schema_fields
@@ -61,7 +62,7 @@ module RediSearch
     end
 
     def document_id_without_index
-      if @document_id.to_s.starts_with? index.name
+      if @document_id.to_s.start_with? index.name
         @document_id.gsub(index.name, "")
       else
         @document_id
@@ -78,7 +79,7 @@ module RediSearch
 
     def load_attributes
       attributes.each do |field, value|
-        next unless schema_fields.include? field
+        next unless schema_fields.include? field.to_s
 
         instance_variable_set(:"@#{field}", value)
         define_singleton_method(field) { value }

data/lib/redi_search/document/display.rb

@@ -3,7 +3,6 @@
 module RediSearch
   class Document
     module Display
-      #:nocov:
       def inspect
         inspection = pretty_print_attributes.map do |field_name|
           "#{field_name}: #{public_send(field_name)}"
@@ -12,6 +11,15 @@ module RediSearch
         "#<#{self.class} #{inspection}>"
       end
 
+      def pretty_print_attributes
+        pp_attrs = attributes.keys.dup
+        pp_attrs.push("document_id")
+        pp_attrs.push("score") if score
+
+        pp_attrs.compact
+      end
+
+      #:nocov:
       def pretty_print(printer) # rubocop:disable Metrics/MethodLength
         printer.object_address_group(self) do
           printer.seplist(
@@ -27,14 +35,6 @@ module RediSearch
           end
         end
       end
-
-      def pretty_print_attributes
-        pp_attrs = attributes.keys.dup
-        pp_attrs.push("document_id")
-        pp_attrs.push("score") if score.present?
-
-        pp_attrs.compact
-      end
       #:nocov:
     end
   end

data/lib/redi_search/document/finder.rb

@@ -5,7 +5,7 @@ module RediSearch
     class Finder
       def initialize(index, *document_ids)
         @index = index
-        @document_ids = Array.wrap(document_ids)
+        @document_ids = [*document_ids]
       end
 
       def find
@@ -61,10 +61,18 @@ module RediSearch
       end
 
       def parse_document(document_id, document_response)
-        return if document_response.blank?
+        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
+      end
     end
   end
 end

data/lib/redi_search/index.rb

@@ -5,14 +5,14 @@ require "redi_search/create"
 require "redi_search/schema"
 require "redi_search/search"
 require "redi_search/spellcheck"
-require "redi_search/alter"
+require "redi_search/add_field"
 
 module RediSearch
   class Index
     attr_reader :name, :schema, :model
 
     def initialize(name, schema, model = nil)
-      @name = name
+      @name = name.to_s
       @schema = Schema.new(schema)
       @model = model
     end
@@ -51,10 +51,10 @@ module RediSearch
       Add.new(self, document, **options).call!
     end
 
-    def add_multiple!(documents, **options)
-      client.pipelined do
+    def add_multiple(documents, **options)
+      client.multi do
         documents.each do |document|
-          add!(document, **options)
+          add(document, **options)
         end
       end.ok?
     end
@@ -85,15 +85,15 @@ module RediSearch
       drop if recreate
       create unless exist?
 
-      add_multiple! documents, **options
+      add_multiple documents, **options
     end
 
     def document_count
-      info["num_docs"].to_i
+      info.num_docs.to_i
     end
 
-    def alter(field_name, schema)
-      Alter.new(self, field_name, schema).call!
+    def add_field(field_name, schema)
+      AddField.new(self, field_name, schema).call!
     end
 
     private