delsolr 0.1.3 → 0.1.4

data/lib/delsolr.rb

@@ -166,12 +166,7 @@ module DelSolr
       end
 
       if body.blank? # cache miss (or wasn't enabled)
-        begin
-          header, body = connection.get(configuration.path + query_builder.request_string)
-        rescue Timeout::Error
-          # If we timed out, just return nil and let the client decide what to do
-          return nil
-        end
+        header, body = connection.get(configuration.path + query_builder.request_string)
 
         # We get UTF-8 from Solr back, make sure the string knows about it
         # when running on Ruby >= 1.9
@@ -196,6 +191,10 @@ module DelSolr
         logger.info "#{from_cache ? 'C' : 'S'},#{response_stat_string}http://#{configuration.full_path}#{response.request_url}"
       end
       response
+    # If we error, just return nil and let the client decide what to do
+    rescue StandardError
+      logger.info "http://#{configuration.full_path}#{query_builder.request_string}" if logger && configuration && query_builder
+      return nil
     end
     
     # Adds a document to the buffer to be posted to solr (NOTE: does not perform the actual post)

data/test/test_client.rb

@@ -176,6 +176,19 @@ class ClientTest < Test::Unit::TestCase
     assert(c.update!(doc))
     assert_equal(0, c.pending_documents.length)
   end
+
+  def test_query_returns_nil_when_exception_thrown
+    c = setup_client
+
+    mock_query_builder = DelSolr::Client::QueryBuilder
+    mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
+    DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
+    c.connection.expects(:get).raises(StandardError) # mock the connection
+    assert_nothing_raised do
+      r = c.query('standard', :query => '123')
+      assert_nil(r)
+    end
+  end
   
   def test_query_with_path
     c = setup_client(:path => '/abcsolr')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2009-11-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency