sunspot 2.0.0.pre.111215 → 2.0.0.pre.120415

data/History.txt

@@ -5,6 +5,13 @@
 * Adds #query_time method to retrieve the Solr query time in
   milliseconds (Jason Weathered)
 * Fixes syntax of highlighting when used with nested dismax queries (Marco Crepaldi)
+* Adds ability to nest `Sunspot.batch` calls (Thorbjørn Hermansen)
+* Adds `open_timeout` and `read_timeout` configuration options (Rob Di
+  Marco)
+* Adds `offset` options to facets (Federico Gonzalez)
+* Adds `Retry5xxSessionProxy` to retry requests when an internal server error
+  occurs (Nick Zadrozny)
+* Adds support for range queries (Jan Ulrich)
 
 == 1.3.0 2011-11-26
 * Requests to Solr use HTTP POST verb by default to avoid issues when the query string grows too large for GET (Johan Van Ryseghem)

data/lib/sunspot/batcher.rb

@@ -0,0 +1,62 @@
+module Sunspot
+  #
+  # Keeps a stack of batches and helps out when Indexer is asked to batch documents.
+  #
+  # If the client does something like 
+  #   
+  #   Sunspot.batch do
+  #     some_code_here
+  #     which_triggers_some_other_code
+  #     which_again_calls
+  #     Sunspot.batch { ... }
+  #   end
+  #
+  # it is the Batcher's job to keep track of these nestings. The inner will
+  # be sent of to be indexed first.
+  #
+  class Batcher
+    include Enumerable
+
+    # Raised if you ask to end current, but no current exists
+    class NoCurrentBatchError < StandardError; end
+
+    def initialize
+      @stack = []
+    end
+
+    def current
+      @stack.last or start_new
+    end
+
+    def start_new
+      (@stack << []).last
+    end
+
+    def end_current
+      fail NoCurrentBatchError if @stack.empty?
+
+      @stack.pop
+    end
+
+    def depth
+      @stack.length
+    end
+
+    def batching?
+      depth > 0
+    end
+
+    def each(&block)
+      current.each(&block)
+    end
+
+    def push(value)
+      current << value
+    end
+    alias << push
+
+    def concat(values)
+      current.concat values
+    end
+  end
+end

data/lib/sunspot/configuration.rb

@@ -23,6 +23,8 @@ module Sunspot
         LightConfig.build do
           solr do
             url 'http://127.0.0.1:8983/solr'
+            read_timeout nil
+            open_timeout nil
           end
           master_solr do
             url nil

data/lib/sunspot/dsl/field_group.rb

@@ -13,6 +13,26 @@ module Sunspot
         @group.limit = num
       end
 
+      #
+      # If set, facet counts are based on the most relevant document of
+      # each group matching the query.
+      #
+      # Supported in Solr 3.4 and above.
+      #
+      # ==== Example
+      #
+      #     Sunspot.search(Post) do
+      #       group :title do
+      #         truncate
+      #       end
+      #
+      #       facet :title, :extra => :any
+      #     end
+      #
+      def truncate
+        @group.truncate = true
+      end
+
       # Specify the order that results should be returned in. This method can
       # be called multiple times; precedence will be in the order given.
       #

data/lib/sunspot/dsl/field_query.rb

@@ -185,6 +185,19 @@ module Sunspot
       # semantic meaning is attached to them. The label for +facet+ should be
       # a symbol; the label for +row+ can be whatever you'd like.
       #
+      # ==== Range Facets
+      #
+      # One can use the Range Faceting feature on any date field or any numeric
+      # field that supports range queries. This is particularly useful for the
+      # cases in the past where one might stitch together a series of range
+      # queries (as facet by query) for things like prices, etc.
+      #
+      # For example faceting over average ratings can be done as follows:
+      #
+      #   Sunspot.search(Post) do
+      #     facet :average_rating, :range => 1..5, :range_interval => 1
+      #   end
+      #
       # ==== Parameters
       #
       # field_names...<Symbol>:: fields for which to return field facets
@@ -195,6 +208,8 @@ module Sunspot
       #   Either :count (values matching the most terms first) or :index (lexical)
       # :limit<Integer>::
       #   The maximum number of facet rows to return
+      # :offset<Integer>::
+      #   The offset from which to start returning facet rows
       # :minimum_count<Integer>::
       #   The minimum count a facet row must have to be returned
       # :zeros<Boolean>::
@@ -276,6 +291,15 @@ module Sunspot
                 end
                 search_facet = @search.add_date_facet(field, options)
                 Sunspot::Query::DateFieldFacet.new(field, options)
+              elsif options[:range]
+                unless [Sunspot::Type::TimeType, Sunspot::Type::FloatType, Sunspot::Type::IntegerType ].inject(false){|res,type| res || field.type.is_a?(type)}
+                  raise(
+                    ArgumentError,
+                    ':range can only be specified for date or numeric fields'
+                  )
+                end
+                search_facet = @search.add_range_facet(field, options)
+                Sunspot::Query::RangeFacet.new(field, options)
               else
                 search_facet = @search.add_field_facet(field, options)
                 Sunspot::Query::FieldFacet.new(field, options)

data/lib/sunspot/dsl/restriction_with_near.rb

@@ -130,8 +130,30 @@ module Sunspot
       # :radius<Numeric>::
       #   Radius (in kilometers)
       #
-      def in_radius(lat, lon, radius)
-        @query.add_geo(Sunspot::Query::Geofilt.new(@field, lat, lon, radius))
+      # ==== Options
+      #
+      # <dt><code>:bbox</code></dt>
+      # <dd>If `true`, performs the search using `bbox`. `bbox` is
+      # more performant, but also more inexact (guaranteed to encompass
+      # all of the points of interest, but may also include other points
+      # that are slightly outside of the required distance).</dd>
+      #
+      def in_radius(lat, lon, radius, options = {})
+        @query.add_geo(Sunspot::Query::Geofilt.new(@field, lat, lon, radius, options))
+      end
+
+      #
+      # Performs a query that is filtered by a bounding box
+      #
+      # ==== Parameters
+      # 
+      # :first_corner<Array>::
+      #   First corner (expressed as an array `[latitude, longitude]`)
+      # :second_corner<Array>::
+      #   Second corner (expressed as an array `[latitude, longitude]`)
+      #
+      def in_bounding_box(first_corner, second_corner)
+        @query.add_geo(Sunspot::Query::Bbox.new(@field, first_corner, second_corner))
       end
     end
   end

data/lib/sunspot/indexer.rb

@@ -1,3 +1,5 @@
+require 'sunspot/batcher'
+
 module Sunspot
   # 
   # This class presents a service for adding, updating, and removing data
@@ -22,10 +24,10 @@ module Sunspot
     #
     def add(model)
       documents = Util.Array(model).map { |m| prepare(m) }
-      if @batch.nil?
-        add_documents(documents)
+      if batcher.batching?
+        batcher.concat(documents)
       else
-        @batch.concat(documents)
+        add_documents(documents)
       end
     end
 
@@ -69,19 +71,22 @@ module Sunspot
     # Start batch processing
     #
     def start_batch
-      @batch = []
+      batcher.start_new
     end
 
     #
     # Write batch out to Solr and clear it
     #
     def flush_batch
-      add_documents(@batch)
-      @batch = nil
+      add_documents(batcher.end_current)
     end
 
     private
 
+    def batcher
+      @batcher ||= Batcher.new
+    end
+
     # 
     # Convert documents into hash of indexed properties
     #

data/lib/sunspot/query.rb

@@ -1,7 +1,7 @@
-%w(filter abstract_field_facet connective boost_query date_field_facet dismax
+%w(filter abstract_field_facet connective boost_query date_field_facet range_facet dismax
    field_facet highlighting pagination restriction common_query
-   standard_query more_like_this more_like_this_query geo geofilt query_facet scope
-   sort sort_composite text_field_boost function_query
+   standard_query more_like_this more_like_this_query geo geofilt bbox query_facet
+   scope sort sort_composite text_field_boost function_query
    composite_fulltext field_group).each do |file|
   require(File.join(File.dirname(__FILE__), 'query', file))
 end

data/lib/sunspot/query/abstract_field_facet.rb

@@ -26,6 +26,9 @@ module Sunspot
         if @options[:limit]
           params[qualified_param('limit')] = @options[:limit].to_i
         end
+        if @options[:offset]
+          params[qualified_param('offset')] = @options[:offset].to_i
+        end
         if @options[:prefix]
           params[qualified_param('prefix')] = escape(@options[:prefix].to_s)
         end

data/lib/sunspot/query/bbox.rb

@@ -0,0 +1,15 @@
+module Sunspot
+  module Query
+    class Bbox
+      def initialize(field, first_corner, second_corner)
+        @field, @first_corner, @second_corner = field, first_corner, second_corner
+      end
+
+      def to_params
+        filter = "#{@field.indexed_name}:[#{@first_corner.join(",")} TO #{@second_corner.join(",")}]"
+
+        {:fq => filter}
+      end
+    end
+  end
+end

data/lib/sunspot/query/field_group.rb

@@ -4,7 +4,7 @@ module Sunspot
     # A FieldGroup groups by the unique values of a given field.
     #
     class FieldGroup
-      attr_accessor :limit
+      attr_accessor :limit, :truncate
 
       def initialize(field)
         if field.multiple?
@@ -21,12 +21,14 @@ module Sunspot
 
       def to_params
         params = {
-          :group         => "true",
-          :"group.field" => @field.indexed_name,
+          :group            => "true",
+          :"group.ngroups"  => "true",
+          :"group.field"    => @field.indexed_name
         }
 
         params.merge!(@sort.to_params("group."))
         params[:"group.limit"] = @limit if @limit
+        params[:"group.truncate"] = @truncate if @truncate
 
         params
       end

data/lib/sunspot/query/geofilt.rb

@@ -1,13 +1,14 @@
 module Sunspot
   module Query
     class Geofilt
-      def initialize(field, lat, lon, radius)
-        @field, @lat, @lon, @radius = field, lat, lon, radius
+      def initialize(field, lat, lon, radius, options = {})
+        @field, @lat, @lon, @radius, @options = field, lat, lon, radius, options
       end
 
       def to_params
-        filter = "{!geofilt sfield=#{@field.indexed_name} pt=#{@lat},#{@lon} d=#{@radius}}"
+        func = @options[:bbox] ? "bbox" : "geofilt"
 
+        filter = "{!#{func} sfield=#{@field.indexed_name} pt=#{@lat},#{@lon} d=#{@radius}}"
         {:fq => filter}
       end
     end

data/lib/sunspot/query/range_facet.rb

@@ -0,0 +1,14 @@
+module Sunspot
+  module Query
+    class RangeFacet < AbstractFieldFacet
+      def to_params
+        params = super
+        params[:"facet.range"] = [@field.indexed_name]
+        params[qualified_param('range.start')] = @field.to_indexed(@options[:range].first)
+        params[qualified_param('range.end')] = @field.to_indexed(@options[:range].last)
+        params[qualified_param('range.gap')] = "#{@options[:range_interval] || 10}"
+        params
+      end
+    end
+  end
+end

data/lib/sunspot/search.rb

@@ -1,5 +1,5 @@
 %w(abstract_search standard_search more_like_this_search query_facet field_facet
-   date_facet facet_row hit highlight field_group group hit_enumerable).each do |file|
+   date_facet range_facet facet_row hit highlight field_group group hit_enumerable).each do |file|
   require File.join(File.dirname(__FILE__), 'search', file)
 end
 

data/lib/sunspot/search/abstract_search.rb

@@ -226,6 +226,11 @@ module Sunspot
         add_facet(name, DateFacet.new(field, self, options))
       end
 
+      def add_range_facet(field, options) #:nodoc:
+        name = (options[:name] || field.name)
+        add_facet(name, RangeFacet.new(field, self, options))
+      end
+
       def highlights_for(doc) #:nodoc:
         if @solr_result['highlighting']
           @solr_result['highlighting'][doc['id']]

data/lib/sunspot/search/field_group.rb

@@ -22,6 +22,12 @@ module Sunspot
         end
       end
 
+      def total
+        if solr_response
+          solr_response['ngroups'].to_i
+        end
+      end
+
       private
 
       def solr_response

data/lib/sunspot/search/group.rb

@@ -23,6 +23,10 @@ module Sunspot
         @verified_hits ||= super
       end
 
+      def results
+        @results ||= verified_hits.map { |hit| hit.instance }
+      end
+
       def highlights_for(doc)
         @search.highlights_for(doc)
       end
@@ -30,6 +34,21 @@ module Sunspot
       def solr_docs
         @doclist['docs']
       end
+      
+      def data_accessor_for(clazz)
+        @search.data_accessor_for(clazz)
+      end      
+      
+      #
+      # The total number of documents matching the query for this group
+      #
+      # ==== Returns
+      #
+      # Integer:: Total matching documents
+      # 
+      def total
+        @doclist['numFound']
+      end      
     end
   end
 end

data/lib/sunspot/search/range_facet.rb

@@ -0,0 +1,37 @@
+module Sunspot
+  module Search
+    class RangeFacet
+      def initialize(field, search, options)
+        @field, @search, @options = field, search, options
+      end
+
+      def field_name
+        @field.name
+      end
+
+      def rows
+        @rows ||=
+          begin
+            data = @search.facet_response['facet_ranges'][@field.indexed_name]
+            gap = (@options[:range_interval] || 10).to_i
+            rows = []
+            
+            if data['counts']
+              Hash[*data['counts']].each_pair do |start_str, count|
+                start = start_str.to_f
+                finish = start + gap
+                rows << FacetRow.new(start..finish, count, self)
+              end
+            end
+
+            if @options[:sort] == :count
+              rows.sort! { |lrow, rrow| rrow.count <=> lrow.count }
+            else
+              rows.sort! { |lrow, rrow| lrow.value.first <=> rrow.value.first }
+            end
+            rows
+          end
+      end
+    end
+  end
+end

data/lib/sunspot/session.rb

@@ -239,7 +239,9 @@ module Sunspot
     #
     def connection
       @connection ||=
-        self.class.connection_class.connect(:url => config.solr.url)
+        self.class.connection_class.connect(:url          => config.solr.url,
+                                            :read_timeout => config.solr.read_timeout,
+                                            :open_timeout => config.solr.open_timeout)
     end
 
     def indexer

data/lib/sunspot/session_proxy.rb

@@ -83,5 +83,13 @@ module Sunspot
         'silent_fail_session_proxy'
       )
     )
+    autoload(
+      :Retry5xxSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'retry_5xx_session_proxy'
+      )
+    )
   end
 end

data/lib/sunspot/session_proxy/retry_5xx_session_proxy.rb

@@ -0,0 +1,67 @@
+require File.join(File.dirname(__FILE__), 'abstract_session_proxy')
+
+module Sunspot
+  module SessionProxy
+    class Retry5xxSessionProxy < AbstractSessionProxy
+
+      class RetryHandler
+        attr_reader :search_session
+
+        def initialize(search_session)
+          @search_session = search_session
+        end
+
+        def method_missing(m, *args, &block)
+          retry_count = 1
+          begin
+            search_session.send(m, *args, &block)
+          rescue Errno::ECONNRESET => e
+            if retry_count > 0
+              $stderr.puts "Error - #{e.message[/^.*$/]} - retrying..."
+              retry_count -= 1
+              retry
+            else
+              $stderr.puts "Error - #{e.message[/^.*$/]} - ignoring..."
+            end
+          rescue RSolr::Error::Http => e
+            if (500..599).include?(e.response[:status].to_i)
+              if retry_count > 0
+                $stderr.puts "Error - #{e.message[/^.*$/]} - retrying..."
+                retry_count -= 1
+                retry
+              else
+                $stderr.puts "Error - #{e.message[/^.*$/]} - ignoring..."
+                e.response
+              end
+            else
+              raise e
+            end
+          end
+        end
+      end
+
+      attr_reader :search_session
+      attr_reader :retry_handler
+
+      delegate :new_search, :search, :config,
+                :new_more_like_this, :more_like_this,
+                :delete_dirty, :delete_dirty?,
+                :to => :search_session
+
+      def initialize(search_session = Sunspot.session)
+        @search_session = search_session
+        @retry_handler = RetryHandler.new(search_session)
+      end
+
+      def rescued_exception(method, e)
+        $stderr.puts("Exception in #{method}: #{e.message}")
+      end
+
+      delegate :batch, :commit, :commit_if_dirty, :commit_if_delete_dirty,
+        :dirty?, :index!, :index, :optimize, :remove!, :remove, :remove_all!,
+        :remove_all, :remove_by_id!, :remove_by_id,
+        :to => :retry_handler
+
+    end
+  end
+end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.0.0.pre.111215'
+  VERSION = '2.0.0.pre.120415'
 end

data/spec/api/batcher_spec.rb

@@ -0,0 +1,112 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe Sunspot::Batcher do
+  it "includes Enumerable" do
+    described_class.should include Enumerable
+  end
+
+  describe "#each" do
+    let(:current) { [:foo, :bar] }
+    before { subject.stub(:current).and_return current }
+
+    it "iterates over current" do
+      yielded_values = []
+
+      subject.each do |value|
+        yielded_values << value
+      end
+
+      yielded_values.should eq current
+    end
+  end
+
+  describe "adding to current batch" do
+    it "#push pushes to current" do
+      subject.push :foo
+      subject.current.should include :foo
+    end
+
+    it "#<< pushes to current" do
+      subject.push :foo
+      subject.current.should include :foo
+    end
+
+    it "#concat concatinates on current batch" do
+      subject << :foo
+      subject.concat [:bar, :mix]
+      should include :foo, :bar, :mix
+    end
+  end
+
+
+  describe "#current" do
+    context "no current" do
+      it "starts a new" do
+        expect { subject.current }.to change(subject, :depth).by 1
+      end
+
+      it "is empty by default" do
+        subject.current.should be_empty
+      end
+    end
+
+    context "with a current" do
+      before { subject.start_new }
+
+      it "does not start a new" do
+        expect { subject.current }.to_not change(subject, :depth)
+      end
+
+      it "returns the same as last time" do
+        subject.current.should eq subject.current
+      end
+    end
+  end
+
+  describe "#start_new" do
+    it "creates a new batches" do
+      expect { 2.times { subject.start_new } }.to change(subject, :depth).by 2
+    end
+
+    it "changes current" do
+      subject << :foo
+      subject.start_new
+      should_not include :foo
+    end
+  end
+
+  describe "#end_current" do
+    context "no current batch" do
+      it "fails" do
+        expect { subject.end_current }.to raise_error Sunspot::Batcher::NoCurrentBatchError
+      end
+    end
+
+    context "with current batch" do
+      before { subject.start_new }
+
+      it "changes current" do
+        subject << :foo
+        subject.end_current
+        should_not include :foo
+      end
+
+      it "returns current" do
+        subject << :foo
+        subject.end_current.should include :foo
+      end
+    end
+  end
+
+  describe "#batching?" do
+    it "is false when depth is 0" do
+      subject.should_receive(:depth).and_return 0
+      should_not be_batching
+    end
+
+    it "is true when depth is more than 0" do
+      subject.should_receive(:depth).and_return 1
+      should be_batching
+    end
+  end
+end

data/spec/api/indexer/batch_spec.rb

@@ -1,8 +1,9 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'batch indexing', :type => :indexer do
+  let(:posts) { Array.new(2) { |index| Post.new :title => "Post number #{index}!" } }
+
   it 'should send all batched adds in a single request' do
-    posts = Array.new(2) { Post.new }
     session.batch do
       for post in posts
         session.index(post)
@@ -12,7 +13,6 @@ describe 'batch indexing', :type => :indexer do
   end
 
   it 'should add all batched adds' do
-    posts = Array.new(2) { Post.new }
     session.batch do
       for post in posts
         session.index(post)
@@ -36,11 +36,37 @@ describe 'batch indexing', :type => :indexer do
     pending 'batching all operations'
     connection.should_not_receive(:add)
     connection.should_not_receive(:remove)
-    posts = Array.new(2) { Post.new }
     session.batch do
       session.index(posts[0])
       session.remove(posts[1])
     end
     connection.adds
   end
+
+  describe "nesting of batches" do
+    let(:a_nested_batch) do
+      session.batch do
+        session.index posts[0]
+
+        session.batch do
+          session.index posts[1]
+        end
+      end
+    end
+
+    it "behaves like two sets of batches, does the inner first, then outer" do
+      session.batch { session.index posts[1] }
+      session.batch { session.index posts[0] }
+
+      two_sets_of_batches_adds = connection.adds.dup
+      connection.adds.clear
+
+      a_nested_batch
+      nested_batches_adds = connection.adds
+
+      nested_batches_adds.first.first.field_by_name(:title_ss).value.should eq(
+        two_sets_of_batches_adds.first.first.field_by_name(:title_ss).value
+      )
+    end
+  end
 end

data/spec/api/query/faceting_examples.rb

@@ -54,6 +54,13 @@ shared_examples_for "facetable query" do
       end
       connection.should have_last_search_with(:"f.category_ids_im.facet.limit" => 10)
     end
+    
+    it 'sets the facet offset' do
+      search do
+        facet :category_ids, :offset => 10
+      end
+      connection.should have_last_search_with(:"f.category_ids_im.facet.offset" => 10)
+    end
 
     it 'sets the facet minimum count' do
       search do
@@ -255,6 +262,58 @@ shared_examples_for "facetable query" do
     end
   end
 
+  describe 'on range facets' do
+    before :each do
+      @range = 2..4
+    end
+
+    it 'does not send range facet parameters if integer range is not specified' do
+      search do |query|
+        query.facet :average_rating
+      end
+      connection.should_not have_last_search_with(:"facet.range")
+    end
+
+    it 'sets the facet to a range facet if the range is specified' do
+      search do |query|
+        query.facet :average_rating, :range => @range
+      end
+      connection.should have_last_search_with(:"facet.range" => ['average_rating_ft'])
+    end
+
+    it 'sets the facet start and end' do
+      search do |query|
+        query.facet :average_rating, :range => @range
+      end
+      connection.should have_last_search_with(
+        :"f.average_rating_ft.facet.range.start" => '2.0',
+        :"f.average_rating_ft.facet.range.end" => '4.0'
+      )
+    end
+
+    it 'defaults the range interval to 10' do
+      search do |query|
+        query.facet :average_rating, :range => @range
+      end
+      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "10")
+    end
+
+    it 'uses custom range interval' do
+      search do |query|
+        query.facet :average_rating, :range => @range, :range_interval => 1
+      end
+      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
+    end
+
+    it 'does not allow date faceting on a non-continuous field' do
+      lambda do
+        search do |query|
+          query.facet :title, :range => @range
+        end
+      end.should raise_error(ArgumentError)
+    end
+  end
+
   describe 'using queries' do
     it 'turns faceting on' do
       search do

data/spec/api/query/spatial_examples.rb

@@ -8,4 +8,20 @@ shared_examples_for "spatial query" do
 
     connection.should have_last_search_including(:fq, "{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}")
   end
+
+  it 'filters by radius via bbox (inexact)' do
+    search do
+      with(:coordinates_new).in_radius(23, -46, 100, :bbox => true)
+    end
+
+    connection.should have_last_search_including(:fq, "{!bbox sfield=coordinates_new_ll pt=23,-46 d=100}")
+  end
+
+  it 'filters by bounding box' do
+    search do
+      with(:coordinates_new).in_bounding_box([45, -94], [46, -93])
+    end
+
+    connection.should have_last_search_including(:fq, "coordinates_new_ll:[45,-94 TO 46,-93]")
+  end
 end

data/spec/api/session_proxy/retry_5xx_session_proxy_spec.rb

@@ -0,0 +1,73 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe Sunspot::SessionProxy::Retry5xxSessionProxy do
+  
+  before :each do
+    Sunspot::Session.connection_class = Mock::ConnectionFactory.new
+    @sunspot_session = Sunspot.session
+    @proxy = Sunspot::SessionProxy::Retry5xxSessionProxy.new(@sunspot_session)
+    Sunspot.session = @proxy
+  end
+
+  class FakeRSolrErrorHttp < RSolr::Error::Http
+    def backtrace
+      []
+    end
+  end
+
+  let :fake_rsolr_request do
+    {:uri => 'http://solr.test/uri'}
+  end
+
+  def fake_rsolr_response(status)
+    {:status => status.to_s}
+  end
+
+  let :post do
+    Post.new(:title => 'test')
+  end
+
+  it "should behave normally without a stubbed exception" do
+    @sunspot_session.should_receive(:index).and_return(mock)
+    Sunspot.index(post)
+  end
+
+  it "should be successful with a single exception followed by a sucess" do
+    e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_rsolr_response(503))
+    @sunspot_session.should_receive(:index).and_return do
+      @sunspot_session.should_receive(:index).and_return(mock)
+      raise e
+    end
+    Sunspot.index(post)
+  end
+
+  it "should return the error response after two exceptions" do
+    fake_response = fake_rsolr_response(503)
+    e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_response)
+    fake_success = mock('success')
+
+    @sunspot_session.should_receive(:index).and_return do
+      @sunspot_session.should_receive(:index).and_return do
+        @sunspot_session.stub!(:index).and_return(fake_success)
+        raise e
+      end
+      raise e
+    end
+
+    response = Sunspot.index(post)
+    response.should_not == fake_success
+    response.should == fake_response
+  end
+
+  it "should not retry a 4xx" do
+    e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_rsolr_response(400))
+    @sunspot_session.should_receive(:index).and_raise(e)
+    lambda { Sunspot.index(post) }.should raise_error
+  end
+
+  # TODO: try against more than just Sunspot.index? but that's just testing the
+  # invocation of delegate, so probably not important. -nz 11Apr12
+
+  it_should_behave_like 'session proxy'
+  
+end

data/spec/api/session_spec.rb

@@ -85,6 +85,18 @@ describe 'Session' do
       Sunspot.commit
       connection.opts[:url].should == 'http://127.0.0.1:8981/solr'
     end
+
+    it 'should open a connection with custom read timeout' do
+      Sunspot.config.solr.read_timeout = 0.5
+      Sunspot.commit
+      connection.opts[:read_timeout].should == 0.5
+    end
+
+    it 'should open a connection with custom open timeout' do
+      Sunspot.config.solr.open_timeout = 0.5
+      Sunspot.commit
+      connection.opts[:open_timeout].should == 0.5
+    end
   end
 
   context 'custom session' do

data/spec/integration/faceting_spec.rb

@@ -84,6 +84,13 @@ describe 'search faceting' do
       end
       search.facet(:title).rows.map { |row| row.value }.should include('zero')
     end
+    
+    it 'should return facet rows from an offset' do
+      search = Sunspot.search(Post) do
+        facet :title, :offset => 3
+      end
+      search.facet(:title).rows.map { |row| row.value }.should == %w(one zero)
+    end
 
     it 'should return a specified minimum count' do
       search = Sunspot.search(Post) do
@@ -134,6 +141,19 @@ describe 'search faceting' do
       search.facet(:title).rows.first.value.should == :none
       search.facet(:title).rows.first.count.should == 1
     end
+
+    it 'gives correct facet count when group == true and truncate == true' do
+      search = Sunspot.search(Post) do
+        group :title do
+          truncate
+        end
+
+        facet :title, :extra => :any
+      end
+
+      # Should be 5 instead of 11
+      search.facet(:title).rows.first.count.should == 5
+    end
   end
 
   context 'multiselect faceting' do

data/spec/integration/field_grouping_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require File.expand_path("../helpers/search_helper", File.dirname(__FILE__))
 
 describe "field grouping" do
   before :each do
@@ -22,6 +23,14 @@ describe "field grouping" do
     search.group(:title).groups.should include { |g| g.value == "Title2" }
   end
 
+  it "returns the number of matches unique groups" do
+    search = Sunspot.search(Post) do
+      group :title
+    end
+
+    search.group(:title).total.should == 2
+  end
+
   it "provides access to the number of matches before grouping" do
     search = Sunspot.search(Post) do
       group :title

data/spec/integration/geospatial_spec.rb

@@ -10,7 +10,7 @@ describe "geospatial search" do
       Sunspot.index!(@post)
     end
 
-    it "matches posts with the radius" do
+    it "matches posts within the radius" do
       results = Sunspot.search(Post) {
         with(:coordinates_new).in_radius(32, -68, 1)
       }.results
@@ -27,6 +27,32 @@ describe "geospatial search" do
     end
   end
 
+  describe "filtering by bounding box" do
+    before :all do
+      Sunspot.remove_all
+
+      @post = Post.new(:title       => "Howdy",
+                       :coordinates => Sunspot::Util::Coordinates.new(32, -68))
+      Sunspot.index!(@post)
+    end
+
+    it "matches post within the bounding box" do
+      results = Sunspot.search(Post) {
+        with(:coordinates_new).in_bounding_box [31, -69], [33, -67]
+      }.results
+
+      results.should include(@post)
+    end
+
+    it "filters out posts not in the bounding box" do
+      results = Sunspot.search(Post) {
+        with(:coordinates_new).in_bounding_box [20, -70], [21, -69]
+      }.results
+
+      results.should_not include(@post)
+    end
+  end
+
   describe "ordering by geodist" do
     before :all do
       Sunspot.remove_all

data/spec/integration/indexing_spec.rb

@@ -30,4 +30,26 @@ describe 'indexing' do
     end
     Sunspot.search(Post).should have(2).results
   end
+
+
+  describe "in batches" do
+    let(:post_1) { Post.new :title => 'A tittle' }
+    let(:post_2) { Post.new :title => 'Another title' }
+
+    describe "nested" do
+      let(:a_nested_batch) do
+        Sunspot.batch do
+          Sunspot.index post_1
+
+          Sunspot.batch do
+            Sunspot.index post_2
+          end
+        end
+      end
+
+      it "does not fail" do
+        expect { a_nested_batch }.to_not raise_error
+      end
+    end
+  end
 end

data/sunspot.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rsolr', '~>1.0.6'
-  s.add_dependency 'escape', '~>0.0.4'
+  s.add_dependency 'rsolr', '~>1.0.7'
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rspec', '~>2.6.0'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: -2204637468
+  prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - pre
-  - 111215
-  version: 2.0.0.pre.111215
+  - 120415
+  version: 2.0.0.pre.120415
 platform: ruby
 authors: 
 - Mat Brown
@@ -34,76 +35,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 -07:00
-default_executable: 
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsolr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 0
-        - 6
-        version: 1.0.6
+        - 7
+        version: 1.0.7
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: escape
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: pr_geohash
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 6
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hanna
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: "    Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent\n    Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations\n    can be performed without hand-writing any boolean queries or building Solr parameters by hand.\n"
 email: 
 - mat@patch.com
@@ -123,6 +117,7 @@ files:
 - lib/light_config.rb
 - lib/sunspot.rb
 - lib/sunspot/adapters.rb
+- lib/sunspot/batcher.rb
 - lib/sunspot/class_set.rb
 - lib/sunspot/composite_setup.rb
 - lib/sunspot/configuration.rb
@@ -148,6 +143,7 @@ files:
 - lib/sunspot/indexer.rb
 - lib/sunspot/query.rb
 - lib/sunspot/query/abstract_field_facet.rb
+- lib/sunspot/query/bbox.rb
 - lib/sunspot/query/boost_query.rb
 - lib/sunspot/query/common_query.rb
 - lib/sunspot/query/composite_fulltext.rb
@@ -165,6 +161,7 @@ files:
 - lib/sunspot/query/more_like_this_query.rb
 - lib/sunspot/query/pagination.rb
 - lib/sunspot/query/query_facet.rb
+- lib/sunspot/query/range_facet.rb
 - lib/sunspot/query/restriction.rb
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/sort.rb
@@ -185,6 +182,7 @@ files:
 - lib/sunspot/search/more_like_this_search.rb
 - lib/sunspot/search/paginated_collection.rb
 - lib/sunspot/search/query_facet.rb
+- lib/sunspot/search/range_facet.rb
 - lib/sunspot/search/standard_search.rb
 - lib/sunspot/session.rb
 - lib/sunspot/session_proxy.rb
@@ -192,6 +190,7 @@ files:
 - lib/sunspot/session_proxy/class_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/id_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/master_slave_session_proxy.rb
+- lib/sunspot/session_proxy/retry_5xx_session_proxy.rb
 - lib/sunspot/session_proxy/sharding_session_proxy.rb
 - lib/sunspot/session_proxy/silent_fail_session_proxy.rb
 - lib/sunspot/session_proxy/thread_local_session_proxy.rb
@@ -204,6 +203,7 @@ files:
 - pkg/.gitignore
 - script/console
 - spec/api/adapters_spec.rb
+- spec/api/batcher_spec.rb
 - spec/api/binding_spec.rb
 - spec/api/class_set_spec.rb
 - spec/api/hit_enumerable_spec.rb
@@ -244,6 +244,7 @@ files:
 - spec/api/session_proxy/class_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/id_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/master_slave_session_proxy_spec.rb
+- spec/api/session_proxy/retry_5xx_session_proxy_spec.rb
 - spec/api/session_proxy/sharding_session_proxy_spec.rb
 - spec/api/session_proxy/silent_fail_session_proxy_spec.rb
 - spec/api/session_proxy/spec_helper.rb
@@ -287,7 +288,6 @@ files:
 - tasks/rdoc.rake
 - tasks/schema.rake
 - tasks/todo.rake
-has_rdoc: true
 homepage: http://outoftime.github.com/sunspot
 licenses: []
 
@@ -301,16 +301,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -319,12 +323,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files: 
 - spec/api/adapters_spec.rb
+- spec/api/batcher_spec.rb
 - spec/api/binding_spec.rb
 - spec/api/class_set_spec.rb
 - spec/api/hit_enumerable_spec.rb
@@ -365,6 +370,7 @@ test_files:
 - spec/api/session_proxy/class_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/id_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/master_slave_session_proxy_spec.rb
+- spec/api/session_proxy/retry_5xx_session_proxy_spec.rb
 - spec/api/session_proxy/sharding_session_proxy_spec.rb
 - spec/api/session_proxy/silent_fail_session_proxy_spec.rb
 - spec/api/session_proxy/spec_helper.rb