ferret 0.2.2 → 0.3.0

data/test/unit/index/tc_term_buffer.rb

@@ -8,7 +8,7 @@ class TermBufferTest < Test::Unit::TestCase
     tb = TermBuffer.new
     tb.term = t
     assert_equal(t.field, tb.field)
-    assert_equal("Ferret Tutorial", tb.text_str)
+    assert_equal("Ferret Tutorial", tb.text)
     assert_equal("Ferret Tutorial".length, tb.text_length)
     assert_equal(t, tb.term)
   end
@@ -19,7 +19,7 @@ class TermBufferTest < Test::Unit::TestCase
     tb2 = TermBuffer.new
     tb2.set!(tb)
     assert_equal(tb.field, tb2.field)
-    assert_equal("Ferret Tutorial", tb2.text_str)
+    assert_equal("Ferret Tutorial", tb2.text)
     assert_equal("Ferret Tutorial".length, tb2.text_length)
     assert_equal(tb.term, tb2.term)
   end
@@ -50,7 +50,7 @@ class TermBufferTest < Test::Unit::TestCase
     output.close
     input = dir.open_input("term_buffer_read_test")
     tb.read(input, fi)
-    assert_equal("Dave Balmain", tb.text_str)
+    assert_equal("Dave Balmain", tb.text)
     assert_equal("Dave Balmain", tb.term.text)
     assert_equal("Writer", tb.field)
   end

data/test/unit/index/tc_term_info.rb

@@ -9,7 +9,7 @@ class TermInfoTest < Test::Unit::TestCase
     assert_equal(ti1.freq_pointer, 2)
     assert_equal(ti1.prox_pointer, 3)
     assert_equal(ti1.skip_offset, 1)
-    ti2 = ti1.copy_of()
+    ti2 = ti1.clone()
     assert(ti1 == ti2)
     ti2 = TermInfo.new(10, 9, 8)
     assert(ti1 != ti2)

data/test/unit/query_parser/tc_query_parser.rb

@@ -124,7 +124,7 @@ class QueryParserTest < Test::Unit::TestCase
                                             :handle_parse_errors => true)
 
     pairs = [
-      ['(*word', 'word'],
+      ['::*word', 'word'],
       ['()*&)(*^&*(', ''],
       ['()*&one)(*two(*&"', 'one two']
     ]

data/test/unit/search/tc_index_searcher.rb

@@ -66,6 +66,9 @@ class IndexSearcherTest < Test::Unit::TestCase
     tq.boost = 100
     check_hits(tq, [1,4,8])
 
+    tq = TermQuery.new(Term.new("field", "2342"));
+    check_hits(tq, [])
+
     tq = TermQuery.new(Term.new("field", ""));
     check_hits(tq, [])
 

data/test/unit/store/tc_fs_store.rb

@@ -60,25 +60,56 @@ class FSStoreTest < Test::Unit::TestCase
   end
 
   def test_fslock
-    name = "lfile"
-    lock_file_path = @dpath + "/" + @dir.get_lock_prefix() + name
-    if File.exists?(lock_file_path) then
-      File.delete(lock_file_path)
-    end
-    assert(! File.exists?(lock_file_path),
-           "There should be no lock file")
-    lock = @dir.make_lock(name)
-    assert(! File.exists?(lock_file_path),
-           "There should still be no lock file")
+    lock_name = "lfile"
+    lock_file_path = make_lock_file_path(lock_name)
+    assert(! File.exists?(lock_file_path), "There should be no lock file")
+    lock = @dir.make_lock(lock_name)
+    assert(! File.exists?(lock_file_path), "There should still be no lock file")
+    assert(! lock.locked?,                 "lock shouldn't be locked yet")
+
+    lock.obtain
+
+    assert(lock.locked?,                   "lock should now be locked")
+    assert(File.exists?(lock_file_path),   "A lock file should have been created")
+
     assert(! @dir.exists?(lock_file_path),
            "The lock should be hidden by the FSDirectories directory scan")
-    assert(! lock.locked?, "lock shouldn't be locked yet")
-    lock.obtain
-    assert(lock.locked?, "lock should now be locked")
-    assert(File.exists?(lock_file_path),
-           "A lock file should have been created")
+
     lock.release
-    assert(! lock.locked?, "lock should be freed again")
+
+    assert(! lock.locked?,                 "lock should be freed again")
     assert(! File.exists?(lock_file_path), "The lock file should have been deleted")
   end
+
+#  def make_and_loose_lock
+#    lock = @dir.make_lock("finalizer_lock")
+#    lock.obtain
+#    lock = nil
+#  end
+#
+#  def test_fslock_finalizer
+#    lock_name = "finalizer_lock"
+#    lock_file_path = make_lock_file_path(lock_name)
+#    assert(! File.exists?(lock_file_path), "There should be no lock file")
+#
+#    make_and_loose_lock
+#
+#    #assert(File.exists?(lock_file_path), "There should now be a lock file")
+#
+#    lock = @dir.make_lock(lock_name)
+#    assert(lock.locked?, "lock should now be locked")
+#
+#    GC.start
+#
+#    assert(! lock.locked?, "lock should be freed again")
+#    assert(! File.exists?(lock_file_path), "The lock file should have been deleted")
+#  end
+#
+  def make_lock_file_path(name)
+    lock_file_path = File.join(@dpath, @dir.get_lock_prefix() + name)
+    if File.exists?(lock_file_path) then
+      File.delete(lock_file_path)
+    end
+    return lock_file_path
+  end
 end

data/test/unit/store/tc_ram_store.rb

@@ -15,7 +15,7 @@ class RAMStoreTest < Test::Unit::TestCase
 
   def test_ramlock
     name = "lfile"
-    lfile = "rubylock-" + name
+    lfile = Ferret::Store::Directory::LOCK_PREFIX + name
     assert(! @dir.exists?(lfile),
            "There should be no lock file")
     lock = @dir.make_lock(name)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2005-11-22 00:00:00 +09:00
+  version: 0.3.0
+date: 2005-12-02 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
   - lib
@@ -47,9 +47,14 @@ files:
   - ext/term.c
   - ext/ferret.h
   - ext/util.c
+  - ext/token.c
   - ext/tags
-  - ext/ferret_ext.so
   - ext/dummy.exe
+  - ext/segment_term_enum.c
+  - ext/terminfo.c
+  - ext/term_infos_reader.c
+  - ext/ferret_ext.so
+  - ext/similarity.c
   - lib/ferret.rb
   - lib/ferret/analysis.rb
   - lib/ferret/document.rb