xapian-rack 1.2.3.1 → 1.2.3.3

data/lib/xapian/rack/search.rb

@@ -27,7 +27,7 @@ module Xapian
 			def initialize(app, options = {})
 				@app = app
 				
-				@logger = options[:logger] || Logger.new($stdout)
+				@logger = options[:logger] || Logger.new($stderr)
 			end
 			
 			def call(name, &block)
@@ -75,17 +75,22 @@ module Xapian
 				@database_path = options[:database]
 				@database = nil
 				
+				unless options[:logger]
+					options[:logger] = Logger.new($stderr)
+					options[:logger].level = Logger::DEBUG
+				end
+				
 				# Setup the controller
-				@controller = Xapian::Indexer::Controller.new
+				@controller = Xapian::Indexer::Controller.new(options)
 				
 				@controller.loaders << RelativeLoader.new(@app)
-				@controller.loaders << Xapian::Indexer::Loaders::HTTP.new
-				@controller.extractors['text/html'] = Xapian::Indexer::Extractors::HTML.new
+				@controller.loaders << Xapian::Indexer::Loaders::HTTP.new(options)
+				@controller.extractors['text/html'] = Xapian::Indexer::Extractors::HTML.new(options)
 				
 				# Setup the generator
 				@generator = Xapian::TermGenerator.new()
 				
-				@logger = options[:logger] || Logger.new($stderr)
+				@logger = options[:logger]
 				
 				unless options[:indexer] == :disabled
 					@indexer = Thread.new do
@@ -93,11 +98,10 @@ module Xapian
 							begin
 								@logger.info "Updating index in background..."
 								index(options[:roots], options)
+								@logger.info "Index update finished successfully."
 							rescue
-								@logger.error "Error while updating index: #{$!}"
+								@logger.error "Index update failed: #{$!}"
 								$!.backtrace.each{|line| @logger.error(line)}
-							ensure
-								@logger.info "Index update finished."
 							end
 							
 							sleep options[:refresh] || 3600
@@ -133,6 +137,7 @@ module Xapian
 			
 			def index(roots, options = {})
 				writable_database = Xapian::WritableDatabase.new(@database_path, Xapian::DB_CREATE_OR_OPEN)
+				@logger.debug "Opening xapian database for writing: #{@database_path}"
 				
 				begin
 					spider = Xapian::Indexer::Spider.new(writable_database, @generator, @controller)
@@ -153,6 +158,7 @@ module Xapian
 				
 					spider.remove_old!
 				ensure
+					@logger.debug "Closing xapian database: #{@database_path}"
 					writable_database.close
 				end
 			end

data/lib/xapian/rack/version.rb

@@ -19,7 +19,7 @@ module Xapian
 			MAJOR = 1
 			MINOR = 2
 			TINY  = 3
-			REV   = 1
+			REV   = 3
 			
 			STRING = [MAJOR, MINOR, TINY, REV].join('.')
 		end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xapian-rack
 version: !ruby/object:Gem::Version 
-  hash: 65
   prerelease: false
   segments: 
   - 1
   - 2
   - 3
-  - 1
-  version: 1.2.3.1
+  - 3
+  version: 1.2.3.3
 platform: ruby
 authors: 
 - Samuel Williams
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 +13:00
+date: 2011-09-08 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,7 +69,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -81,7 +77,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -91,6 +86,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Xapian-rack provides indexing and searching integration with Rack.
+summary: Xapian::Rack provides indexing and searching integration with Rack.
 test_files: []