fts_lite 0.0.2 → 0.1.0

data/README.md

@@ -18,18 +18,4 @@ Or install it yourself as:
 
 ## Usage
 
-    require 'fts_lite'
-    
-    db = FtsLite::Database.new("./db.sqlite3", :tokenizer => :bigram, :cache_size => 64000)
-    
-    docid = 1
-    text = "hoge piyo"
-    sort_value = "2012-08-01"
-    
-    db.transaction do
-      db.update(docid, text, sort_value)
-    end
-    
-    db.search('piyo', :order => :desc, :limit => 10).each do |docid|
-      p docid
-    end
+TODO

data/lib/fts_lite/{database.rb → index.rb}

@@ -1,7 +1,7 @@
 require 'sqlite3'
 
 module FtsLite
-  class Database
+  class Index
     DEFAULT_TOKENIZER = :bigram
     DEFAULT_JURNAL_MODE = "MEMORY"
     DEFAULT_TEMP_STORE = "MEMORY"
@@ -24,6 +24,19 @@ module FtsLite
       set_db_param(options)
       @tokenizer = Tokenizer.create(options[:tokenizer] || DEFAULT_TOKENIZER)
     end
+    def self.open(path, options = {})
+      if (block_given?)
+        index = Index.new(path, options)
+        begin
+          yield(index)
+        ensure
+          index.close
+        end
+      else
+        Index.new(path, options)
+      end
+    end
+      
     def close
       @db.close
     end
@@ -35,7 +48,7 @@ module FtsLite
         block.call
       end
     end
-    def update(docid, text, sort_value = nil)
+    def set(docid, text, sort_value = nil)
       if (SQLITE_HAVE_FT4_REPLACE)
         @db.execute("INSERT OR REPLACE INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);",
                     [docid, @tokenizer.vector(text), sort_value])

data/lib/fts_lite/tokenizer.rb

@@ -70,9 +70,9 @@ module FtsLite
         split(text).join(" ")
       end
       def split(text)
-        words = BimyouSegmenter.segment(Tokenizer.normalize(text),
-                                        :white_space => false,
-                                        :symbol => false).map {|word|
+        BimyouSegmenter.segment(Tokenizer.normalize(text),
+                                :white_space => false,
+                                :symbol => false).map {|word|
           if (word.size == 1)
             word
           else

data/lib/fts_lite/version.rb

@@ -1,3 +1,3 @@
 module FtsLite
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/fts_lite.rb

@@ -1,6 +1,6 @@
 require "fts_lite/version"
 require "fts_lite/tokenizer"
-require "fts_lite/database"
+require "fts_lite/index"
 
 module FtsLite
 end

data/test/fts_lite_test.rb

@@ -4,8 +4,8 @@ require 'test_helper'
 class FtsLiteTest < Test::Unit::TestCase
   DB_FILE = File.expand_path(File.join(File.dirname(__FILE__), "test.sqlite3"))
   puts "RUBY_VERSION => #{RUBY_VERSION}"
-  puts "SQLITE3_VERSION => #{FtsLite::Database.sqlite3_version}"
-  puts "SQLITE_HAVE_FT4_REPLACE => #{FtsLite::Database.have_ft4_replace}"
+  puts "SQLITE3_VERSION => #{FtsLite::Index.sqlite3_version}"
+  puts "SQLITE_HAVE_FT4_REPLACE => #{FtsLite::Index.have_ft4_replace}"
   def setup
     if (File.exist?(DB_FILE))
       File.unlink(DB_FILE)
@@ -14,35 +14,36 @@ class FtsLiteTest < Test::Unit::TestCase
   def teardown
   end
   def test_update
-    db = FtsLite::Database.new(DB_FILE, :tokenizer => :bigram)
-    db.transaction do 
-      db.delete_all
+    FtsLite::Index.open(DB_FILE, :tokenizer => :bigram) do |db|
+      db.transaction do 
+        db.delete_all
 
-      assert_equal db.search("赤い").size, 0
-      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
-      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
-      
-      assert_equal db.search("赤い").size, 1
-      assert_equal db.search("ナポリタン", :order => :desc).size, 2
-      assert_equal db.search("ナポリタン", :order => :desc)[0], 1
-      assert_equal db.search("ナポリタン", :order => :desc)[1], 2
-      
-      db.update(1, "なぜナポリタンは青いのだろうか ？", 0)
-      assert_equal db.search("赤い").size, 0
-      assert_equal db.search("青い").size, 1
-
-      assert_equal db.search("ナポリタン", :order => :desc).size, 2
-      assert_equal db.search("ナポリタン", :order => :desc)[0], 2
-      assert_equal db.search("ナポリタン", :order => :desc)[1], 1
+        assert_equal db.search("赤い").size, 0
+        db.set(1, "なぜナポリタンは赤いのだろうか ？", 2)
+        db.set(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+        
+        assert_equal db.search("赤い").size, 1
+        assert_equal db.search("ナポリタン", :order => :desc).size, 2
+        assert_equal db.search("ナポリタン", :order => :desc)[0], 1
+        assert_equal db.search("ナポリタン", :order => :desc)[1], 2
+        
+        db.set(1, "なぜナポリタンは青いのだろうか ？", 0)
+        assert_equal db.search("赤い").size, 0
+        assert_equal db.search("青い").size, 1
+        
+        assert_equal db.search("ナポリタン", :order => :desc).size, 2
+        assert_equal db.search("ナポリタン", :order => :desc)[0], 2
+        assert_equal db.search("ナポリタン", :order => :desc)[1], 1
+      end
     end
   end
   def test_bigram
-    db = FtsLite::Database.new(DB_FILE, :tokenizer => :bigram)
+    db = FtsLite::Index.open(DB_FILE, :tokenizer => :bigram)
     db.transaction do 
       db.delete_all
       p db.tokenize("なぜナポリタンは赤いのだろうか ？")
-      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
-      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      db.set(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.set(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
       
       assert_equal db.search("赤い").size, 1
       assert_equal db.search("赤い")[0], 1
@@ -72,12 +73,12 @@ class FtsLiteTest < Test::Unit::TestCase
     end
   end
   def test_trigram
-    db = FtsLite::Database.new(DB_FILE, :tokenizer => :trigram)
+    db = FtsLite::Index.open(DB_FILE, :tokenizer => :trigram)
     db.transaction do 
       db.delete_all
       p db.tokenize("なぜナポリタンは赤いのだろうか ？")
-      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
-      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      db.set(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.set(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
       
       assert_equal db.search("赤い").size, 0
       
@@ -106,12 +107,12 @@ class FtsLiteTest < Test::Unit::TestCase
     end
   end
   def test_wakachi_bigram
-    db = FtsLite::Database.new(DB_FILE, :tokenizer => :wakachi_bigram)
+    db = FtsLite::Index.open(DB_FILE, :tokenizer => :wakachi_bigram)
     db.transaction do 
       db.delete_all
       p db.tokenize("なぜナポリタンは赤いのだろうか ？")
-      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
-      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      db.set(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.set(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
       
       assert_equal db.search("赤い").size, 1
       assert_equal db.search("赤い")[0], 1
@@ -141,11 +142,11 @@ class FtsLiteTest < Test::Unit::TestCase
     end
   end
   def test_create
-    db = FtsLite::Database.new(DB_FILE)
-    db.drop_table!
-    db.close
-    db = FtsLite::Database.new(DB_FILE, :table_name => "hogehgoe")
+    db = FtsLite::Index.open(DB_FILE)
     db.drop_table!
     db.close
+    FtsLite::Index.open(DB_FILE, :table_name => "hogehgoe") do |f|
+      f.drop_table!
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fts_lite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -57,7 +57,7 @@ files:
 - Rakefile
 - fts_lite.gemspec
 - lib/fts_lite.rb
-- lib/fts_lite/database.rb
+- lib/fts_lite/index.rb
 - lib/fts_lite/tokenizer.rb
 - lib/fts_lite/version.rb
 - test/fts_lite_test.rb