sekka 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2887ee7935af58c6a120baa0a4c5c2a0cbb45f36
-  data.tar.gz: f176b203351a4a5e239680aad03b7da0bd8e1472
+  metadata.gz: ad1477c07c6d878c2b57f0d10314f671d9ea1f46
+  data.tar.gz: 88c1939f955d2a5fcdba849a347b029413d2e2c2
 SHA512:
-  metadata.gz: 0952e5ff9710e90543043ded89983e06b0e2d8d5fc5a130a393fae20e381097c70667f5af9bfcd010fd4fe3a7700bd73579979345b6bf97fd6a73d049360bd12
-  data.tar.gz: 4c99ab92b87bd229364548ca39ae726d6658eedeaa74b8799a4598a32f37a4b6463d3733880f9e9fe0bfdceb63057206d2c50332bf2ca0f427a310760c34949c
+  metadata.gz: 3687f875c98cc30572093464ad81cea73a9fc383610f838f2a2f43d3c6928ce921a75ae3fb462f9d838d0ad85c24211e5d8d35f0c675f85f3175bbe7e0162f14
+  data.tar.gz: 3be4b8feaf645dac3d85eb5f69cdfc848425f25ac6d279d39bcb31a504e4483cb93a28e42c7b4c3b27202eb9718089f1c16fd35b0b2d6406f00c638de3dea64a

data/.gitignore

@@ -21,6 +21,7 @@
 /test.db
 /test.dump
 /test.kct
+/test.ldb
 /test.log
 /test.record
 /test.tch

data/Rakefile

@@ -23,7 +23,7 @@ require 'rake'
 require "bundler/gem_tasks"
 require 'jeweler2'
 
-dictVersion = "1.6.0"
+dictVersion = "1.6.1"
 
 
 task :default => [:test] do
@@ -79,6 +79,9 @@ task :test do
   ["test.record", "test.tch", "test.db" ].each {|name|
     File.unlink( name ) if File.exist?( name )
   }
+  ["test.ldb"].each {|name|
+    FileUtils.rm_rf( name ) if File.exist?( name )
+  }
   files = []
   files << "./test/memcache.nnd"
   files << "./test/util.nnd"
@@ -94,19 +97,24 @@ task :test do
     files << "./test/henkan-main.nnd  gdbm"
   when 'tokyocabinet'
     files << "./test/henkan-main.nnd  tokyocabinet"
+  when 'leveldb'
+    files << "./test/henkan-main.nnd  leveldb"
   when 'redis'
     files << "./test/redis.nnd"
     files << "./test/henkan-main.nnd  redis"
   when 'pure'
     files << "./test/henkan-main.nnd  pure"
+    files << "./test/henkan-main.nnd  leveldb"
   when 'all'
     files << "./test/henkan-main.nnd  gdbm"
     files << "./test/henkan-main.nnd  tokyocabinet"
     files << "./test/henkan-main.nnd  redis"
     files << "./test/henkan-main.nnd  pure"
+    files << "./test/henkan-main.nnd  leveldb"
   else # default
     files << "./test/henkan-main.nnd  tokyocabinet"
     files << "./test/henkan-main.nnd  pure"
+    files << "./test/henkan-main.nnd  leveldb"
   end
   files.each {|filename|
     sh  sprintf( "ruby -I ./lib -S nendo -I ./lib -d %s", filename )
@@ -119,10 +127,11 @@ task :bench do
   sh "time nendo -I ./lib ./test/henkan-bench.nnd"
 end
 
-task :alljisyo => [ :jisyo, :load, :dump, :md5 ]
+task :alljisyo => [ :jisyo, :load, :dump, :load_leveldb, :md5 ]
 
 task :md5 do
-  sh sprintf( "md5sum ./data/SEKKA-JISYO-%s.N.tsv > ./data/SEKKA-JISYO-%s.N.md5", dictVersion, dictVersion )
+  sh sprintf( "md5sum ./data/SEKKA-JISYO-%s.N.tsv        > ./data/SEKKA-JISYO-%s.N.md5",            dictVersion, dictVersion )
+  sh sprintf( "md5sum ./data/SEKKA-JISYO-%s.N.ldb.tar.gz > ./data/SEKKA-JISYO-%s.N.ldb.tar.gz.md5", dictVersion, dictVersion )
 end
 
 task :jisyo do
@@ -144,6 +153,11 @@ task :dump do
   sh sprintf( "ruby ./bin/sekka-jisyo dump    ./data/SEKKA-JISYO.N.tch#xmsiz=1024m > ./data/SEKKA-JISYO-%s.N.tsv", dictVersion )
 end
 
+task :load_leveldb do
+#  sh sprintf( "ruby ./bin/sekka-jisyo load    ./data/SEKKA-JISYO.N  ./data/SEKKA-JISYO-%s.N.ldb", dictVersion )
+  sh sprintf( "tar zcCf ./data ./data/SEKKA-JISYO-%s.N.ldb.tar.gz ./SEKKA-JISYO-%s.N.ldb" , dictVersion, dictVersion )
+end
+
 # SKK-JISYO.hiragana-phrase はWikipediaから作られる。
 task :phrase => [ "/tmp/jawiki.txt.gz", "./data/wikipedia/jawiki.hiragana.txt" ] do
   sh "sort ./data/wikipedia/jawiki.hiragana.txt | uniq -c | sort > ./data/wikipedia/ranking.txt"

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 6
-:patch: 2
+:patch: 3

data/bin/sekka-jisyo

@@ -80,19 +80,21 @@ core.evalStr( <<";;END-OF-SCRIPT" )
 
 (define (display-help)
   (print "Usage : ")
-  (print "  sekka-jisyo convertA SKK-JISYO.X      > SEKKA-JISYO.X       ... output   SEKKA-JISYO to STDOUT(AZIK data included)")
-  (print "  sekka-jisyo convertN SKK-JISYO.X      > SEKKA-JISYO.X       ... output   SEKKA-JISYO to STDOUT(AZIK data excluded)")
-  (print "  sekka-jisyo load     SEKKA-JISYO.X      SEKKA-JISYO.X.tch   ... load     SEKKA-JISYO to Tokyo Cabinet DB")
-  (print "  sekka-jisyo load     SEKKA-JISYO.X      SEKKA-JISYO.X.db    ... load     SEKKA-JISYO to gdbm          DB")
-  (print "  sekka-jisyo load     SEKKA-JISYO.X      redis:[hostname]    ... load     SEKKA-JISYO to redis DB on [hostname]")
-  (print "  sekka-jisyo load     SEKKA-JISYO.X      redis:              ... load     SEKKA-JISYO to redis DB on localhost")
-  (print "  sekka-jisyo dump     SEKKA-JISYO.X.tch                      ... dump     Tokyo Cabinet DB         to   DUMPDATA(STDOUT)")
-  (print "  sekka-jisyo dump     SEKKA-JISYO.X.db                       ... dump     gdbm                     to   DUMPDATA(STDOUT)")
-  (print "  sekka-jisyo dump     redis:[hostname]                       ... dump     redis DB on [hostname]   to   DUMPDATA(STDOUT)")
-  (print "  sekka-jisyo dump     redis:                                 ... dump     redis DB on localhost    to   DUMPDATE(STDOUT)")
-  (print "  sekka-jisyo restore  SEKKA-JISYO.X.tsv  SEKKA-JISYO.X.tch   ... restore  Tokyo Cabinet DB from tsv-file")
-  (print "  sekka-jisyo restore  SEKKA-JISYO.X.tsv  redis:[hostname]    ... restore  redis DB on [hostname]   from tsv-file")
-  (print "  sekka-jisyo restore  SEKKA-JISYO.X.tsv  redis:              ... restore  redis DB on localhost    from tsv-file"))
+  (print "  sekka-jisyo convertA SKK-JISYO.X      > SEKKA-JISYO.X          ... output   SEKKA-JISYO to STDOUT(AZIK data included)")
+  (print "  sekka-jisyo convertN SKK-JISYO.X      > SEKKA-JISYO.X          ... output   SEKKA-JISYO to STDOUT(AZIK data excluded)")
+  (print "  sekka-jisyo load     SEKKA-JISYO.X      SEKKA-JISYO.X.tch      ... load     SEKKA-JISYO to Tokyo Cabinet DB")
+  (print "  sekka-jisyo load     SEKKA-JISYO.X      SEKKA-JISYO.X.db       ... load     SEKKA-JISYO to gdbm          DB")
+  (print "  sekka-jisyo load     SEKKA-JISYO.X      SEKKA-JISYO.X.ldb      ... load     SEKKA-JISYO to LevelDB")
+  (print "  sekka-jisyo load     SEKKA-JISYO.X      redis:[hostname]       ... load     SEKKA-JISYO to redis DB on [hostname]")
+  (print "  sekka-jisyo load     SEKKA-JISYO.X      redis:                 ... load     SEKKA-JISYO to redis DB on localhost")
+  (print "  sekka-jisyo dump     SEKKA-JISYO.X.tch                         ... dump     Tokyo Cabinet DB         to   DUMPDATA(STDOUT)")
+  (print "  sekka-jisyo dump     SEKKA-JISYO.X.db                          ... dump     gdbm                     to   DUMPDATA(STDOUT)")
+  (print "  sekka-jisyo dump     SEKKA-JISYO.X.ldb                         ... dump     LevelDB                  to   DUMPDATA(STDOUT)")
+  (print "  sekka-jisyo dump     redis:[hostname]                          ... dump     redis DB on [hostname]   to   DUMPDATA(STDOUT)")
+  (print "  sekka-jisyo dump     redis:                                    ... dump     redis DB on localhost    to   DUMPDATE(STDOUT)")
+  (print "  sekka-jisyo restore  SEKKA-JISYO.X.tsv  SEKKA-JISYO.X.tch      ... restore  Tokyo Cabinet DB from tsv-file")
+  (print "  sekka-jisyo restore  SEKKA-JISYO.X.tsv  redis:[hostname]       ... restore  redis DB on [hostname]   from tsv-file")
+  (print "  sekka-jisyo restore  SEKKA-JISYO.X.tsv  redis:                 ... restore  redis DB on localhost    from tsv-file"))
 
 
 (define (analyze-kvs-type filename)
@@ -101,6 +103,8 @@ core.evalStr( <<";;END-OF-SCRIPT" )
     (values 'tokyocabinet filename))
    ((rxmatch #/[.]db$/ filename)
     (values 'gdbm filename))
+   ((rxmatch #/[.]ldb$/ filename)
+    (values 'leveldb filename))
    ((rxmatch #/^redis:(.*)$/ filename)
     => (lambda (m)
          (let1 str (rxmatch-substring m 1)

data/bin/sekka-server

@@ -15,15 +15,20 @@ DICTURL = "https://raw.githubusercontent.com/kiyoka/sekka/master/public_dict/" +
 
 PIDFILE   = DICTDIR + "/pid"
 
-TC_OPTS   = "#xmsiz=256m"
-TC_FILE   = sprintf( "%s/SEKKA-JISYO-%s.N.tch%s", DICTDIR, SekkaVersion.dictVersion, TC_OPTS )
-TSVFILE   = sprintf( "%s/SEKKA-JISYO-%s.N.tsv",   DICTDIR, SekkaVersion.dictVersion )
-SUMFILE   = sprintf( "%s/SEKKA-JISYO-%s.N.md5",   DICTDIR, SekkaVersion.dictVersion )
+TC_OPTS       = "#xmsiz=256m"
+TC_FILE       = sprintf( "%s/SEKKA-JISYO-%s.N.tch%s",          DICTDIR, SekkaVersion.dictVersion, TC_OPTS )
+TSV_FILE      = sprintf( "%s/SEKKA-JISYO-%s.N.tsv",            DICTDIR, SekkaVersion.dictVersion )
+TSV_SUMFILE   = sprintf( "%s/SEKKA-JISYO-%s.N.md5",            DICTDIR, SekkaVersion.dictVersion )
+LDB_FILE      = sprintf( "%s/SEKKA-JISYO-%s.N.ldb.tar.gz",     DICTDIR, SekkaVersion.dictVersion )
+LDB_SUMFILE   = sprintf( "%s/SEKKA-JISYO-%s.N.ldb.tar.gz.md5", DICTDIR, SekkaVersion.dictVersion )
 
-GDBM_FILE = sprintf( "%s/SEKKA-JISYO-%s.N.db",    DICTDIR, SekkaVersion.dictVersion )
+GDBM_FILE     = sprintf( "%s/SEKKA-JISYO-%s.N.db",          DICTDIR, SekkaVersion.dictVersion )
+LEVELDB_FILE  = sprintf( "%s/SEKKA-JISYO-%s.N.ldb",         DICTDIR, SekkaVersion.dictVersion )
 
-URLURL    = sprintf( "%s/SEKKA-JISYO-%s.N.url",   DICTURL, SekkaVersion.dictVersion )
-SUMURL    = sprintf( "%s/SEKKA-JISYO-%s.N.md5",   DICTURL, SekkaVersion.dictVersion )
+TSV_URLURL    = sprintf( "%s/SEKKA-JISYO-%s.N.url",              DICTURL, SekkaVersion.dictVersion )
+TSV_SUMURL    = sprintf( "%s/SEKKA-JISYO-%s.N.md5",              DICTURL, SekkaVersion.dictVersion )
+LDB_URLURL    = sprintf( "%s/SEKKA-JISYO-%s.N.ldb.tar.gz.url",   DICTURL, SekkaVersion.dictVersion )
+LDB_SUMURL    = sprintf( "%s/SEKKA-JISYO-%s.N.ldb.tar.gz.md5",   DICTURL, SekkaVersion.dictVersion )
 
 MEMCACHED = "localhost:11211"                # memcahced
 
@@ -41,8 +46,10 @@ def getSekkaDbInfo( env )
       [ :tokyocabinet, nil ]
     elsif m = ENV['SEKKA_DB'].match( /^gdbm$/i )
       [ :gdbm, nil ]
+    elsif m = ENV['SEKKA_DB'].match( /^level[a-z]+$/i )
+      [ :leveldb, nil ]
     else
-      raise RuntimeError, "Error: env var SEKKA_DB requires [redis:hostname] or [redis:] or [tokyocabinet]"
+      raise RuntimeError, "Error: env var SEKKA_DB requires [redis:hostname] or [redis:] or [tokyocabinet] or [leveldb]"
     end
   else
     [ :tokyocabinet, nil ]
@@ -56,18 +63,25 @@ def checkJisyoIsInstalled( dictType, dictSource )
     result = case dictType
              when :gdbm
                require 'sekka/kvs'
-               tc = Kvs.new( :gdbm )
-               tc.open( dictSource )
-               ret = tc.get( key )
-               tc.close()
+               kvs = Kvs.new( :gdbm )
+               kvs.open( dictSource )
+               ret = kvs.get( key )
+               kvs.close()
+               ret
+             when :leveldb
+               require 'sekka/kvs'
+               kvs = Kvs.new( :leveldb )
+               kvs.open( dictSource )
+               ret = kvs.get( key )
+               kvs.close()
                ret
              when :tokyocabinet
                require 'tokyocabinet'
                require 'sekka/kvs'
-               tc = Kvs.new( :tokyocabinet )
-               tc.open( dictSource )
-               ret = tc.get( key )
-               tc.close()
+               kvs = Kvs.new( :tokyocabinet )
+               kvs.open( dictSource )
+               ret = kvs.get( key )
+               kvs.close()
                ret
              when :redis
                begin
@@ -86,65 +100,75 @@ def checkJisyoIsInstalled( dictType, dictSource )
   end
 end
 
-def main
-  if not File.directory?( DICTDIR )
-    Dir.mkdir( DICTDIR )
-    STDERR.printf( "Info: created directory [%s]\n", DICTDIR )
-  end
-
-  # sekka-server自身のpidを書きこむ(デーモン化したときの停止用)
-  open( PIDFILE, "w" ) {|f|
-    f.printf( "%d\n", Process.pid )
-  }
-
-  # 環境変数からHTTPプロキシサーバーの情報を取得する
-  proxyHost = nil
-  proxyPort = nil
-  if ENV.key?( 'http_proxy' )
-    uri = URI.parse ENV[ 'http_proxy' ]
-    proxyPort = uri.port
-    proxyHost = uri.host
-  end
-
-  if not File.exist?( TSVFILE )
+def downloadFile( targetfile, sumfile, urlurl, sumurl )
+  if not File.exist?( targetfile )
     STDERR.printf( "Info: Downloading SEKKA-JISYO\n" )
     # 辞書をダウンロードする
-    cmd = sprintf( "curl %s",          URLURL )
+    cmd = sprintf( "curl %s",          urlurl )
     STDERR.printf( "Command : %s\n", cmd )
-    tsvurl = open( "|" + cmd ) { |f|
+    targeturl = open( "|" + cmd ) { |f|
       f.read
     }
-    STDERR.printf( "   download   URL of tsv file : %s\n", tsvurl );
-    cmd = sprintf( "curl -o %s %s",    TSVFILE, tsvurl )
+    STDERR.printf( "   download   URL of target file : %s\n", targeturl );
+    cmd = sprintf( "curl -o %s %s",    targetfile, targeturl )
     STDERR.printf( "Command : %s\n", cmd )
     system( cmd )
-    cmd = sprintf( "curl -o %s %s",    SUMFILE, SUMURL )
+    cmd = sprintf( "curl -o %s %s",    sumfile, sumurl )
     STDERR.printf( "Command : %s\n", cmd )
     system( cmd )
 
     # チェックサムを確認する
     downloadSum = ""
-    open( TSVFILE ) { |f|
+    open( targetfile ) { |f|
       dataBody = f.read
       downloadSum = Digest::MD5.hexdigest( dataBody )
     }
-    open( SUMFILE ) { |f|
+    open( sumfile ) { |f|
       correctSum = f.readline.chomp.split[0]
       STDERR.printf( "   downloaded file's MD5 : %s\n", downloadSum )
       STDERR.printf( "             correct MD5 : %s\n", correctSum   )
       if downloadSum == correctSum
-        STDERR.printf( "Info:  downloaded file [%s] verify OK.\n", TSVFILE )
+        STDERR.printf( "Info:  downloaded file [%s] verify OK.\n", targetfile )
       else
-        STDERR.printf( "Error: downloaded file [%s] verify NG.\n", TSVFILE )
-        File.unlink( TSVFILE )
+        STDERR.printf( "Error: downloaded file [%s] verify NG.\n", targetfile )
+        File.unlink( targetfile )
         exit( 1 )
       end
     }
   end
+end
+  
+def main
+  if not File.directory?( DICTDIR )
+    Dir.mkdir( DICTDIR )
+    STDERR.printf( "Info: created directory [%s]\n", DICTDIR )
+  end
+
+  # sekka-server自身のpidを書きこむ(デーモン化したときの停止用)
+  open( PIDFILE, "w" ) {|f|
+    f.printf( "%d\n", Process.pid )
+  }
+
+  # 環境変数からHTTPプロキシサーバーの情報を取得する
+  proxyHost = nil
+  proxyPort = nil
+  if ENV.key?( 'http_proxy' )
+    uri = URI.parse ENV[ 'http_proxy' ]
+    proxyPort = uri.port
+    proxyHost = uri.host
+  end
 
   # 環境変数から、DBの接続先情報を取得する。
   ( dictType, dictSource ) = getSekkaDbInfo( ENV )
 
+  # 必要なファイルをダウンロードする
+  case dictType
+  when :leveldb
+    downloadFile( LDB_FILE, LDB_SUMFILE, LDB_URLURL, LDB_SUMURL )
+  else
+    downloadFile( TSV_FILE, TSV_SUMFILE, TSV_URLURL, TSV_SUMURL )
+  end
+
   case dictType
   when :gdbm
     # GDBMに辞書が投入済みか確認する
@@ -152,20 +176,33 @@ def main
     unless ok
       # tsvファイルをuploadする
       STDERR.printf( "Info: Uploading...\n" )
-      cmd = sprintf( "sekka-jisyo restore %s %s", TSVFILE, GDBM_FILE )
+      cmd = sprintf( "sekka-jisyo restore %s %s", TSV_FILE, GDBM_FILE )
       STDERR.printf( "Command : %s\n", cmd )
       system( cmd )
     end
     STDERR.printf( "Info: [OK]\n" )
     dictSource = GDBM_FILE
 
+  when :leveldb
+    # GDBMに辞書が展開済みか確認する
+    ok = checkJisyoIsInstalled( dictType, LDB_FILE )
+    unless ok
+      # tar.gzを展開する
+      STDERR.printf( "Info: Extracting...\n" )
+      cmd = sprintf( "tar zxCf %s %s", DICTDIR, LDB_FILE )
+      STDERR.printf( "Command : %s\n", cmd )
+      system( cmd )
+    end
+    STDERR.printf( "Info: [OK]\n" )
+    dictSource = LEVELDB_FILE
+
   when :tokyocabinet
     # TokyoCabinetに辞書が投入済みか確認する
     ok = checkJisyoIsInstalled( dictType, TC_FILE )
     unless ok
       # tsvファイルをuploadする
       STDERR.printf( "Info: Uploading...\n" )
-      cmd = sprintf( "sekka-jisyo restore %s %s", TSVFILE, TC_FILE )
+      cmd = sprintf( "sekka-jisyo restore %s %s", TSV_FILE, TC_FILE )
       STDERR.printf( "Command : %s\n", cmd )
       system( cmd )
     end
@@ -178,7 +215,7 @@ def main
     unless ok
       # tsvファイルをuploadする。
       STDERR.printf( "Info: Uploading...\n" )
-      cmd = sprintf( "sekka-jisyo restore %s %s:%s", TSVFILE, dictType, dictSource )
+      cmd = sprintf( "sekka-jisyo restore %s %s:%s", TSV_FILE, dictType, dictSource )
       STDERR.printf( "Command : %s\n", cmd )
       system( cmd )
     end

data/data/.gitignore

@@ -10,6 +10,12 @@
 /SEKKA-JISYO-1.5.1.N.tsv
 /SEKKA-JISYO-1.6.0.N.md5
 /SEKKA-JISYO-1.6.0.N.tsv
+/SEKKA-JISYO-1.6.1.N.ldb
+/SEKKA-JISYO-1.6.1.N.ldb
+/SEKKA-JISYO-1.6.1.N.ldb.tar.gz
+/SEKKA-JISYO-1.6.1.N.ldb.tar.gz.md5
+/SEKKA-JISYO-1.6.1.N.md5
+/SEKKA-JISYO-1.6.1.N.tsv
 /SEKKA-JISYO.CUSTOM
 /SEKKA-JISYO.CUSTOM.tch
 /SEKKA-JISYO.CUSTOM~
@@ -31,6 +37,7 @@
 /SEKKA-JISYO.LARGE.tch
 /SEKKA-JISYO.N
 /SEKKA-JISYO.N.SMALL
+/SEKKA-JISYO.N.ldb
 /SEKKA-JISYO.N.md5
 /SEKKA-JISYO.N.tch#xmsiz=1024m
 /SEKKA-JISYO.N.tsv

data/emacs/sekka.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
 ;; Author: Kiyoka Nishiyama <kiyoka@sumibi.org>
-;; Version: 1.6.2          ;;SEKKA-VERSION
+;; Version: 1.6.3          ;;SEKKA-VERSION
 ;; Keywords: ime, skk, japanese
 ;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.2"))
 ;; URL: https://github.com/kiyoka/sekka
@@ -1756,7 +1756,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.6.2" ;;SEKKA-VERSION
+  "1.6.3" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/kvs.rb

@@ -56,6 +56,13 @@ class Kvs
       @gdbmFlag = false
     end
 
+    @leveldbFlag = true
+    begin
+      require 'leveldb'
+    rescue LoadError
+      @leveldbFlag = false
+    end
+
     @dbtype = dbtype
     case dbtype
     when :tokyocabinet
@@ -80,7 +87,12 @@ class Kvs
         raise RuntimeError, "Kvs.new() missed require( 'gdbm' )."
       end
 
-      # do nothing
+    when :leveldb
+      if @leveldbFlag
+        # do nothing
+      else
+        raise RuntimeError, "Kvs.new() missed require( 'leveldb' )."
+      end
 
     when :pure
       # do nothing
@@ -106,6 +118,11 @@ class Kvs
         name = name + ".db"
       end
       @db = GDBM.new( name, nil, GDBM::FAST | GDBM::WRCREAT )
+    when :leveldb
+      if not name.match( /.ldb$/ )
+        name = name + ".ldb"
+      end
+      @db = LevelDB::DB.new name
     when :pure
       @name = name
       if File.exist?( @name )
@@ -141,7 +158,7 @@ class Kvs
   def pure_put!( key, value, timeout = 0 )
     if 0 < key.size
       case @dbtype
-      when :tokyocabinet, :gdbm, :redis
+      when :tokyocabinet, :gdbm, :redis, :leveldb
         @db[ key.force_encoding("ASCII-8BIT") ] = value.force_encoding("ASCII-8BIT")
       when :memcache
         @db.set( key.force_encoding("ASCII-8BIT"), value.force_encoding("ASCII-8BIT"), timeout )
@@ -181,6 +198,8 @@ class Kvs
     case @dbtype
     when :tokyocabinet, :gdbm, :pure
       @db.clear
+    when :leveldb
+      @db.clear!
     when :redis
       @db.flushall
     when :memcache
@@ -199,7 +218,7 @@ class Kvs
       }
     when :memcache
       raise RuntimeError, "Kvs#keys method was not implemented for memcache."
-    when :pure
+    when :leveldb, :pure
       @db.keys
     else
       raise RuntimeError
@@ -218,7 +237,7 @@ class Kvs
       }
     when :memcache
       raise RuntimeError, "Kvs#forward_match_keys method was not implemented for memcache."
-    when :gdbm, :pure
+    when :gdbm, :leveldb, :pure
       self.keys( ).select {|key|
         key.match( "^" + prefix )
       }
@@ -229,7 +248,7 @@ class Kvs
 
   def close()
     case @dbtype
-    when :tokyocabinet, :gdbm
+    when :tokyocabinet, :leveldb, :gdbm
       @db.close
     when :memcache, :redis
       # do nothing

data/lib/sekka/sekkaversion.rb

@@ -1,4 +1,4 @@
 class SekkaVersion
-  def  self.version()     "1.6.2"  end
-  def  self.dictVersion() "1.6.0"  end
+  def  self.version()     "1.6.3"  end
+  def  self.dictVersion() "1.6.1"  end
 end

data/public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.ldb.tar.gz.md5

@@ -0,0 +1 @@
+bf19c45609846badd608722e657da607  ./data/SEKKA-JISYO-1.6.1.N.ldb.tar.gz

data/public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.ldb.tar.gz.url

@@ -0,0 +1,2 @@
+https://s3-ap-northeast-1.amazonaws.com/sekkadict/1.6.1/SEKKA-JISYO-1.6.1.N.ldb.tar.gz
+

data/public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.md5

@@ -0,0 +1 @@
+76471f8453ed7cdf975113fe7ea7fed0  ./data/SEKKA-JISYO-1.6.1.N.tsv

data/public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.url

@@ -0,0 +1 @@
+https://s3-ap-northeast-1.amazonaws.com/sekkadict/1.6.1/SEKKA-JISYO-1.6.1.N.tsv

data/test/henkan-main.nnd

@@ -58,6 +58,8 @@
   (set! target "./test"))
  ((eq? dbtype 'pure)
   (set! target "./test.dump"))
+ ((eq? dbtype 'leveldb)
+  (set! target "./test.ldb"))
  ((eq? dbtype 'memcache)
   (error "memcached interface is obsolute."))
  (else
@@ -148,6 +150,8 @@
   (require "gdbm"))
  ((eq? dbtype 'pure)
   (kvs.open target))
+ ((eq? dbtype 'leveldb)
+  (kvs.open target))
  ((eq? dbtype 'memcache)
   (error "memcached interface is obsolute."))
  (else

data/test/sekka-dump-out-1.txt

@@ -1868,4 +1868,4 @@ M:みr	/見/観;(字義:みわたす)/視;(字義:じっとみる)/診;(diagnose
 M:わけ	/訳/和気;地名/理由;当て字/分け/分/譯;「訳」の旧字/戯奴
 M:わたしh	/私
 M:を	/小/緒/雄/男/牡/尾/悪/汚/惡;「悪」の旧字(人名用漢字)
-SEKKA:VERSION	1.6.0
+SEKKA:VERSION	1.6.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -207,6 +207,10 @@ files:
 - public_dict/1.5.0/SEKKA-JISYO.N.url
 - public_dict/1.6.0/SEKKA-JISYO-1.6.0.N.md5
 - public_dict/1.6.0/SEKKA-JISYO-1.6.0.N.url
+- public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.ldb.tar.gz.md5
+- public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.ldb.tar.gz.url
+- public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.md5
+- public_dict/1.6.1/SEKKA-JISYO-1.6.1.N.url
 - script/sekkaserver.debian
 - sekka.gemspec
 - test/.gitignore