outoftime-sunspot 0.9.5 → 0.9.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 6
 :major: 0
 :minor: 9

data/lib/sunspot/search/hit.rb

@@ -57,6 +57,10 @@ module Sunspot
         end
         @instance
       end
+
+      def inspect
+        "#<Sunspot::Search::Hit:#{@class_name} #{@primary_key}>"
+      end
     end
   end
 end

data/lib/sunspot/search.rb

@@ -159,16 +159,14 @@ module Sunspot
     end
 
     def populate_hits! #:nodoc:
-      type_hit_hash = Hash.new { |h, k| h[k] = [] }
-      id_hit_hash = {}
-      for hit in hits
-        type_hit_hash[hit.class_name] << hit
-        id_hit_hash[hit.primary_key] = hit
+      id_hit_hash = Hash.new { |h, k| h[k] = {} }
+      hits.each do |hit|
+        id_hit_hash[hit.class_name][hit.primary_key] = hit
       end
-      type_hit_hash.each_pair do |class_name, hits|
-        ids = hits.map { |hit| hit.primary_key }
-        for instance in data_accessor_for(Util.full_const_get(class_name)).load_all(ids)
-          hit = id_hit_hash[Adapters::InstanceAdapter.adapt(instance).id.to_s]
+      id_hit_hash.each_pair do |class_name, hits|
+        ids = hits.map { |id, hit| hit.primary_key }
+        data_accessor_for(Util.full_const_get(class_name)).load_all(ids).each do |instance|
+          hit = id_hit_hash[class_name][Adapters::InstanceAdapter.adapt(instance).id.to_s]
           hit.instance = instance
         end
       end

data/spec/api/search_retrieval_spec.rb

@@ -15,6 +15,16 @@ describe 'retrieving search' do
     session.search(Post).results.should == [post_2, post_1]
   end
 
+  # This is a reduction of a crazy bug I found in production where some hits
+  # were inexplicably not being populated.
+  it 'properly loads results of multiple classes that have the same primary key' do
+    Post.reset!
+    Namespaced::Comment.reset!
+    results = [Post.new, Namespaced::Comment.new]
+    stub_results(*results)
+    session.search(Post, Namespaced::Comment).results.should == results
+  end
+
   if ENV['USE_WILL_PAGINATE']
 
     it 'should return search total as attribute of results if pagination is provided' do

data/spec/mocks/mock_record.rb

@@ -5,6 +5,13 @@ class MockRecord
 
   attr_reader :id
 
+  class <<self
+    def reset!
+      IDS[name.to_sym] = 0
+      INSTANCES[name.to_sym] = {}
+    end
+  end
+
   def initialize(attrs = {})
     attrs.each_pair do |name, value|
       send(:"#{name}=", value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency