algoliasearch-rails 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6196220d77f0814eb40d2b9bd099bca91a2324fa
-  data.tar.gz: 63f5d687166324650b122dd41d3662bbdcfefa31
+  metadata.gz: 675a8f42e7841895e66f88e9f4d550b59222d4e5
+  data.tar.gz: f832cadef3b8bef0c50b4f49f474423d1c40e3b2
 SHA512:
-  metadata.gz: d9487f03e8c3ff584f7765d912181cd91a1d2d114f331de301e5065d08a78d9dc9d52f8a0ec645a6c421a09d23e6cdbabd601638a6466268b8678184eef75a20
-  data.tar.gz: cffab279a78865d7974113f629be7833ce1c7cd074ae56838336a67b2b6a55266089615faa817afe8e5fbabb1d084e02683edb024296d3ad23d1d48fef80485a
+  metadata.gz: 10324137c57a424b127bdf4440bcc326e5c44f3558411973b76a83083d22f514d78b354c6c47cfbfa876c537d067d91b8896a867ef6ae48874dbd6be258086f6
+  data.tar.gz: 1a717beffdfe5507c5bf954e2dd6e6f29f2a157a1d1799b20f523993496b2cd134205a0d73cf8d2fe1781236805f0e3f09a9293c3ba6fef09c52227d6f315fa7

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
 - 2.0.0
 - 2.1.0
 - jruby
-- rbx
+- rbx-2
 env:
   global:
   - secure: wRDLGbg+GS7Eo6KhjyAA6YNm6rFVo8j53b0oEZLBkJ2VzvLsKMnpEfopzc0W2wttgVwgkX8C/9adbd/BPsEYbpO+uJFt5DX3A2HVVXCZ2jP0TgLj2m4dOA4ohroYDcdeB0fuZM7a7hvFNswd9vSRLmes6vLQ0GcFTSz1rWQLf6U=

data/ChangeLog

@@ -1,5 +1,9 @@
 CHANGELOG
 
+2014-06-17 1.10.3
+
+      * Kaminari: pad the result array to match the options/offset parameters
+
 2014-05-09 1.10.2
 
       * Expose synoyms/placeholders features

data/Gemfile

@@ -5,7 +5,7 @@ gem 'algoliasearch', '~> 1.2'
 gem 'rubysl', '~> 2.0', :platform => :rbx
 
 group :test do 
-  gem 'rspec', '>= 2.5.0'
+  gem 'rspec', '>= 2.5.0', '< 3.0'
   gem 'rails', '>= 3.2.0', '< 4.0'
   gem 'sqlite3', :platform => [:rbx, :ruby]
   gem 'jdbc-sqlite3', :platform => :jruby

data/Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.9.5)
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    ZenTest (4.10.0)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
       mail (~> 2.5.4)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -15,23 +15,23 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.6)
+    activerecord-jdbc-adapter (1.3.7)
       activerecord (>= 2.2)
-    activerecord-jdbcsqlite3-adapter (1.3.6)
-      activerecord-jdbc-adapter (~> 1.3.6)
+    activerecord-jdbcsqlite3-adapter (1.3.7)
+      activerecord-jdbc-adapter (~> 1.3.7)
       jdbc-sqlite3 (~> 3.7.2)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
@@ -51,10 +51,10 @@ GEM
     erubis (2.7.0)
     ethon (0.7.0)
       ffi (>= 1.3.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     ffi (1.9.3)
     ffi (1.9.3-java)
     ffi2-generators (0.1.1)
@@ -73,7 +73,7 @@ GEM
     journey (1.0.4)
     json (1.8.1)
     json (1.8.1-java)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.2)
@@ -86,11 +86,11 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    multi_json (1.9.2)
-    multipart-post (1.2.0)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -100,8 +100,9 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
       spoon (~> 0.0)
-    pusher-client (0.4.0)
-      websocket (~> 1.0.0)
+    pusher-client (0.6.0)
+      json
+      websocket (~> 1.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -109,17 +110,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
       bundler (~> 1.0)
-      railties (= 3.2.17)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+      railties (= 3.2.18)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -128,14 +129,14 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     redgreen (1.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.0)
+    rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec-mocks (2.99.0)
     rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -351,24 +352,24 @@ GEM
       ffi (>= 1.0.0)
     thor (0.19.1)
     tilt (1.4.1)
-    travis (1.6.8)
+    travis (1.6.11)
       addressable (~> 2.3)
       backports
-      faraday (~> 0.8.7)
+      faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       gh (~> 0.13)
       highline (~> 1.6)
       launchy (~> 2.1)
       pry (~> 0.9)
       pusher-client (~> 0.4)
-      typhoeus (~> 0.6)
+      typhoeus (~> 0.6, >= 0.6.8)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     typhoeus (0.6.8)
       ethon (>= 0.7.0)
     tzinfo (0.3.39)
-    websocket (1.0.7)
+    websocket (1.1.4)
     will_paginate (3.0.5)
 
 PLATFORMS
@@ -389,7 +390,7 @@ DEPENDENCIES
   rake (~> 10.1.0)
   rdoc
   redgreen
-  rspec (>= 2.5.0)
+  rspec (>= 2.5.0, < 3.0)
   rubysl (~> 2.0)
   sqlite3
   travis

data/README.md

@@ -25,6 +25,7 @@ Table of Content
 1. [Faceting](#faceting)
 1. [Geo-search](#geo-search)
 1. [Typeahead UI](#typeahead-ui)
+1. [Caveats](#caveats)
 1. [Note on testing](#note-on-testing)
 
 Install
@@ -567,8 +568,35 @@ Turns any ```input[type="text"]``` element into a typeahead, for example:
 </script>
 ```
 
+Caveats
+--------
+
+This gem makes intensive use of Rails' callbacks to trigger the indexing tasks. If you're using methods bypassing ```after_validation```, ```before_save``` or ```after_save``` callbacks, it will not index your changes. For example: ```update_attribute``` doesn't perform validations checks, to perform validations when updating use ```update_attributes```.
 
 Note on testing
 -----------------
 
 To run the specs, please set the <code>ALGOLIA_APPLICATION_ID</code> and <code>ALGOLIA_API_KEY</code> environment variables. Since the tests are creating and removing indexes, DO NOT use your production account.
+
+You may want to mock Algolia's API calls. We provide a [WebMock](https://github.com/bblimke/webmock) configuration that you can use including `algolia/webmock`:
+
+```ruby
+require 'algolia/webmock'
+
+describe 'With a mocked client' do
+
+  before(:each) do
+    WebMock.enable!
+  end
+
+  it "shouldn't perform any API calls here" do
+    User.create(name: 'My Indexed User')  # mocked, no API call performed
+    User.search('').should == {}          # mocked, no API call performed
+  end
+
+  after(:each) do
+    WebMock.disable!
+  end
+
+end
+```

data/VERSION

@@ -1 +1 @@
-1.10.2
+1.10.3

data/algoliasearch-rails.gemspec

@@ -6,11 +6,11 @@
 
 Gem::Specification.new do |s|
   s.name = "algoliasearch-rails"
-  s.version = "1.10.2"
+  s.version = "1.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Algolia"]
-  s.date = "2014-04-29"
+  s.date = "2014-06-17"
   s.description = "AlgoliaSearch integration to your favorite ORM"
   s.email = "contact@algolia.com"
   s.extra_rdoc_files = [

data/lib/algoliasearch/pagination/kaminari.rb

@@ -24,7 +24,15 @@ module AlgoliaSearch
 
       class << self
         def create(results, total_hits, options = {})
-          new results, :offset => ((options[:page] - 1) * options[:per_page]), :limit => options[:per_page], :total_count => total_hits
+          offset = ((options[:page] - 1) * options[:per_page])
+          array = new results, :offset => offset, :limit => options[:per_page], :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
+          end
+          array
         end
       end
     end

data/lib/algoliasearch-rails.rb

@@ -175,7 +175,7 @@ module AlgoliaSearch
       attr_accessor :highlight_result
 
       if options[:synchronous] == true
-        after_validation :algolia_mark_synchronous if respond_to?(:before_validation)
+        after_validation :algolia_mark_synchronous if respond_to?(:after_validation)
       end
       unless options[:auto_index] == false
         after_validation :algolia_mark_must_reindex if respond_to?(:after_validation)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json