index-tanked 0.4.1 → 0.5.0

data/lib/index-tanked/configuration.rb

@@ -2,7 +2,7 @@ module IndexTanked
   class Configuration
 
     class << self
-      attr_accessor :url, :index, :search_availability, :index_availability, :timeout, :activerecord_queue
+      attr_accessor :url, :index, :search_availability, :index_availability, :timeout, :search_timeout, :activerecord_queue
 
       def self.block_accessor(*fields)
         fields.each do |field|

data/lib/index-tanked/search_result.rb

@@ -48,7 +48,19 @@ module IndexTanked
           raise SearchingDisabledError, "index tank search is disabled in configuration" unless IndexTanked::Configuration.search_available?
           raise IndexTanked::SearchError, "No or invalid index has been provided" unless @index.is_a? IndexTank::Index
           raise IndexTanked::SearchError, "No query provided" if @query.nil?
-          @raw_result ||= @index.search(@query, @options.merge(:start => pager.offset, :len => pager.per_page))
+          search_timeout = if IndexTanked::Configuration.search_timeout.is_a?(Proc)
+            IndexTanked::Configuration.search_timeout.call
+          else
+            IndexTanked::Configuration.search_timeout
+          end
+          if search_timeout
+            IndexTanked::Timer.timeout(search_timeout, TimeoutExceededError) do
+              sleep(search_timeout + 1) if $testing_index_tanked_search_timeout
+              @raw_result ||= @index.search(@query, @options.merge(:start => pager.offset, :len => pager.per_page))
+            end
+          else
+            @raw_result ||= @index.search(@query, @options.merge(:start => pager.offset, :len => pager.per_page))
+          end
         rescue StandardError => e
           raise if e.is_a? IndexTankedError
           raise IndexTanked::SearchError, "#{e.class}: #{e.message}"

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.4.1'
+  GEM_VERSION = '0.5.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Adam Kittelson
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -07:00
-default_executable: 
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: indextank
@@ -155,7 +154,6 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/zencoder/index-tanked
 licenses: []
 
@@ -185,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Index Tank <http://indextank.com> integration library.