Merge branch 'main' into change-indexes-method

Author: curquiza

.code-samples.meilisearch.yaml

@@ -381,3 +381,15 @@ reset_sortable_attributes_1: |-
   client.index('books').reset_sortable_attributes
 search_parameter_guide_sort_1: |-
   client.index('books').search('science fiction', { sort: ['price:asc'] })
+geosearch_guide_filter_settings_1: |-
+  client.index('restaurants').update_filterable_attributes(['_geo'])
+geosearch_guide_filter_usage_1: |-
+  client.index('restaurants').search('', { filter: '_geoRadius(45.4628328, 9.1076931, 2000)' })
+geosearch_guide_filter_usage_2: |-
+  client.index('restaurants').search('', { filter: '_geoRadius(45.4628328, 9.1076931, 2000) AND type = pizza' })
+geosearch_guide_sort_settings_1: |-
+  client.index('restaurants').update_sortable_attributes(['_geo'])
+geosearch_guide_sort_usage_1: |-
+  client.index('restaurants').search('', { sort: ['_geoPoint(48.8583701,2.2922926):asc'] })
+geosearch_guide_sort_usage_2: |-
+  client.index('restaurants').search('', { sort: ['_geoPoint(48.8583701,2.2922926):asc', 'rating:desc'] })

.rubocop.yml

@@ -20,9 +20,3 @@ Style/SymbolArray:
 
 Style/WordArray:
   EnforcedStyle: brackets
-
-Style/GlobalVars:
-  AllowedVariables:
-    - $URL
-    - $MASTER_KEY
-    - $DEFAULT_SEARCH_RESPONSE_KEYS

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-09-01 13:50:39 UTC using RuboCop version 1.19.1.
+# on 2021-10-12 19:14:29 UTC using RuboCop version 1.20.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,16 +14,16 @@ Gemspec/DateAssignment:
   Exclude:
     - 'meilisearch.gemspec'
 
-# Offense count: 33
+# Offense count: 35
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 497
+  Max: 500
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 226
+  Max: 256
 
 # Offense count: 1
 Naming/AccessorMethodName:

Gemfile

@@ -14,5 +14,5 @@ group :development, :test do
 end
 
 group :development do
-  gem 'rubocop', '~> 1.20.0', require: false
+  gem 'rubocop', '~> 1.22.1', require: false
 end

README.md

@@ -151,7 +151,7 @@ JSON output:
 
 ## 🤖 Compatibility with MeiliSearch
 
-This package only guarantees the compatibility with the [version v0.22.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.22.0).
+This package only guarantees the compatibility with the [version v0.23.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.23.0).
 
 ## 💡 Learn More
 

lib/meilisearch/client.rb

@@ -40,6 +40,17 @@ def delete_index(index_uid)
       index_object(index_uid).delete
     end
 
+    # Usage:
+    # client.delete_index_if_exists('indexUID')
+    def delete_index_if_exists(index_uid)
+      index_object(index_uid).delete
+      true
+    rescue ApiError => e
+      raise e if e.code != 'index_not_found'
+
+      false
+    end
+
     # Usage:
     # client.index('indexUID')
     def index(index_uid)

lib/meilisearch/index.rb

@@ -76,6 +76,40 @@ def update_documents!(documents, primary_key = nil)
     end
     alias add_or_update_documents! update_documents!
 
+    def add_documents_in_batches(documents, batch_size = 1000, primary_key = nil)
+      update_ids = []
+      documents.each_slice(batch_size) do |batch|
+        update_ids.append(add_documents(batch, primary_key))
+      end
+      update_ids
+    end
+
+    def add_documents_in_batches!(documents, batch_size = 1000, primary_key = nil)
+      update_ids = add_documents_in_batches(documents, batch_size, primary_key)
+      responses = []
+      update_ids.each do |update_object|
+        responses.append(wait_for_pending_update(update_object['updateId']))
+      end
+      responses
+    end
+
+    def update_documents_in_batches(documents, batch_size = 1000, primary_key = nil)
+      update_ids = []
+      documents.each_slice(batch_size) do |batch|
+        update_ids.append(update_documents(batch, primary_key))
+      end
+      update_ids
+    end
+
+    def update_documents_in_batches!(documents, batch_size = 1000, primary_key = nil)
+      update_ids = update_documents_in_batches(documents, batch_size, primary_key)
+      responses = []
+      update_ids.each do |update_object|
+        responses.append(wait_for_pending_update(update_object['updateId']))
+      end
+      responses
+    end
+
     def delete_documents(documents_ids)
       if documents_ids.is_a?(Array)
         http_post "/indexes/#{@uid}/documents/delete-batch", documents_ids

meilisearch.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   ]
 
   s.required_ruby_version = '>= 2.6.0'
-  s.add_dependency 'httparty', '>= 0.17.1', '< 0.20.0'
+  s.add_dependency 'httparty', '>= 0.17.1', '< 0.21.0'
 end

spec/meilisearch/client/dumps_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'MeiliSearch::Client - Dumps' do
   before(:all) do
-    @client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    @client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(@client)
   end
 

spec/meilisearch/client/health_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe 'MeiliSearch::Client - Health' do
-  let(:client)       { MeiliSearch::Client.new($URL, $MASTER_KEY) }
+  let(:client)       { MeiliSearch::Client.new(URL, MASTER_KEY) }
   let(:wrong_client) { MeiliSearch::Client.new('bad_url') }
 
   it 'is healthy when the url is valid' do