meilisearch-rails 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9fd3dfd135348e2daea1797697e8b879f08705e2878b3683e59b28d51676c7
-  data.tar.gz: 7226660145964ae88bac72436690aad1a890e76cacd8d4c3fa1e1d3a1d3036e0
+  metadata.gz: dff716ea4a13c0f64718942f4988550a36076ae5dc52ac8ec7282000d116a99d
+  data.tar.gz: 1346eb18ddb24bf718693b7b3efa89d4b0084ecffe9f7ccae1d71956b3b8bf56
 SHA512:
-  metadata.gz: 66a1950a5b9bf12469f40053ee01bae86f1379f8a6437de2dff7cc65e55ef64ead442cccc23b39a9d609b4693a1ced987ae51136671fe2d1a53f494fa1ee66dd
-  data.tar.gz: 1e8e5b33d6cb193a432ae09c10f9611ff709a2e9d744fad40e069c7098f39db582b250e8d33288b2beb4ccc72d740a6b9e6f3b439163b6d271e250897e836ea8
+  metadata.gz: 38e1657c75e4eec945502ead72001ba56dc194d3ce5217e65f40abc49de34312087aa30d401d342a15c4c0701f0d41d49faf8c94aef5cc40d79ed9bdc345f414
+  data.tar.gz: 2cd31c3b6b70fb4d2c38977870ab28256de22422c410280e7615e11dfe64dd8eaa98295c7bdf553655b427837b8864ee60930a0aafa39e8f1272af34210c0479

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'json', '~> 2.5', '>= 2.5.1'
-gem 'meilisearch', '~> 0.15.3'
+gem 'meilisearch', '~> 0.16.0'
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   gem 'rubysl', '~> 2.0', :platform => :rbx
@@ -27,4 +27,5 @@ group :test do
   gem 'will_paginate', '>= 2.3.15'
   gem 'kaminari'
   gem 'dotenv', '~> 2.7', '>= 2.7.6'
+  gem 'byebug'
 end

data/README.md

@@ -65,7 +65,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.20.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.20.0).
+This package only guarantees the compatibility with the [version v0.21.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.21.0).
 
 ## 🔧 Installation
 
@@ -104,8 +104,8 @@ Create a new file `config/initializers/meilisearch.rb` to setup your `MEILISEARC
 
 ```ruby
 MeiliSearch.configuration = {
-    meilisearch_host: 'YourMeiliSearchHost',
-    meilisearch_api_key: 'YourMeiliSearchAPIKey',
+  meilisearch_host: 'YourMeiliSearchHost',
+  meilisearch_api_key: 'YourMeiliSearchAPIKey',
 }
 ```
 
@@ -126,6 +126,8 @@ class Book < ActiveRecord::Base
 end
 ```
 
+⚠️ Note that even if you want to use all the default options, you must declare an empty `meilisearch` block in your model.
+
 #### Basic Backend Search <!-- omit in toc -->
 
 We **strongly recommend the use of front-end search** through our [JavaScript API Client](https://github.com/meilisearch/meilisearch-js/) or [Instant Meilisearch plugin](https://github.com/meilisearch/instant-meilisearch)
@@ -143,15 +145,18 @@ end
 
 #### Backend Pagination <!-- omit in toc -->
 
-We support both [kaminari](https://github.com/amatsuda/kaminari) and [will_paginate](https://github.com/mislav/will_paginate).
+This gem supports:
+- [kaminari](https://github.com/amatsuda/kaminari)
+- [pagy](https://github.com/ddnexus/pagy)
+- [will_paginate](https://github.com/mislav/will_paginate).
 
 Specify the `:pagination_backend` in the configuration file:
 
 ```ruby
 MeiliSearch.configuration = {
-    meilisearch_host: 'YourMeiliSearchHost',
-    meilisearch_api_key: 'YourMeiliSearchAPIKey',
-    pagination_backend: :kaminari #:will_paginate
+  meilisearch_host: 'YourMeiliSearchHost',
+  meilisearch_api_key: 'YourMeiliSearchAPIKey',
+  pagination_backend: :kaminari #:will_paginate
 }
 ```
 
@@ -178,7 +183,21 @@ The **number of hits per page defaults to 20**, you can customize it by adding t
 Book.search('harry potter', hitsPerPage: 10)
 ```
 
-##  ⚙️ Settings
+#### Extra Configuration <!-- omit in toc -->
+
+Requests made to MeiliSearch may timeout and retry. To adapt the behavior to
+your needs, you can change the parameters during configuration:
+
+```ruby
+MeiliSearch.configuration = {
+  meilisearch_host: 'YourMeiliSearchHost',
+  meilisearch_api_key: 'YourMeiliSearchAPIKey',
+  timeout: 2,
+  max_retries: 1,
+}
+```
+
+## ⚙️ Settings
 
 You can configure the index settings by adding them inside the `meilisearch` block as shown below:
 
@@ -187,22 +206,22 @@ class Book < ApplicationRecord
   include MeiliSearch
 
   meilisearch do
-    searchableAttributes ['title', 'author', 'publisher', 'description']
-    attributesForFaceting ['genre']
-    rankingRules [
-        "proximity",
-        "typo",
-        "words",
-        "attribute",
-        "wordsPosition",
-        "exactness",
-        "desc(publication_year)"
+    searchable_attributes [:title, :author, :publisher, :description]
+    filterable_attributes [:genre]
+    ranking_rules [
+      'proximity',
+      'typo',
+      'words',
+      'attribute',
+      'exactness',
+      'desc(publication_year)'
     ]
     synonyms nyc: ['new york']
-    // The following parameters are applied when calling the search() method:
-    attributesToHighlight ['*']
-    attributesToCrop ['description']
-    cropLength 10
+
+    # The following parameters are applied when calling the search() method:
+    attributes_to_highlight ['*']
+    attributes_to_crop [:description]
+    crop_length 10
   end
 end
 ```
@@ -214,9 +233,10 @@ Check the dedicated section of the documentation, for more information on the [s
 All the supported options are described in the [search parameters](https://docs.meilisearch.com/reference/features/search_parameters.html) section of the documentation.
 
 ```ruby
-Book.search('Harry', { filters: 'author = J. K. Rowling' })
+Book.search('Harry', attributesToHighlight: ['*'])
 ```
-👉 Don't forget that `attributesToHighlight`, `attributesToCrop`, and `cropLength` can be set up in the `meilisearch` block of your model.
+👉 Don't forget that `attributes_to_highlight`, `attributes_to_crop`, and
+`crop_length` can be set up in the `meilisearch` block of your model.
 
 ## 🪛 Options
 
@@ -224,12 +244,13 @@ Book.search('Harry', { filters: 'author = J. K. Rowling' })
 
 #### Custom index_uid
 
-By default, the **index_uid** will be the class name, e.g. `Book`. You can customize the index_uid by using the `index_uid` option.
+By default, the **index_uid** will be the class name, e.g. `Book`. You can customize the index_uid by using the `index_uid:` option.
 
 ```ruby
 class Book < ActiveRecord::Base
   include MeiliSearch
-  meilisearch :index_uid => 'MyCustomUID' do
+
+  meilisearch index_uid: 'MyCustomUID' do
   end
 end
 ```
@@ -241,6 +262,7 @@ You can suffix the index UID with the current Rails environment using the follow
 ```ruby
 class Book < ActiveRecord::Base
   include MeiliSearch
+
   meilisearch per_environment: true do # The index UID will be "Book_#{Rails.env}"
   end
 end
@@ -261,13 +283,13 @@ class Author < ApplicationRecord
   meilisearch do
     attribute :first_name, :last_name
     attribute :full_name do
-      '#{first_name} #{last_name}'
+      "#{first_name} #{last_name}"
     end
     add_attribute :full_name_reversed
   end
 
   def full_name_reversed
-    '#{last_name} #{first_name}'
+    "#{last_name} #{first_name}"
   end
 
   def will_save_change_to_full_name?
@@ -282,27 +304,28 @@ end
 
 #### Custom primary key
 
-By default, the `primary key` is based on your record's id. You can change this behavior specifying the `:primary_key` option.
+By default, the primary key is based on your record's id. You can change this behavior by specifying the `primary_key:` option.
 
 Note that the primary key must have a **unique value**.
 
 ```ruby
 class Book < ActiveRecord::Base
   include MeiliSearch
-  meilisearch :primary_key => 'ISBN' do
+
+  meilisearch primary_key: 'ISBN' do
   end
 end
 ```
 #### Conditional indexing
 
-You can control if a record must be indexed by using the `:if` or `:unless` options.<br>
+You can control if a record must be indexed by using the `if:` or `unless:` options.<br>
 As soon as you use those constraints, `add_documents` and `delete_documents` calls will be performed in order to keep the index synced with the DB. To prevent this behavior, you can create a `will_save_change_to_#{attr_name}?` method.
 
 ```ruby
 class Book < ActiveRecord::Base
   include MeiliSearch
 
-  meilisearch :if published?, :unless premium? do
+  meilisearch if: :published?, unless: :premium? do
   end
 
   def published?
@@ -314,7 +337,7 @@ class Book < ActiveRecord::Base
   end
 
   def will_save_change_to_published?
-  # return true only if you know that the 'published' state changed
+    # return true only if you know that the 'published' state changed
   end
 end
 ```
@@ -324,7 +347,6 @@ You can index a record in several indexes using the `add_index` option:
 
 ```ruby
 class Book < ActiveRecord::Base
-
   include MeiliSearch
 
   PUBLIC_INDEX_UID = 'Books'
@@ -332,17 +354,17 @@ class Book < ActiveRecord::Base
 
   # store all books in index 'SECURED_INDEX_UID'
   meilisearch index_uid: SECURED_INDEX_UID do
-    searchableAttributes [:title, :author]
+    searchable_attributes [:title, :author]
 
     # store all 'public' (released and not premium) books in index 'PUBLIC_INDEX_UID'
     add_index PUBLIC_INDEX_UID, if: :public? do
-      searchableAttributes [:title, :author]
+      searchable_attributes [:title, :author]
     end
   end
 
   private
   def public?
-    released && !premium
+    released? && !premium?
   end
 end
 ```
@@ -394,18 +416,31 @@ end
 
 In this case you can bypass loading the record from **ActiveRecord** and just communicate with the index directly.
 
+With **ActiveJob**:
+
 ```ruby
+class Book < ActiveRecord::Base
+  include MeiliSearch
+
+  meilisearch enqueue: :trigger_job do
+    attribute :title, :author, :description
+  end
+
+  def self.trigger_job(record, remove)
+    MyActiveJob.perform_later(record.id, remove)
+  end
+end
+
 class MyActiveJob < ApplicationJob
   def perform(id, remove)
     if remove
-      # the record has likely already been removed from your database so we cannot
-      # use ActiveRecord#find to load it
-      # We access the underlying MeiliSearch index object
+      # The record has likely already been removed from your database so we cannot
+      # use ActiveRecord#find to load it.
+      # We access the underlying MeiliSearch index object.
       Book.index.delete_document(id)
     else
-      # the record should be present
-      c = Book.find(id)
-      c.index!
+      # The record should be present.
+      Book.find(id).index!
     end
   end
 end
@@ -429,14 +464,13 @@ end
 class MySidekiqWorker
   def perform(id, remove)
     if remove
-      # the record has likely already been removed from your database so we cannot
-      # use ActiveRecord#find to load it
-      # We access the underlying MeiliSearch index object
-      index = Book.index.delete_document(id)
+      # The record has likely already been removed from your database so we cannot
+      # use ActiveRecord#find to load it.
+      # We access the underlying MeiliSearch index object.
+      Book.index.delete_document(id)
     else
-      # the record should be present
-      c = Contact.find(id)
-      c.index!
+      # The record should be present.
+      Book.find(id).index!
     end
   end
 end
@@ -466,7 +500,7 @@ end
 
 Extend a change to a related record.
 
-**With Active Record**, you'll need to use `touch` and `after_touch`.
+**With ActiveRecord**, you'll need to use `touch` and `after_touch`.
 
 ```ruby
 class Author < ActiveRecord::Base
@@ -546,7 +580,7 @@ You can strip all HTML tags from your attributes with the `sanitize` option.
 class Book < ActiveRecord::Base
   include MeiliSearch
 
-  meilisearch :sanitize => true do
+  meilisearch sanitize: true do
   end
 end
 ```
@@ -559,7 +593,7 @@ You can force the UTF-8 encoding of all your attributes using the `force_utf8_en
 class Book < ActiveRecord::Base
   include MeiliSearch
 
-  meilisearch :force_utf8_encoding => true do
+  meilisearch force_utf8_encoding: true do
   end
 end
 ```
@@ -568,7 +602,7 @@ end
 
 #### Indexing & deletion
 
-You can manually index a record by using the `index!` instance method and remove it by using the `remove_from_index!` instance method
+You can manually index a record by using the `index!` instance method and remove it by using the `remove_from_index!` instance method.
 
 ```ruby
 book = Book.create!(title: 'The Little Prince', author: 'Antoine de Saint-Exupéry')
@@ -603,7 +637,6 @@ index = Book.index
 
 ### Development & testing
 
-
 #### Exceptions
 
 You can disable exceptions that could be raised while trying to reach MeiliSearch's API by using the `raise_on_failure` option:
@@ -612,14 +645,16 @@ You can disable exceptions that could be raised while trying to reach MeiliSearc
 class Book < ActiveRecord::Base
   include MeiliSearch
 
-  # only raise exceptions in development environment
-  meilisearch :raise_on_failure => Rails.env.development? do
+  # Only raise exceptions in development environment.
+  meilisearch raise_on_failure: Rails.env.development? do
   end
 end
 ```
 
 #### Testing
+
 ##### Synchronous testing
+
 You can force indexing and removing to be synchronous by setting the following option:
 
 ```ruby
@@ -649,7 +684,8 @@ You can temporarily disable auto-indexing using the without_auto_index scope:
 
 ```ruby
 Book.without_auto_index do
-  1.upto(10000) { Book.create! attributes } # inside this block, auto indexing task will not run.
+  # Inside this block, auto indexing task will not run.
+  1.upto(10000) { Book.create! attributes }
 end
 ```
 

data/lib/meilisearch/configuration.rb

@@ -9,7 +9,11 @@ module MeiliSearch
     end
 
     def client
-      ::MeiliSearch::Client.new(@@configuration[:meilisearch_host], @@configuration[:meilisearch_api_key])
+      ::MeiliSearch::Client.new(
+        configuration[:meilisearch_host],
+        configuration[:meilisearch_api_key],
+        configuration.slice(:timeout, :max_retries)
+      )
     end
   end
 end

data/lib/meilisearch/pagination/kaminari.rb

@@ -9,7 +9,11 @@ module MeiliSearch
     class Kaminari < ::Kaminari::PaginatableArray
 
       def initialize(array, options)
-        super(array, options)
+        if RUBY_VERSION >= '3'
+          super(array, **options)
+        else
+          super(array, options)
+        end
       end
 
       def limit(num)
@@ -25,12 +29,12 @@ module MeiliSearch
       class << self
         def 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
+          array = new results, limit: options[:per_page], offset: offset, total_count: total_hits
           if array.empty? and !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 = ([nil] * offset) + results
-            array = new results, :offset => offset, :limit => options[:per_page], :total_count => total_hits
+            array = new results, offset: offset, limit: options[:per_page], total_count: total_hits
           end
           array
         end

data/lib/meilisearch/utilities.rb

@@ -7,7 +7,8 @@ module MeiliSearch
         elsif Rails.application
           Rails.application.eager_load!
         end
-        MeiliSearch.instance_variable_get :@included_in
+        klasses = MeiliSearch.instance_variable_get(:@included_in)
+        (klasses + klasses.map{ |klass| klass.descendants }.flatten).uniq
       end
 
       def clear_all_indexes
@@ -26,7 +27,7 @@ module MeiliSearch
         klasses.each do |klass|
           puts klass
           puts "Reindexing #{klass.count} records..."
-          klass.ms_reindex
+          klass.ms_reindex!
         end
       end
 

data/lib/meilisearch/version.rb

@@ -1,3 +1,3 @@
 module MeiliSearch
-  VERSION = '0.1.0'
+  VERSION = '0.2.3'
 end

data/lib/meilisearch-rails.rb

@@ -52,16 +52,25 @@ module MeiliSearch
 
     # MeiliSearch settings
     OPTIONS = [
-      :searchableAttributes, :attributesForFaceting, :displayedAttributes, :distinctAttribute,
-      :synonyms, :stopWords, :rankingRules,
+      :searchableAttributes,
+      :filterableAttributes,
+      :displayedAttributes,
+      :distinctAttribute,
+      :synonyms,
+      :stopWords,
+      :rankingRules,
       :attributesToHighlight,
-      :attributesToCrop, :cropLength
+      :attributesToCrop,
+      :cropLength,
     ]
 
-    OPTIONS.each do |k|
-      define_method k do |v|
-        instance_variable_set("@#{k}", v)
+    OPTIONS.each do |option|
+      define_method option do |value|
+        instance_variable_set("@#{option}", value)
       end
+
+      underscored_name = option.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase
+      alias_method underscored_name, option if underscored_name != option
     end
 
     def initialize(options, &block)
@@ -315,7 +324,7 @@ module MeiliSearch
 
     def meilisearch(options = {}, &block)
       self.meilisearch_settings = IndexSettings.new(options, &block)
-      self.meilisearch_options = { :type => ms_full_const_get(model_name.to_s), :per_page => meilisearch_settings.get_setting(:hitsPerPage) || 20, :page => 1 }.merge(options)
+      self.meilisearch_options = { type: ms_full_const_get(model_name.to_s), per_page: meilisearch_settings.get_setting(:hitsPerPage) || 20, page: 1 }.merge(options)
 
       attr_accessor :formatted
 
@@ -552,8 +561,6 @@ module MeiliSearch
         params[:cropLength] = meilisearch_settings.get_setting(:cropLength) if !meilisearch_settings.get_setting(:cropLength).nil?
       end
       index = ms_index(index_uid)
-      # index = ms_index(ms_index_uid)
-      # index.search(q, Hash[params.map { |k,v| [k.to_s, v.to_s] }])
       index.search(q, Hash[params.map { |k,v| [k, v] }])
     end
 
@@ -590,14 +597,6 @@ module MeiliSearch
         params[:limit] = 200
       end
 
-      if !meilisearch_settings.get_setting(:attributesToHighlight).nil?
-        params[:attributesToHighlight] = meilisearch_settings.get_setting(:attributesToHighlight)
-      end
-
-      if !meilisearch_settings.get_setting(:attributesToCrop).nil?
-        params[:attributesToCrop] = meilisearch_settings.get_setting(:attributesToCrop)
-        params[:cropLength] = meilisearch_settings.get_setting(:cropLength) if !meilisearch_settings.get_setting(:cropLength).nil?
-      end
       # Returns raw json hits as follows:
       # {"hits"=>[{"id"=>"13", "href"=>"apple", "name"=>"iphone"}], "offset"=>0, "limit"=>|| 20, "nbHits"=>1, "exhaustiveNbHits"=>false, "processingTimeMs"=>0, "query"=>"iphone"}
       json = ms_raw_search(q, params)
@@ -632,7 +631,7 @@ module MeiliSearch
       hits_per_page ||= 20
       page ||= 1
 
-      res = MeiliSearch::Pagination.create(results, total_hits, meilisearch_options.merge({ :page =>  page , :per_page => hits_per_page }))
+      res = MeiliSearch::Pagination.create(results, total_hits, meilisearch_options.merge({ page:  page , per_page: hits_per_page }))
       res.extend(AdditionalMethods)
       res.send(:ms_init_raw_answer, json)
       res
@@ -823,7 +822,7 @@ module MeiliSearch
 
     def ms_find_in_batches(batch_size, &block)
       if (defined?(::ActiveRecord) && ancestors.include?(::ActiveRecord::Base)) || respond_to?(:find_in_batches)
-        find_in_batches(:batch_size => batch_size, &block)
+        find_in_batches(batch_size: batch_size, &block)
       elsif defined?(::Sequel) && self < Sequel::Model
         dataset.extension(:pagination).each_page(batch_size, &block)
       else

data/meilisearch-rails.gemspec

@@ -41,6 +41,6 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.summary = "MeiliSearch integration for Ruby on Rails."
-  s.add_dependency(%q<json>, [">= 1.5.1"])
-  s.add_dependency(%q<meilisearch>, [">= 0.15.3"])
+  s.add_dependency("json", [">= 1.5.1"])
+  s.add_dependency("meilisearch", [">= 0.15.4"])
 end

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ Thread.current[:meilisearch_hosts] = nil
 
 RSpec.configure do |c|
   c.mock_with :rspec
-  c.filter_run :focus => true
+  c.filter_run focus: true
   c.run_all_when_everything_filtered = true
   c.formatter = 'documentation'
 

data/spec/utilities_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
-MeiliSearch.configuration = { :meilisearch_host => ENV['MEILISEARCH_HOST'], :meilisearch_api_key => ENV['MEILISEARCH_API_KEY'] }
+MeiliSearch.configuration = { meilisearch_host: ENV['MEILISEARCH_HOST'], meilisearch_api_key: ENV['MEILISEARCH_API_KEY'] }
 
 describe MeiliSearch::Utilities do
 
@@ -17,6 +17,12 @@ describe MeiliSearch::Utilities do
 
       meilisearch
     end
+
+    class DummyChild < Dummy
+    end
+
+    class DummyGrandChild < DummyChild
+    end
   end
 
   after(:each) do
@@ -24,7 +30,7 @@ describe MeiliSearch::Utilities do
   end
 
   it "should get the models where MeiliSearch module was included" do
-    (MeiliSearch::Utilities.get_model_classes - [Dummy]).should == []
+    (MeiliSearch::Utilities.get_model_classes - [Dummy, DummyChild, DummyGrandChild]).should == []
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meilisearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Meili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.4
 description: MeiliSearch integration for Ruby on Rails. See https://github.com/meilisearch/MeiliSearch
 email: bonjour@meilisearch.com
 executables: []