sunspot 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,10 @@
+== 1.3.2
+
+* Set initialization order for Railtie (Mauro)
+* Removes deprecated `InstanceMethods` module (Anders Bengtsson)
+* Adds `Retry5xxSessionProxy` to retry requests when an internal server error
+  occurs (Nick Zadrozny)
+
 == 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)
 * `sunspot.yml` supports ERB (Andrew Cholakian)

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/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/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 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/sunspot.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'rsolr', '~>1.0.7'
-  s.add_dependency 'escape', '~>0.0.4'
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rspec', '~>2.6.0'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Mat Brown
@@ -32,7 +32,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 -07:00
+date: 2012-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,24 +49,10 @@ dependencies:
         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 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -75,11 +61,11 @@ dependencies:
         - 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 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -89,11 +75,11 @@ dependencies:
         - 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 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -101,7 +87,7 @@ dependencies:
         - 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
@@ -184,6 +170,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
@@ -233,6 +220,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
@@ -347,6 +335,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