algoliasearch-rails 1.19.1 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f4ced41b37b645e2cce5d67f805d42850e029a
-  data.tar.gz: a796b183866ab727b38d31be8235a3a8ff3883bb
+  metadata.gz: f7333f262a5b1e9d919ca00b85931fb980e4ecc0
+  data.tar.gz: 7337128b35c33d12690b1eaba6bf659e1df0f03f
 SHA512:
-  metadata.gz: b31dbca7392ef79fa82ca7f949318e5365543797fa612cc0dad7cc0e453f57dc412e13c25acc1b24b7f0140944576bbe5de60e5d6bcc59f429d29a00e28db17c
-  data.tar.gz: b0c7c3b271489fc8a10caf5a460e3bb236caa5992b98fe422581f219b07881386c126fcd3b8b1980dee556d34fe1e59a72da5a5e2a9c8ada8b0a9bee4662a641
+  metadata.gz: c300e5f50274dc54ed86224bb4c39c853e69473201a6a556c08bbe5f8868f2189ffbbecd1de6e26574831b3e42b73f8fba2254a8be41000b724347fc10c21782
+  data.tar.gz: 615ecacfba423c91e3f3e569041f82826fa778894be4c0b2ede19dfb00b3f7bdda723c6a87b57c2ef1b8514dde2bf3bd9cfce32b3202660d3faa8dd0ebf7e7e9

data/.travis.yml

@@ -15,13 +15,17 @@ matrix:
   - rvm: 2.2.5
     env: RAILS_VERSION=4.2
   - rvm: 2.2.5
-    env: RAILS_VERSION=5.0
-  - rvm: 2.3.1
+    env: RAILS_VERSION=5.1
+  - rvm: 2.3.4
     env: RAILS_VERSION=3.2.0
-  - rvm: 2.3.1
+  - rvm: 2.3.4
     env: RAILS_VERSION=4.2
-  - rvm: 2.3.1
-    env: RAILS_VERSION=5.0
+  - rvm: 2.3.4
+    env: RAILS_VERSION=5.1
+  - rvm: 2.4.1
+    env: RAILS_VERSION=4.2
+  - rvm: 2.4.1
+    env: RAILS_VERSION=5.1
   # - rvm: jruby-9.1.2.0
   #   env: RAILS_VERSION=3.2.0
   # - rvm: jruby-9.1.2.0
@@ -47,5 +51,5 @@ install: rm -f Gemfile.lock && bundle install
 cache: bundler
 env:
   global:
-  - secure: kD+PX8ZNg+AAzyr6WYs1vp9teAkzMfEoYkIMI0hrRN0ml9ccJVsJR1pIGpaIwyCa5PmFtCZ1Xi2vFb4XzTTeaZoHHS/ll9LwuQH6mwvdgj3n6TmNRdq3b/oGRHBX4Z0HMobqaftuzY/V8iTpVk92jwIY8NPj00k055b2jrKqhdw=
-  - secure: Eai99h4K7s9/Sh3CHClWs3IQNaEUdVagpmA/A8m0rysGBAYJdMKbUOp9DZPAmCnT+06l0aFv87+CRYtgyX05pE5f21nqBOU46eKS38cLif3aPTwFmwokf28WLDgmZKa/zJp767SiQ/dp0hz+LJrkJvkDRnA1un36f7wiyY9xnYs=
+  - secure: "o/Hi/6KnBugN5P/cpVtpwyKrK5fVzAc0efw+qZ9ZqwqZN0GmipZrHmRNuLVUxVf+CIcqfLpIT0U172XGOZ5zJ1gs3qZZrDsJ1ptXnPyvvCrw+VX5yGhMh67JnlO0WLWvci0WdltJTmrhCoLSSw39nCPswC7I6/hai4KyiOXoMk4="
+  - secure: "Jv9jOYRwJq5i17Int/p75330yxCJXKLYlstHuBjwkKa6anJHFSXQaAxWj8sZHCY4IAVDsBfdi0j6S3dtVu2LaVLA3hfPp36YRVolSZu9zLbGqyPKBWM7E3i7GkS3Jub0nMV3Yo3cMeiFzQ4BmpSQOYo0biCkL8bh4/5NRZ7Q6VI="

data/ChangeLog

@@ -1,5 +1,12 @@
 CHANGELOG
 
+2017-07-31 1.20.0
+
+      * Override the user-agent (#238)
+      * Fixed NPE while running mocked tests (#242)
+      * Add `paginationLimitedTo` setting (#243)
+      * Make `algolia_without_auto_index_scope` thread-safe (#234)
+
 2017-03-13 1.19.1
 
       * Make sure get_model_classes is not ActiveRecord compliant only

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
-gem 'json', '~> 1.5', '>= 1.5.1'
-gem 'algoliasearch', '~> 1.12.4'
+gem 'json', '~> 1.8', '>= 1.8.6'
+gem 'algoliasearch', '~> 1.14.0'
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   gem 'rubysl', '~> 2.0', :platform => :rbx

data/Gemfile.lock

@@ -39,7 +39,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    algoliasearch (1.12.7)
+    algoliasearch (1.14.0)
       httpclient (~> 2.8.3)
       json (>= 1.5.1)
     arel (7.1.4)
@@ -175,9 +175,9 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  algoliasearch (~> 1.12.4)
+  algoliasearch (~> 1.14.0)
   jdbc-sqlite3
-  json (~> 1.5, >= 1.5.1)
+  json (~> 1.8, >= 1.8.6)
   kaminari
   rails (>= 3.2.0)
   rake (~> 10.1.0)
@@ -190,4 +190,4 @@ DEPENDENCIES
   will_paginate (>= 2.3.15)
 
 BUNDLED WITH
-   1.13.6
+   1.15.3

data/README.md

@@ -291,8 +291,8 @@ class Contact < ActiveRecord::Base
     attribute :first_name, :last_name, :email
 
     # default search parameters stored in the index settings
-    minWordSizeForApprox1 4
-    minWordSizeForApprox2 8
+    minWordSizefor1Typo 4
+    minWordSizefor2Typos 8
     hitsPerPage 42
   end
 end
@@ -531,8 +531,16 @@ end
 
 class MySidekiqWorker
   def perform(id, remove)
-    c = Contact.find(id)
-    remove ? c.remove_from_index! : c.index!
+    if remove
+      # the record has likely already been removed from your database so we cannot
+      # use ActiveRecord#find to load it
+      index = Algolia::Index.new("index_name")
+      index.delete_object(id)
+    else
+      # the record should be present
+      c = Contact.find(id)
+      c.index!
+    end
   end
 end
 ```

data/algoliasearch-rails.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-VERSION = File.read(File.join(File.dirname(__FILE__), 'VERSION')).strip
+require File.join(File.dirname(__FILE__), 'lib', 'algoliasearch', 'version')
 
 Gem::Specification.new do |s|
   s.name = "algoliasearch-rails"
-  s.version = VERSION
+  s.version = AlgoliaSearch::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Algolia"]
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.md",
     "Rakefile",
-    "VERSION",
     "algoliasearch-rails.gemspec",
     "lib/algoliasearch-rails.rb",
     "lib/algoliasearch/algolia_job.rb",
@@ -37,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/algoliasearch/railtie.rb",
     "lib/algoliasearch/tasks/algoliasearch.rake",
     "lib/algoliasearch/utilities.rb",
+    "lib/algoliasearch/version.rb",
     "spec/spec_helper.rb",
     "spec/utilities_spec.rb",
     "vendor/assets/javascripts/algolia/algoliasearch.angular.js",
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<algoliasearch>, ["~> 1.12.4"])
+      s.add_runtime_dependency(%q<algoliasearch>, ["~> 1.14.0"])
       s.add_development_dependency(%q<will_paginate>, [">= 2.3.15"])
       s.add_development_dependency(%q<kaminari>, [">= 0"])
       s.add_development_dependency "travis"
@@ -85,11 +85,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency "rdoc"
     else
       s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<algoliasearch>, ["~> 1.12.1"])
+      s.add_dependency(%q<algoliasearch>, ["~> 1.14.0"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<algoliasearch>, ["~> 1.12.1"])
+    s.add_dependency(%q<algoliasearch>, ["~> 1.14.0"])
   end
 end
 

data/lib/algoliasearch-rails.rb

@@ -8,6 +8,7 @@ rescue => e
 end
 require 'algoliasearch'
 
+require 'algoliasearch/version'
 require 'algoliasearch/utilities'
 
 if defined? Rails
@@ -66,7 +67,8 @@ module AlgoliaSearch
       :unretrievableAttributes, :disableTypoToleranceOnWords, :disableTypoToleranceOnAttributes, :altCorrections,
       :ignorePlurals, :maxValuesPerFacet, :distinct, :numericAttributesToIndex, :numericAttributesForFiltering,
       :allowTyposOnNumericTokens, :allowCompressionOfIntegerArray,
-      :advancedSyntax, :disablePrefixOnAttributes, :disableTypoToleranceOnAttributes]
+      :advancedSyntax, :disablePrefixOnAttributes, :disableTypoToleranceOnAttributes,
+      :paginationLimitedTo]
     OPTIONS.each do |k|
       define_method k do |v|
         instance_variable_set("@#{k}", v)
@@ -400,7 +402,7 @@ module AlgoliaSearch
           raise ArgumentError.new("Invalid `enqueue` option: #{options[:enqueue]}")
         end
         algoliasearch_options[:enqueue] = Proc.new do |record, remove|
-          proc.call(record, remove) unless @algolia_without_auto_index_scope
+          proc.call(record, remove) unless algolia_without_auto_index_scope
         end
       end
       unless options[:auto_index] == false
@@ -456,16 +458,24 @@ module AlgoliaSearch
     end
 
     def algolia_without_auto_index(&block)
-      @algolia_without_auto_index_scope = true
+      self.algolia_without_auto_index_scope = true
       begin
         yield
       ensure
-        @algolia_without_auto_index_scope = false
+        self.algolia_without_auto_index_scope = false
       end
     end
 
+    def algolia_without_auto_index_scope=(value)
+      Thread.current["algolia_without_auto_index_scope_for_#{self.model_name}"] = value
+    end
+
+    def algolia_without_auto_index_scope
+      Thread.current["algolia_without_auto_index_scope_for_#{self.model_name}"]
+    end
+
     def algolia_reindex!(batch_size = 1000, synchronous = false)
-      return if @algolia_without_auto_index_scope
+      return if algolia_without_auto_index_scope
       algolia_configurations.each do |options, settings|
         next if algolia_indexing_disabled?(options)
         index = algolia_ensure_init(options, settings)
@@ -496,7 +506,7 @@ module AlgoliaSearch
 
     # reindex whole database using a extra temporary index + move operation
     def algolia_reindex(batch_size = 1000, synchronous = false)
-      return if @algolia_without_auto_index_scope
+      return if algolia_without_auto_index_scope
       algolia_configurations.each do |options, settings|
         next if algolia_indexing_disabled?(options)
         next if options[:slave] || options[:replica]
@@ -545,7 +555,7 @@ module AlgoliaSearch
     end
 
     def algolia_index!(object, synchronous = false)
-      return if @algolia_without_auto_index_scope
+      return if algolia_without_auto_index_scope
       algolia_configurations.each do |options, settings|
         next if algolia_indexing_disabled?(options)
         object_id = algolia_object_id_of(object, options)
@@ -571,7 +581,7 @@ module AlgoliaSearch
     end
 
     def algolia_remove_from_index!(object, synchronous = false)
-      return if @algolia_without_auto_index_scope
+      return if algolia_without_auto_index_scope
       object_id = algolia_object_id_of(object)
       raise ArgumentError.new("Cannot index a record with a blank objectID") if object_id.blank?
       algolia_configurations.each do |options, settings|
@@ -656,9 +666,9 @@ module AlgoliaSearch
         end
       end.compact
       # Algolia has a default limit of 1000 retrievable hits
-      total_hits = json['nbHits'] < json['nbPages'] * json['hitsPerPage'] ?
-        json['nbHits'] : json['nbPages'] * json['hitsPerPage']
-      res = AlgoliaSearch::Pagination.create(results, total_hits, algoliasearch_options.merge({ :page => json['page'] + 1, :per_page => json['hitsPerPage'] }))
+      total_hits = json['nbHits'].to_i < json['nbPages'].to_i * json['hitsPerPage'].to_i ?
+        json['nbHits'].to_i: json['nbPages'].to_i * json['hitsPerPage'].to_i
+      res = AlgoliaSearch::Pagination.create(results, total_hits, algoliasearch_options.merge({ :page => json['page'].to_i + 1, :per_page => json['hitsPerPage'] }))
       res.extend(AdditionalMethods)
       res.send(:algolia_init_raw_answer, json)
       res

data/lib/algoliasearch/configuration.rb

@@ -5,7 +5,7 @@ module AlgoliaSearch
     end
 
     def configuration=(configuration)
-      @@configuration = configuration
+      @@configuration = configuration.merge(:user_agent => "Algolia for Rails (#{AlgoliaSearch::VERSION}); Algolia for Ruby (#{Algolia::VERSION})")
       Algolia.init @@configuration
     end
   end

data/lib/algoliasearch/utilities.rb

@@ -20,10 +20,8 @@ module AlgoliaSearch
         puts ''
 
         klasses.each do |klass|
-          say "#{klass}:"
-
-          say "Reindexing #{klass.count} records...", true
-
+          puts klass
+          puts "Reindexing #{klass.count} records..."
           klass.algolia_reindex
         end
       end

data/lib/algoliasearch/version.rb

@@ -0,0 +1,3 @@
+module AlgoliaSearch
+  VERSION = '1.20.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.4
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.4
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - algoliasearch-rails.gemspec
 - lib/algoliasearch-rails.rb
 - lib/algoliasearch/algolia_job.rb
@@ -137,6 +136,7 @@ files:
 - lib/algoliasearch/railtie.rb
 - lib/algoliasearch/tasks/algoliasearch.rake
 - lib/algoliasearch/utilities.rb
+- lib/algoliasearch/version.rb
 - spec/spec_helper.rb
 - spec/utilities_spec.rb
 - vendor/assets/javascripts/algolia/algoliasearch.angular.js

data/VERSION

@@ -1 +0,0 @@
-1.19.1