Changeset 322
- Timestamp:
- 02/18/08 20:36:06 (6 months ago)
- Files:
-
- trunk/demo/test/unit/remote_index_test.rb (modified) (2 diffs)
- trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb (modified) (1 diff)
- trunk/plugin/acts_as_ferret/lib/multi_index.rb (modified) (1 diff)
- trunk/plugin/acts_as_ferret/lib/remote_functions.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/demo/test/unit/remote_index_test.rb
r320 r322 3 3 class RemoteIndexTest < Test::Unit::TestCase 4 4 def setup 5 ActsAsFerret::remote = 'druby://localhost:9999' 5 6 end 6 7 7 8 def test_raises_drb_errors 8 @srv = ActsAsFerret::RemoteIndex.new :remote => 'druby://localhost:99999', :raise_drb_errors => true 9 ActsAsFerret::raise_drb_errors = true 10 @srv = ActsAsFerret::RemoteIndex.new :name => 'idx' 9 11 assert_raise DRb::DRbConnError do 10 12 @srv.find_ids 'some query' … … 13 15 14 16 def test_does_not_raise_drb_errors 15 @srv = ActsAsFerret::RemoteIndex.new :remote => 'druby://localhost:99999', :raise_drb_errors => false 17 ActsAsFerret::raise_drb_errors = false 18 @srv = ActsAsFerret::RemoteIndex.new :name => 'idx' 16 19 total_hits, results = @srv.find_ids( 'some query' ) 17 20 assert_equal 0, total_hits trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb
r321 r322 211 211 # returns the index with the given name. 212 212 def self.get_index(name) 213 name = name.to_sym 213 name = name.to_sym rescue nil 214 214 raise IndexNotDefined.new(name) unless ferret_indexes.has_key?(name) 215 215 ferret_indexes[name] trunk/plugin/acts_as_ferret/lib/multi_index.rb
r321 r322 1 1 module ActsAsFerret #:nodoc: 2 2 3 # Base class for remote and local multi-indexes 3 4 class MultiIndexBase 4 5 include FerretFindMethods trunk/plugin/acts_as_ferret/lib/remote_functions.rb
r321 r322 17 17 logger.error "DRb connection error: #{e}" 18 18 logger.warn e.backtrace.join("\n") 19 raise e if index_definition[:raise_drb_errors]19 raise e if ActsAsFerret::raise_drb_errors? 20 20 return_value_in_case_of_error 21 21 end
