sunspot 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.4 2010-03-19
+* Update solr-spatial-light to 0.0.5
+  * Fix NullPointerException in repeated geo search
+  * Fix missing distances in repeated geo search
+* Don't query the data store more than once when results are missing
+
 == 1.0.2 2010-03-11
 * Restore Hit#distance for result geo distance
 * Remove :distance special sort

data/README.rdoc

@@ -13,6 +13,9 @@ objects such as the filesystem.
 
 === Where to learn all about Sunspot: The Wiki!
 
+New to Sunspot and using Rails? Check out {Adding Sunspot search to Rails in 5
+minutes or less}[http://wiki.github.com/outoftime/sunspot/adding-sunspot-search-to-rails-in-5-minutes-or-less].
+
 This README is intended as a quick primer on what Sunspot is capable of; for
 detailed treatment of Sunspot's full feature range, check out the wiki:
 http://wiki.github.com/outoftime/sunspot
@@ -207,6 +210,7 @@ Sunspot repository at `upstream`:
 * {Sunspot: A Solr-Powered Search Engine for Ruby}[http://www.linux-mag.com/id/7341] (Linux Magazine)
 * {Using Sunspot for Free-Text Search with Redis}[http://masonoise.wordpress.com/2010/02/06/using-sunspot-for-free-text-search-with-redis/] (While I Pondered...)
 * {Default scope with Sunspot}[http://www.cloudspace.com/blog/2010/01/15/default-scope-with-sunspot/] (Cloudspace)
+* {Chef recipe for Sunspot in production}[http://gist.github.com/336403]
 * {Testing Sunspot with Cucumber}[http://blog.trydionel.com/2010/02/06/testing-sunspot-with-cucumber/] (spiral_code)
 * {Running cucumber features with sunspot_rails}[http://blog.kabisa.nl/2010/02/03/running-cucumber-features-with-sunspot_rails] (Kabisa Blog)
 * {How To Use Twitter Lists to Determine Influence}[http://www.untitledstartup.com/2010/01/how-to-use-twitter-lists-to-determine-influence/] (Untitled Startup)

data/lib/sunspot/search.rb

@@ -213,10 +213,13 @@ module Sunspot
       end
       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 |result|
-          hit = id_hit_hash[class_name][Adapters::InstanceAdapter.adapt(result).id.to_s]
+        data_accessor = data_accessor_for(Util.full_const_get(class_name))
+        hits_for_class = id_hit_hash[class_name]
+        data_accessor.load_all(ids).each do |result|
+          hit = hits_for_class.delete(Adapters::InstanceAdapter.adapt(result).id.to_s)
           hit.result = result
         end
+        hits_for_class.values.each { |hit| hit.result = nil }
       end
     end
 

data/lib/sunspot/search/hit.rb

@@ -91,9 +91,8 @@ module Sunspot
       # load their instances using the adapter's #load_all method.
       #
       def result
-        if @result.nil?
-          @search.populate_hits
-        end
+        return @result if defined?(@result)
+        @search.populate_hits
         @result
       end
       alias_method :instance, :result

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/api/search/results_spec.rb

@@ -56,4 +56,14 @@ describe 'search results', :type => :search do
     stub_results(*posts)
     session.search(Post).results.should == posts[0..0]
   end
+
+  it 'does not attempt to query the data store more than once when results are unavailable' do
+    posts = [Post.new, Post.new]
+    posts.each { |post| post.destroy }
+    stub_results(*posts)
+    search = session.search(Post) do
+      data_accessor_for(Post).should_receive(:load_all).once.and_return([])
+    end
+    search.results.should == []
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Mat Brown
@@ -24,7 +24,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -05:00
+date: 2010-03-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -246,7 +246,7 @@ files:
 - solr/solr/conf/scripts.conf
 - solr/solr/conf/schema.xml
 - solr/solr/conf/stopwords.txt
-- solr/solr/lib/solr-spatial-light-0.0.4.jar
+- solr/solr/lib/solr-spatial-light-0.0.5.jar
 - solr/solr/lib/lucene-spatial-2.9.1.jar
 - solr/start.jar
 has_rdoc: true