athena 0.0.5.61 → 0.0.6.65

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to athena version 0.0.5
+This documentation refers to athena version 0.0.6
 
 
 == DESCRIPTION

data/lib/athena/formats/ferret.rb

@@ -57,26 +57,37 @@ class Athena::Formats
 
     def parse(source)
       path = source.path
-      raise "index not found: #{path}" unless File.readable_real?(File.join(path, 'segments'))
+
+      # make sure the index can be opened
+      begin
+        File.open(File.join(path, 'segments')) {}
+      rescue Errno::ENOENT, Errno::EACCES => err
+        raise "can't open index at #{path} (#{err.to_s.sub(/ - .*/, '')})"
+      end
 
       index = ::Ferret::Index::IndexReader.new(path)
+      first, last = 0, index.max_doc - 1
+
+      # make sure we can read from the index
+      begin
+        index[first]
+        index[last]
+      rescue StandardError  # EOFError, "Not available", ...
+        raise "possible Ferret version mismatch; try to set the " <<
+              "FERRET_VERSION environment variable to something " <<
+              "other than #{Ferret::VERSION}"
+      end
 
-      0.upto(index.max_doc - 1) { |i|
-        next if index.deleted?(i)
+      first.upto(last) { |i|
+        unless index.deleted?(i)
+          doc = index[i]
 
-        doc = begin
-          index[i]
-        rescue StandardError  # "Not available"
-          next
+          Athena::Record.new(parser.block, doc[record_element]) { |record|
+            config.each { |element, field_config|
+              record.update(element, doc[element], field_config)
+            }
+          }
         end
-
-        record = Athena::Record.new(parser.block, doc[record_element])
-
-        config.each { |element, field_config|
-          record.update(element, doc[element], field_config)
-        }
-
-        record.close
       }
 
       index.num_docs

data/lib/athena/record.rb

@@ -56,6 +56,14 @@ class Athena::Record
     @id     = id
 
     add_record
+
+    if block_given?
+      begin
+        yield self
+      ensure
+        close
+      end
+    end
   end
 
   def fill(field, config)

data/lib/athena/version.rb

@@ -30,7 +30,7 @@ module Athena::Version
 
   MAJOR = 0
   MINOR = 0
-  TINY  = 5
+  TINY  = 6
 
   class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: athena
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.61
+  version: 0.0.6.65
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-02 00:00:00 +01:00
+date: 2008-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency