meilisearch-rails 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5387112e0280c13ed074d356fdaa706c14a933d0a2ae540f16ecad75829db3
-  data.tar.gz: 04560a2a843b527439d02abddf63d23ab218860e06fa6005ca4d5cc2cdf939cc
+  metadata.gz: dab897ac0b83c33721dc40eab5be2d2cc5013c14380a1d47df590f44339433fc
+  data.tar.gz: d99e1fd1970915a665a328233df77bf526f0510478fa2087b502a6224e8a2635
 SHA512:
-  metadata.gz: 8e3ca9d2407f083234b5a925ed31285d67d705c7e97ac07840989061a75ae6fbc9cdbf6e2f179d40f13d7b5751967727caaf872ae1d8b80a39494e6732692155
-  data.tar.gz: 2d97cf8dee950fb9d9afe58b78eac6e4df2131eb0864a4a5b44bd247e97f79b759a66f6cf1882da37d7dca3a03b909ff5aacc71bd8063bf04e27ccf9b8dd4871
+  metadata.gz: 67e71e231498dd94223096fd3bb02a7f79a8861a4a013f3a628ee3141db3436e323df1cd671caeb20937fe39533c558bd540c4eceae6f6b69713a3af8ceb1a93
+  data.tar.gz: 23ac15e8d4d42a1af5d9f2c38e84b9e7c810979af2ca8264eb818b80aaaf84d2ad973512857f2c40c0708dee82a6d67ddc2097e542cc71c4e64f7bc1cb72edbe

data/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/Gemfile

@@ -13,17 +13,18 @@ group :development do
 end
 
 group :test do
-  rails_version = ENV['RAILS_VERSION'] || '6.1'
+  rails_version = ENV['RAILS_VERSION'] || '7.1'
   sequel_version = ENV['SEQUEL_VERSION'] ? "~> #{ENV['SEQUEL_VERSION']}" : '>= 4.0'
 
   gem 'active_model_serializers'
   gem 'rails', "~> #{rails_version}"
   gem 'sequel', sequel_version
 
-  if Gem::Version.new(rails_version) >= Gem::Version.new('6.0')
-    gem 'sqlite3', '~> 1.4.0', platform: %i[rbx ruby]
+  # remove when deprecate rails 6
+  if Gem::Version.new(rails_version) >= Gem::Version.new('7.0')
+    gem 'sqlite3', '~> 2', platform: %i[rbx ruby]
   else
-    gem 'sqlite3', '< 1.4.0', platform: %i[rbx ruby]
+    gem 'sqlite3', '< 2', platform: %i[rbx ruby]
   end
 
   gem 'activerecord-jdbc-adapter', platform: :jruby
@@ -33,6 +34,7 @@ group :test do
   gem 'simplecov', require: 'false'
   gem 'simplecov-cobertura', require: 'false'
   gem 'threads'
+  gem 'logger'
 
   gem 'byebug'
   gem 'dotenv', '~> 2.7', '>= 2.7.6'

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Meili SAS
+Copyright (c) 2021-2025 Meili SAS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -32,7 +32,6 @@
 ## Table of Contents <!-- omit in TOC -->
 
 - [📖 Documentation](#-documentation)
-- [⚡ Supercharge your Meilisearch experience](#-supercharge-your-meilisearch-experience)
 - [🤖 Compatibility with Meilisearch](#-compatibility-with-meilisearch)
 - [🚀 Getting started](#-getting-started)
 - [Compatibility](#-compatibility)
@@ -66,10 +65,6 @@ The whole usage of this gem is detailed in this README.
 
 To learn more about Meilisearch, check out our [Documentation](https://www.meilisearch.com/docs/learn/tutorials/getting_started.html) or our [API References](https://www.meilisearch.com/docs/reference/api/).
 
-## ⚡ Supercharge your Meilisearch experience
-
-Say goodbye to server deployment and manual updates with [Meilisearch Cloud](https://www.meilisearch.com/pricing?utm_campaign=oss&utm_source=integration&utm_medium=meilisearch-rails). No credit card required.
-
 ## 🤖 Compatibility with Meilisearch
 
 This package guarantees compatibility with [version v1.x of Meilisearch](https://github.com/meilisearch/meilisearch/releases/latest), but some features may not be present. Please check the [issues](https://github.com/meilisearch/meilisearch-rails/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+label%3Aenhancement) for more info.
@@ -92,16 +87,9 @@ gem 'meilisearch-rails'
 
 ### Run Meilisearch <!-- omit in toc -->
 
-There are many easy ways to [download and run a Meilisearch instance](https://www.meilisearch.com/docs/reference/features/installation.html#download-and-launch).
-
-For example, if you use Docker:
-
-```bash
-docker pull getmeili/meilisearch:latest # Fetch the latest version of Meilisearch image from Docker Hub
-docker run -it --rm -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey
-```
+⚡️ **Launch, scale, and streamline in minutes with Meilisearch Cloud**—no maintenance, no commitment, cancel anytime. [Try it free now](https://cloud.meilisearch.com/login?utm_campaign=oss&utm_source=github&utm_medium=meilisearch-rails).
 
-NB: you can also download Meilisearch from **Homebrew** or **APT**.
+🪨  Prefer to self-host? [Download and deploy](https://www.meilisearch.com/docs/learn/self_hosted/getting_started_with_self_hosted_meilisearch?utm_campaign=oss&utm_source=github&utm_medium=meilisearch-rails) our fast, open-source search engine on your own infrastructure.
 
 ## 🚀 Getting started
 

data/lib/meilisearch/rails/ms_clean_up_job.rb

@@ -8,7 +8,7 @@ module MeiliSearch
           index = MeiliSearch::Rails.client.index(document[:index_uid])
 
           if document[:synchronous]
-            index.delete_document!(document[:primary_key])
+            index.delete_document(document[:primary_key]).await
           else
             index.delete_document(document[:primary_key])
           end

data/lib/meilisearch/rails/pagination/kaminari.rb

@@ -19,13 +19,16 @@ module MeiliSearch
 
         def self.create(results, total_hits, options = {})
           offset = ((options[:page] - 1) * options[:per_page])
-          array = new results, limit: options[:per_page], offset: offset, total_count: total_hits
+          total_hits = 0 if total_hits.nil?
+          offset = 0 if offset.nil?
+          limit = 0 if options[:per_page].nil?
+          array = new results, limit: limit, offset: offset, total_count: total_hits
 
           if array.empty? && !results.empty?
             # since Kaminari 0.16.0, you need to pad the results with nil values so it matches the offset param
             # otherwise you'll get an empty array: https://github.com/amatsuda/kaminari/commit/29fdcfa8865f2021f710adaedb41b7a7b081e34d
             results = Array.new(offset) + results
-            array = new results, offset: offset, limit: options[:per_page], total_count: total_hits
+            array = new results, offset: offset, limit: limit, total_count: total_hits
           end
 
           array

data/lib/meilisearch/rails/version.rb

@@ -2,7 +2,7 @@
 
 module MeiliSearch
   module Rails
-    VERSION = '0.14.0'
+    VERSION = '0.14.2'
 
     def self.qualified_version
       "Meilisearch Rails (v#{VERSION})"

data/lib/meilisearch-rails.rb

@@ -84,6 +84,22 @@ module MeiliSearch
       def initialize(options, &block)
         @options = options
         instance_exec(&block) if block_given?
+        warn_searchable_missing_attributes
+      end
+
+      def warn_searchable_missing_attributes
+        searchables = get_setting(:searchable_attributes)&.map { |searchable| searchable.to_s.split('.').first }
+        attrs = get_setting(:attributes)&.map { |k, _| k.to_s }
+
+        if searchables.present? && attrs.present?
+          (searchables - attrs).each do |missing_searchable|
+            warning = <<~WARNING
+              [meilisearch-rails] #{missing_searchable} declared in searchable_attributes but not in attributes. \
+              Please add it to attributes if it should be searchable.
+            WARNING
+            MeiliSearch::Rails.logger.warn(warning)
+          end
+        end
       end
 
       def use_serializer(serializer)
@@ -464,8 +480,6 @@ module MeiliSearch
             after_destroy_commit { |searchable| searchable.ms_enqueue_remove_from_index!(ms_synchronous?) }
           end
         end
-
-        warn_searchable_missing_attributes
       end
 
       def ms_without_auto_index(&block)
@@ -555,14 +569,14 @@ module MeiliSearch
             doc = doc.merge ms_pk(options) => primary_key
 
             if synchronous || options[:synchronous]
-              index.add_documents!(doc)
+              index.add_documents(doc).await
             else
               index.add_documents(doc)
             end
           elsif ms_conditional_index?(options) && primary_key.present?
             # remove non-indexable documents
             if synchronous || options[:synchronous]
-              index.delete_document!(primary_key)
+              index.delete_document(primary_key).await
             else
               index.delete_document(primary_key)
             end
@@ -594,7 +608,7 @@ module MeiliSearch
 
           index = ms_ensure_init(options, settings)
           if synchronous || options[:synchronous]
-            index.delete_document!(primary_key)
+            index.delete_document(primary_key).await
           else
             index.delete_document(primary_key)
           end
@@ -607,7 +621,7 @@ module MeiliSearch
           next if ms_indexing_disabled?(options)
 
           index = ms_ensure_init(options, settings)
-          synchronous || options[:synchronous] ? index.delete_all_documents! : index.delete_all_documents
+          synchronous || options[:synchronous] ? index.delete_all_documents.await : index.delete_all_documents
           @ms_indexes[MeiliSearch::Rails.active?][settings] = nil
         end
         nil
@@ -901,19 +915,6 @@ module MeiliSearch
         # We don't know if the attribute has changed, so conservatively assume it has
         true
       end
-
-      def warn_searchable_missing_attributes
-        searchables = meilisearch_settings.get_setting(:searchable_attributes)
-        attrs = meilisearch_settings.get_setting(:attributes)&.keys
-
-        if searchables.present? && attrs.present?
-          (searchables.map(&:to_s) - attrs.map(&:to_s)).each do |missing_searchable|
-            MeiliSearch::Rails.logger.warn(
-              "[meilisearch-rails] #{name}##{missing_searchable} declared in searchable_attributes but not in attributes. Please add it to attributes if it should be searchable."
-            )
-          end
-        end
-      end
     end
 
     # these are the instance methods included

data/meilisearch-rails.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'meilisearch', '~> 0.28'
+  s.add_dependency 'meilisearch', '~> 0.28.4'
+  s.add_dependency 'mutex_m', '~> 0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meilisearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Meili
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meilisearch
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.28.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.28.4
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Meilisearch integration for Ruby on Rails. See https://github.com/meilisearch/meilisearch
 email: bonjour@meilisearch.com
 executables: []
@@ -58,7 +72,7 @@ homepage: https://github.com/meilisearch/meilisearch-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.19
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Meilisearch integration for Ruby on Rails.
 test_files: []