meilisearch-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e05e5ed1e5210587bd2797412b0f5509b77151a620b79e4e8047c6c1722c3fb
-  data.tar.gz: cfb5a6a39cf21caa0532ae40d005a8c7fd3fff30dbbfa02c90dd1f31f63259df
+  metadata.gz: e61a10b5b9eaf11606209ff295728cdd962acdb4f21d02004d416ed7346a3212
+  data.tar.gz: bd8b788affabaa81eafbcd027e223179c356e3d21af2083f335d2def1def71af
 SHA512:
-  metadata.gz: 7a3e738a240fcbdc903d3a58acc9d5d68992a5e1adb56401fcd30a03e81c1fddbcc2024bed1338934de84d366ef58cc9e069243ad6ab5ca78c1330414e4a90b9
-  data.tar.gz: 88228f931aafcbdd69fa483594c3842aaf7603dac277333107dc8629656e96f2fb0b0b57d84039b81b922f95cc9ef6322fb5745a4626058f135357779e227e0c
+  metadata.gz: 5e3af82f062f7578f8008c15050c67c1241b9922613e65dfeb8fb9c7ef6816e2900eb76b0836e726e3af0c408401761f6e9582ccd3ebd10173db49fc978b7015
+  data.tar.gz: '02424401493f9e983fa5b0b556e388191ef9612c7ab799cc781ed05bf8a42cb8a54cf98d3062bcd0c7525e81e0a986326fd37b89c853d83981bbf1332e0c9329'

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'json', '~> 2.5', '>= 2.5.1'
-gem 'meilisearch', '~> 0.17.0'
+gem 'meilisearch', '~> 0.18.0'
 
 gem 'rubysl', '~> 2.0', platform: :rbx if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
 
@@ -28,7 +28,8 @@ group :test do
   gem 'activerecord-jdbc-adapter', platform: :jruby
   gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
   gem 'jdbc-sqlite3', platform: :jruby
-  gem 'rspec', '>= 2.5.0', '< 3.0'
+  gem 'rspec', '~> 3.0'
+  gem 'simplecov', require: 'false'
 
   gem 'byebug'
   gem 'dotenv', '~> 2.7', '>= 2.7.6'

data/README.md

@@ -58,7 +58,7 @@ To learn more about MeiliSearch, check out our [Documentation](https://docs.meil
 
 ## 🤖 Compatibility with MeiliSearch
 
-This package only guarantees the compatibility with the [version v0.24.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.24.0).
+This package only guarantees the compatibility with the [version v0.25.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.25.0).
 
 ## 🔧 Installation <!-- omit in toc -->
 
@@ -659,7 +659,7 @@ class Book < ActiveRecord::Base
   end
 end
 ```
-🚨 This is only recommended for testing purposes, the gem will call the `wait_for_pending_update` method that will stop your code execution until the asynchronous task has been processed by MeilSearch.
+🚨 This is only recommended for testing purposes, the gem will call the `wait_for_task` method that will stop your code execution until the asynchronous task has been processed by MeilSearch.
 
 ##### Disable auto-indexing & auto-removal <!-- omit in toc -->
 

data/lib/meilisearch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MeiliSearch
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/meilisearch-rails.rb

@@ -129,7 +129,7 @@ module MeiliSearch
 
     def attributes_to_hash(attributes, document)
       if attributes
-        attributes.map { |name, value| [name.to_s, value.call(document)] }.to_h
+        attributes.to_h { |name, value| [name.to_s, value.call(document)] }
       else
         {}
       end
@@ -237,7 +237,8 @@ module MeiliSearch
     def initialize(index_uid, raise_on_failure, options)
       client = MeiliSearch.client
       primary_key = options[:primary_key] || MeiliSearch::IndexSettings::DEFAULT_PRIMARY_KEY
-      @index = client.get_or_create_index(index_uid, { primaryKey: primary_key })
+      client.create_index(index_uid, { primaryKey: primary_key })
+      @index = client.index(index_uid)
       @raise_on_failure = raise_on_failure.nil? || raise_on_failure
     end
 
@@ -254,12 +255,12 @@ module MeiliSearch
       end
     end
 
-    # special handling of wait_for_pending_update to handle null task_id
-    def wait_for_pending_update(update_id)
-      return if update_id.nil? && !@raise_on_failure # ok
+    # special handling of wait_for_task to handle null task_id
+    def wait_for_task(task_uid)
+      return if task_uid.nil? && !@raise_on_failure # ok
 
-      SafeIndex.log_or_throw(:wait_for_pending_update, @raise_on_failure) do
-        @index.wait_for_pending_update(update_id)
+      SafeIndex.log_or_throw(:wait_for_task, @raise_on_failure) do
+        @index.wait_for_task(task_uid)
       end
     end
 
@@ -442,7 +443,7 @@ module MeiliSearch
         next if ms_indexing_disabled?(options)
 
         index = ms_ensure_init(options, settings)
-        last_update = nil
+        last_task = nil
 
         ms_find_in_batches(batch_size) do |group|
           if ms_conditional_index?(options)
@@ -457,9 +458,9 @@ module MeiliSearch
             attributes = attributes.to_hash unless attributes.instance_of?(Hash)
             attributes.merge ms_pk(options) => ms_primary_key_of(d, options)
           end
-          last_update= index.add_documents(documents)
+          last_task = index.add_documents(documents)
         end
-        index.wait_for_pending_update(last_update['updateId']) if last_update && (synchronous || options[:synchronous])
+        index.wait_for_task(last_task['uid']) if last_task && (synchronous || options[:synchronous])
       end
       nil
     end
@@ -474,8 +475,8 @@ module MeiliSearch
         end
 
         index = SafeIndex.new(ms_index_uid(options), true, options)
-        update = index.update_settings(final_settings)
-        index.wait_for_pending_update(update['updateId']) if synchronous
+        task = index.update_settings(final_settings)
+        index.wait_for_task(task['uid']) if synchronous
       end
     end
 
@@ -484,8 +485,8 @@ module MeiliSearch
         next if ms_indexing_disabled?(options)
 
         index = ms_ensure_init(options, settings)
-        update = index.add_documents(documents.map { |d| settings.get_attributes(d).merge ms_pk(options) => ms_primary_key_of(d, options) })
-        index.wait_for_pending_update(update['updateId']) if synchronous || options[:synchronous]
+        task = index.add_documents(documents.map { |d| settings.get_attributes(d).merge ms_pk(options) => ms_primary_key_of(d, options) })
+        index.wait_for_task(task['uid']) if synchronous || options[:synchronous]
       end
     end
 
@@ -566,7 +567,7 @@ module MeiliSearch
       end
 
       index = ms_index(index_uid)
-      index.search(q, params.map { |k, v| [k, v] }.to_h)
+      index.search(q, params.to_h { |k, v| [k, v] })
     end
 
     module AdditionalMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meilisearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Meili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json