algoliasearch-rails 1.20.6 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38fe24b0c83678a9d4c08faf6faac62a894970be01fa7739b33ef8da116588ed
-  data.tar.gz: 8d01bb4274a36b989f9c021245e9aa2f6495ed07fd1bc05351aca9eb7f4953c1
+  metadata.gz: 1eb55772f506326a5847dbc0ebee0674f23c8a382b3eea7c3fddc01b9039150d
+  data.tar.gz: f41c8aa08a1d28ddf8f88643bb5e6231e4f447e49ff21714d0b803e6c0567394
 SHA512:
-  metadata.gz: ac5bbe58eb801e574af5c7a7155bfed178928ffec9065a2845aa6d9189eaca677f103891c3e61a2be38cd7766e1685c32fba9050ea20f2b7fb103923e755ce1a
-  data.tar.gz: 2a235e08fc3d7d8620dac3048df6b6e9936b00ce27858f3020296dd98c44ff892f76ea255476be2c6cb835ef6458011d6d21d89fcc0d1ab89e37e214c32681bd
+  metadata.gz: 8c763ac336f5cb507a73dbaf5b1d2be086bef6260054c3887bf2d7fa568fb513e8611151a2adfedf1f9b52d738e3cf2cb626eb9e44439a9dea2715fea501ced0
+  data.tar.gz: 7df4726bca1c2d10aa9037d83da3a7d15684d39d429db8f5bda5b25b722edbe4c3d41538d58f96e1874a5acd5e33a3ccc6ba0437ca3b9373cdde35da63b8dd23

data/.travis.yml

@@ -1,61 +1,53 @@
 language: ruby
+
 branches:
   only:
-  - master
+    - master
+
 matrix:
   include:
-  - rvm: 1.8.7
-    env: RAILS_VERSION=3.2.0
-  - rvm: 1.9.3
-    env: RAILS_VERSION=3.2.0
-  - rvm: 1.9.3
-    env: RAILS_VERSION=4.2
-  - rvm: 2.2.9
-    env: RAILS_VERSION=3.2.0
-  - rvm: 2.2.9
-    env: RAILS_VERSION=4.2
-  - rvm: 2.2.9
-    env: RAILS_VERSION=5.1
-  - rvm: 2.3.6
-    env: RAILS_VERSION=3.2.0
-  - rvm: 2.3.6
-    env: RAILS_VERSION=4.2
-  - rvm: 2.3.6
-    env: RAILS_VERSION=5.1
-  - rvm: 2.4.3
-    env: RAILS_VERSION=4.2
-  - rvm: 2.4.3
-    env: RAILS_VERSION=5.1 SEQUEL_VERSION=4.0
-  - rvm: 2.4.3
-    env: RAILS_VERSION=5.1 SEQUEL_VERSION=5.0
-  - rvm: 2.5.0
-    env: RAILS_VERSION=4.2
-  - rvm: 2.5.0
-    env: RAILS_VERSION=5.1 SEQUEL_VERSION=4.0
-  - rvm: 2.5.0
-    env: RAILS_VERSION=5.1 SEQUEL_VERSION=5.0
-  # - rvm: jruby-9.1.2.0
-  #   env: RAILS_VERSION=3.2.0
-  # - rvm: jruby-9.1.2.0
-  #   env: RAILS_VERSION=4.2
-  # - rvm: jruby-9.1.2.0
-  #   env: RAILS_VERSION=5.0
-  # - rvm: rbx-2
-  #   env: RAILS_VERSION=3.2.0
-  # - rvm: rbx-2
-  #   env: RAILS_VERSION=4.2
-  # - rvm: rbx-3.20
-  #   env: RAILS_VERSION=3.2.0
-  # - rvm: rbx-3.20
-  #   env: RAILS_VERSION=4.2
-  # - rvm: rbx-3.20
-  #   env: RAILS_VERSION=5.0
-  allow_failures:
-  - rvm: rbx-2
+    - rvm: 1.8.7
+      env: RAILS_VERSION=3.2.0 SEQUEL_VERSION=4.0
+    - rvm: 1.9.3
+      env: RAILS_VERSION=3.2.0
+    - rvm: 1.9.3
+      env: RAILS_VERSION=4.2
+    - rvm: 2.2.9
+      env: RAILS_VERSION=3.2.0
+    - rvm: 2.2.9
+      env: RAILS_VERSION=4.2
+    - rvm: 2.2.9
+      env: RAILS_VERSION=5.1
+    - rvm: 2.3.6
+      env: RAILS_VERSION=3.2.0
+    - rvm: 2.3.6
+      env: RAILS_VERSION=4.2
+    - rvm: 2.3.6
+      env: RAILS_VERSION=5.1
+    - rvm: 2.4.3
+      env: RAILS_VERSION=4.2
+    - rvm: 2.4.3
+      env: RAILS_VERSION=5.1 SEQUEL_VERSION=4.0
+    - rvm: 2.4.3
+      env: RAILS_VERSION=5.1 SEQUEL_VERSION=5.0
+    - rvm: 2.5.3
+      env: RAILS_VERSION=5.1 SEQUEL_VERSION=5.0
+    - rvm: 2.6.0
+      env: RAILS_VERSION=5.2 SEQUEL_VERSION=5.0
+
 before_install:
   - wget http://api-key-dealer.herokuapp.com/clients/algolia-keys && chmod +x algolia-keys
-  - gem install bundler
+  - which bundle || true
+  - find /home/travis/.rvm -wholename "*/bundler-*.gemspec" -print -delete || true
+  - bundle --version || true
+  - gem uninstall bundler || true
+  - bundle --version || true
+  - gem install bundler -v 1.17.3
   - bundle --version
+
 install: rm -f Gemfile.lock && bundle install --without development
+
 cache: bundler
-script: eval $(./algolia-keys export) && bundle exec rake
+
+script:
+  - eval $(./algolia-keys export) && bundle exec rake

data/ChangeLog

@@ -1,5 +1,35 @@
 CHANGELOG
 
+## [1.21.0](https://github.com/algolia/algoliasearch-rails/releases/tag/1.21.0) (2019-02-12)
+
+**Added**
+
+    * Add `AlgoliaSearch::IndexSettings::DEFAULT_BATCH_SIZE` constant - PR [#319](https://github.com/algolia/algoliasearch-rails/pull/319)
+
+    * Support ActiveModel Serializer 🎉 - PR [#266](https://github.com/algolia/algoliasearch-rails/pull/266)
+
+        ```ruby
+        class SerializedObject < ActiveRecord::Base
+            include AlgoliaSearch
+
+            algoliasearch do
+
+                use_serializer SerializedObjectSerializer
+
+                tags do
+                    ['tag1', 'tag2']
+                end
+
+            end
+        end
+        ```
+
+**Fixed**
+
+    * Add support for all new recent engine settings - PR [#327](https://github.com/algolia/algoliasearch-rails/pull/327)
+
+        Algolia regularly introduce new settings, all of them are supported by this gem.
+
 2018-12-07 1.20.6
 
     * Better support for Rails 5.1 and deprecated `attribute_changed?`

data/Gemfile

@@ -10,6 +10,7 @@ end
 group :test do
   rails_version = ENV["RAILS_VERSION"] ? "~> #{ENV["RAILS_VERSION"]}" : '>= 3.2.0'
   gem 'rails', rails_version
+  gem 'active_model_serializers'
   if defined?(RUBY_VERSION) && RUBY_VERSION == "1.8.7"
     gem 'i18n', '< 0.7'
     gem 'highline', '< 1.7'
@@ -20,7 +21,7 @@ group :test do
     gem 'faraday', '< 0.10'
   elsif defined?(RUBY_VERSION) && RUBY_VERSION == "1.9.3"
     gem 'rack', '< 2'
-    gem 'nokogiri', '< 1.7.0'
+    gem 'rack-cache', '<= 1.7.1'
     if Gem::Version.new(ENV['RAILS_VERSION'] || '3.2.0') >= Gem::Version.new('4.0')
       gem 'mime-types', '~> 2.6'
     else
@@ -34,7 +35,7 @@ group :test do
     gem 'net-http-persistent', '< 3.0'
   end
   gem 'rspec', '>= 2.5.0', '< 3.0'
-  gem 'sqlite3', :platform => [:rbx, :ruby]
+  gem 'sqlite3', '< 1.4.0', :platform => [:rbx, :ruby]
   gem 'jdbc-sqlite3', :platform => :jruby
   gem 'activerecord-jdbc-adapter', :platform => :jruby
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
@@ -61,3 +62,4 @@ group :test, :development do
     gem 'kaminari'
   end
 end
+

data/Gemfile.lock

@@ -1,56 +1,68 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    active_model_serializers (0.10.8)
+      actionpack (>= 4.1, < 6)
+      activemodel (>= 4.1, < 6)
+      case_transform (>= 0.2)
+      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
+      marcel (~> 0.3.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    algoliasearch (1.23.2)
+    algoliasearch (1.25.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    arel (7.1.4)
-    backports (3.11.1)
+    arel (9.0.0)
+    backports (3.11.4)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
+    case_transform (0.2)
+      activesupport
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
     diff-lcs (1.3)
-    erubis (2.7.0)
+    erubi (1.8.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    faraday (0.15.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -62,75 +74,79 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (~> 2.9)
       net-http-pipeline
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
     highline (1.7.10)
     httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.4.0)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    kaminari (1.0.1)
+    jsonapi-renderer (0.2.0)
+    kaminari (1.1.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.0.1)
-      kaminari-activerecord (= 1.0.1)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
       actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
       activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    nio4r (2.0.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nio4r (2.3.1)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
+      bundler (>= 1.3.0)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (10.1.1)
-    rdoc (6.0.4)
+    rdoc (6.1.1)
     redgreen (1.2.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
@@ -140,18 +156,18 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.4)
-    sequel (4.49.0)
-    sprockets (3.7.1)
+    sequel (5.16.0)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    travis (1.8.8)
+    travis (1.8.9)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -164,16 +180,17 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket (1.2.5)
-    websocket-driver (0.6.5)
+    websocket (1.2.8)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    will_paginate (3.1.5)
+    websocket-extensions (0.1.3)
+    will_paginate (3.1.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_model_serializers
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
   algoliasearch (>= 1.17.0, < 2.0.0)
@@ -191,4 +208,4 @@ DEPENDENCIES
   will_paginate (>= 2.3.15)
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/README.md

@@ -1,8 +1,7 @@
 
 # Algolia Search API Client for Rails
 
-[Algolia Search](https://www.algolia.com) is a hosted full-text, numerical,
-and faceted search engine capable of delivering realtime results from the first keystroke.
+[Algolia Search](https://www.algolia.com) is a hosted search engine capable of delivering real-time results from the first keystroke.
 
 [![Build Status](https://travis-ci.org/algolia/algoliasearch-rails.svg?branch=master)](https://travis-ci.org/algolia/algoliasearch-rails) [![Gem Version](https://badge.fury.io/rb/algoliasearch-rails.svg)](http://badge.fury.io/rb/algoliasearch-rails) [![Code Climate](https://codeclimate.com/github/algolia/algoliasearch-rails.svg)](https://codeclimate.com/github/algolia/algoliasearch-rails) ![ActiveRecord](https://img.shields.io/badge/ActiveRecord-yes-blue.svg?style=flat-square) ![Mongoid](https://img.shields.io/badge/Mongoid-yes-blue.svg?style=flat-square) ![Sequel](https://img.shields.io/badge/Sequel-yes-blue.svg?style=flat-square)
 
@@ -16,7 +15,7 @@ You might be interested in the sample Ruby on Rails application providing a `aut
 
 ## API Documentation
 
-You can find the full reference on [Algolia's website](https://www.algolia.com/doc/api-client/rails/).
+You can find the full reference on [Algolia's website](https://www.algolia.com/doc/framework-integration/rails/).
 
 
 
@@ -68,7 +67,6 @@ You can find the full reference on [Algolia's website](https://www.algolia.com/d
 
 
 
-
 # Setup
 
 
@@ -131,7 +129,6 @@ Contact.algolia_search("jon doe") # <=> Contact.search("jon doe")
 
 
 
-
 # Usage
 
 
@@ -406,7 +403,7 @@ Product.search_for_facet_values('category', 'phone', {
 ## Group by
 
 More info on distinct for grouping can be found
-[here](https://www.algolia.com/doc/guides/ranking/distinct/).
+[here](https://www.algolia.com/doc/guides/managing-results/refine-results/grouping/).
 
 ```ruby
 class Contact < ActiveRecord::Base
@@ -440,7 +437,6 @@ At query time, specify <code>{ aroundLatLng: "37.33, -121.89", aroundRadius: 500
 
 
 
-
 # Options
 
 
@@ -935,7 +931,6 @@ end
 
 
 
-
 # Indices
 
 
@@ -1118,7 +1113,6 @@ Book.search 'foo bar', index: 'Book_by_editor'
 
 
 
-
 # Testing
 
 

data/lib/algoliasearch-rails.rb

@@ -47,20 +47,43 @@ module AlgoliaSearch
   end
 
   class IndexSettings
+    DEFAULT_BATCH_SIZE = 1000
 
     # AlgoliaSearch settings
-    OPTIONS = [:minWordSizefor1Typo, :minWordSizefor2Typos, :typoTolerance,
-      :hitsPerPage, :attributesToRetrieve,
-      :attributesToHighlight, :attributesToSnippet, :attributesToIndex, :searchableAttributes,
-      :highlightPreTag, :highlightPostTag,
-      :ranking, :customRanking, :queryType, :attributesForFaceting,
-      :separatorsToIndex, :optionalWords, :attributeForDistinct,
-      :synonyms, :placeholders, :removeWordsIfNoResults, :replaceSynonymsInHighlight,
-      :unretrievableAttributes, :disableTypoToleranceOnWords, :disableTypoToleranceOnAttributes, :altCorrections,
-      :ignorePlurals, :maxValuesPerFacet, :distinct, :numericAttributesToIndex, :numericAttributesForFiltering,
-      :allowTyposOnNumericTokens, :allowCompressionOfIntegerArray,
-      :advancedSyntax, :disablePrefixOnAttributes,
-      :paginationLimitedTo]
+    OPTIONS = [
+      # Attributes
+      :searchableAttributes, :attributesForFaceting, :unretrievableAttributes, :attributesToRetrieve,
+      :attributesToIndex, #Legacy name of searchableAttributes
+      # Ranking
+      :ranking, :customRanking, # Replicas are handled via `add_replica`
+      # Faceting
+      :maxValuesPerFacet, :sortFacetValuesBy,
+      # Highlighting / Snippeting
+      :attributesToHighlight, :attributesToSnippet, :highlightPreTag, :highlightPostTag,
+      :snippetEllipsisText, :restrictHighlightAndSnippetArrays,
+      # Pagination
+      :hitsPerPage, :paginationLimitedTo,
+      # Typo
+      :minWordSizefor1Typo, :minWordSizefor2Typos, :typoTolerance, :allowTyposOnNumericTokens,
+      :disableTypoToleranceOnAttributes, :disableTypoToleranceOnWords, :separatorsToIndex,
+      # Language
+      :ignorePlurals, :removeStopWords, :camelCaseAttributes, :decompoundedAttributes,
+      :keepDiacriticsOnCharacters, :queryLanguages,
+      # Query Rules
+      :enableRules,
+      # Query Strategy
+      :queryType, :removeWordsIfNoResults, :advancedSyntax, :optionalWords,
+      :disablePrefixOnAttributes, :disableExactOnAttributes, :exactOnSingleWordQuery, :alternativesAsExact,
+      # Performance
+      :numericAttributesForFiltering, :allowCompressionOfIntegerArray,
+      :numericAttributesToIndex, # Legacy name of numericAttributesForFiltering
+      # Advanced
+      :attributeForDistinct, :distinct, :replaceSynonymsInHighlight, :minProximity, :responseFields,
+      :maxFacetHits,
+
+      # Rails-specific
+      :synonyms, :placeholders, :altCorrections,
+    ]
     OPTIONS.each do |k|
       define_method k do |v|
         instance_variable_set("@#{k}", v)
@@ -72,6 +95,11 @@ module AlgoliaSearch
       instance_exec(&block) if block
     end
 
+    def use_serializer(serializer)
+      @serializer = serializer
+      # instance_variable_set("@serializer", serializer)
+    end
+
     def attribute(*names, &block)
       raise ArgumentError.new('Cannot pass multiple attribute names if block given') if block_given? and names.length > 1
       raise ArgumentError.new('Cannot specify additional attributes on a replica index') if @options[:slave] || @options[:replica]
@@ -118,15 +146,7 @@ module AlgoliaSearch
     end
 
     def get_attribute_names(object)
-      res = if @attributes.nil? || @attributes.length == 0
-        get_default_attributes(object).keys
-      else
-        @attributes.keys
-      end
-
-      res += @additional_attributes.keys if @additional_attributes
-
-      res
+      get_attributes(object).keys
     end
 
     def attributes_to_hash(attributes, object)
@@ -138,19 +158,27 @@ module AlgoliaSearch
     end
 
     def get_attributes(object)
-      attributes = if @attributes.nil? || @attributes.length == 0
-        get_default_attributes(object)
+      # If a serializer is set, we ignore attributes
+      # everything should be done via the serializer
+      if not @serializer.nil?
+        attributes = @serializer.new(object).attributes
       else
-        if is_active_record?(object)
-          object.class.unscoped do
-            attributes_to_hash(@attributes, object)
-          end
+        if @attributes.nil? || @attributes.length == 0
+          # no `attribute ...` have been configured, use the default attributes of the model
+          attributes = get_default_attributes(object)
         else
-          attributes_to_hash(@attributes, object)
+          # at least 1 `attribute ...` has been configured, therefore use ONLY the one configured
+          if is_active_record?(object)
+            object.class.unscoped do
+              attributes = attributes_to_hash(@attributes, object)
+            end
+          else
+            attributes = attributes_to_hash(@attributes, object)
+          end
         end
       end
 
-      attributes.merge!(attributes_to_hash(@additional_attributes, object))
+      attributes.merge!(attributes_to_hash(@additional_attributes, object)) if @additional_attributes
 
       if @options[:sanitize]
         sanitizer = begin
@@ -478,7 +506,7 @@ module AlgoliaSearch
       Thread.current["algolia_without_auto_index_scope_for_#{self.model_name}"]
     end
 
-    def algolia_reindex!(batch_size = 1000, synchronous = false)
+    def algolia_reindex!(batch_size = AlgoliaSearch::IndexSettings::DEFAULT_BATCH_SIZE, synchronous = false)
       return if algolia_without_auto_index_scope
       algolia_configurations.each do |options, settings|
         next if algolia_indexing_disabled?(options)
@@ -509,7 +537,7 @@ module AlgoliaSearch
     end
 
     # reindex whole database using a extra temporary index + move operation
-    def algolia_reindex(batch_size = 1000, synchronous = false)
+    def algolia_reindex(batch_size = AlgoliaSearch::IndexSettings::DEFAULT_BATCH_SIZE, synchronous = false)
       return if algolia_without_auto_index_scope
       algolia_configurations.each do |options, settings|
         next if algolia_indexing_disabled?(options)

data/lib/algoliasearch/version.rb

@@ -1,3 +1,3 @@
 module AlgoliaSearch
-  VERSION = '1.20.6'
+  VERSION = '1.21.0'
 end

data/spec/spec_helper.rb

@@ -26,11 +26,26 @@ RSpec.configure do |c|
       example.run
     }
   end
+
+  # Remove all indexes setup in this run in local or CI
+  c.after(:suite) do
+    safe_index_list.each do |index|
+      Algolia.client.delete_index!(index['name'])
+    end
+  end
 end
 
-# avoid concurrent access to the same index
+# A unique prefix for your test run in local or CI
+SAFE_INDEX_PREFIX = "rails_#{SecureRandom.hex(8)}".freeze
+
+# avoid concurrent access to the same index in local or CI
 def safe_index_name(name)
-  return name if ENV['TRAVIS'].to_s != "true"
-  id = ENV['TRAVIS_JOB_NUMBER']
-  "TRAVIS_RAILS_#{name}_#{id}"
+  "#{SAFE_INDEX_PREFIX}_#{name}"
+end
+
+# get a list of safe indexes in local or CI
+def safe_index_list
+  list = Algolia.client.list_indexes()['items']
+  list = list.select { |index| index["name"].include?(SAFE_INDEX_PREFIX) }
+  list.sort_by { |index| index["primary"] || "" }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.20.6
+  version: 1.21.0
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -188,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: AlgoliaSearch integration to your favorite ORM