algoliasearch-rails 1.10.6 → 1.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abd869d8b7021676051417ff8f3a54d64cd6c01
-  data.tar.gz: d84fbe3c59f997e518c27393b3c7b70d315c6c49
+  metadata.gz: 80b4afee8f3b76e7ae6bc4a85e36f7a2ac11404d
+  data.tar.gz: 293b6baee5f060f5524ae2f573c9bccdb044e4fa
 SHA512:
-  metadata.gz: f3023ccffd38aab0ad8f2bcf657fcdb1bfc027bc1b8fd78bd50184881f8e1cb25e24f318bc30ceb960d2d7421264f4c967385d8f08818749d4aac773f7cff725
-  data.tar.gz: 3286d414ed42da850ff3640c5f15d78296ea1feb4c250404acbe0d26fa0f883066f3bc27e8da292ff8e1f8770619d1a8f4ed1e1f52df41c930348c2a5a9c9602
+  metadata.gz: a471bf1df7cf7d5c4a2645b8aaeff63baaf7e7e2dc970e33e07a7e23fe6d5cfc48d0e773c06ca730ff5bc55b4263449ef25018e9128a0e01dacdd67485d3c27e
+  data.tar.gz: e6c60c16d668d91e7960ee79532d20567e6d29d9fdf1c51948f05358eec0759749ee0adc1999eaeb00e35d7e3ad3ec07952eb547c5a0771c3e71f390efd46df3

data/ChangeLog

@@ -1,5 +1,9 @@
 CHANGELOG
 
+2014-07-17 1.10.7
+
+      * Query optimization: load search results from database using a single query (author: @outoftime)
+
 2014-07-10 1.10.6
 
       * Pass the configuration hash to the underlying ```Algolia.init``` method.

data/VERSION

@@ -1 +1 @@
-1.10.6
+1.10.7

data/algoliasearch-rails.gemspec

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

data/lib/algoliasearch-rails.rb

@@ -86,11 +86,20 @@ module AlgoliaSearch
     alias :add_attributes :add_attribute
 
     def get_attributes(object)
-      object.class.unscoped do
+      clazz = object.class
+      if defined?(::Mongoid::Document) && clazz.include?(::Mongoid::Document)
+        # work-around mongoid 2.4's unscoped method, not accepting a block
         res = @attributes.nil? || @attributes.length == 0 ? object.attributes :
           Hash[@attributes.map { |name, value| [name.to_s, value.call(object) ] }]
         @additional_attributes.each { |name, value| res[name.to_s] = value.call(object) } if @additional_attributes
         res
+      else
+        object.class.unscoped do
+          res = @attributes.nil? || @attributes.length == 0 ? object.attributes :
+            Hash[@attributes.map { |name, value| [name.to_s, value.call(object) ] }]
+          @additional_attributes.each { |name, value| res[name.to_s] = value.call(object) } if @additional_attributes
+          res
+        end
       end
     end
 
@@ -347,8 +356,12 @@ module AlgoliaSearch
         params[:page] -= 1 if params[:page].to_i > 0
       end
       json = algolia_raw_search(q, params)
+      hit_ids = json['hits'].map { |hit| hit['objectID'] }
+      results_by_id = algoliasearch_options[:type].where(algolia_object_id_method => hit_ids).index_by do |hit|
+        algolia_object_id_of(hit)
+      end
       results = json['hits'].map do |hit|
-        o = algoliasearch_options[:type].where(algolia_object_id_method => hit['objectID']).first
+        o = results_by_id[hit['objectID']]
         if o
           o.highlight_result = hit['_highlightResult']
           o

metadata

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