sekka 0.9.1 → 0.9.2

data/bin/sekka-jisyo

@@ -65,23 +65,47 @@ core.evalStr( <<";;END-OF-SCRIPT" )
   (dump-sekka-jisyo-f STDOUT sekka-file))
 
 
+(define (restore-sekka-jisyo tsv-file target)
+  (with-open
+   tsv-file
+   (lambda (f)
+     (restore-sekka-jisyo-f
+      f
+      target))))
+
+
 (define (display-help)
   (print "Usage : ")
-  (print "  sekka-jisyo convert SKK-JISYO.X  > SEKKA-JISYO.X       ... output SEKKA-JISYO to STDOUT")
-  (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 ndbm          DB")
-  (print "  sekka-jisyo dump    SEKKA-JISYO.X.tch                  ... dump   Tokyo Cabinet DB to SEKKA-JISYO(STDOUT)")
-  (print "  sekka-jisyo dump    SEKKA-JISYO.X.db                   ... dump   ndbm          DB to SEKKA-JISYO(STDOUT)"))
+  (print "  sekka-jisyo convert  SKK-JISYO.X      > SEKKA-JISYO.X       ... output   SEKKA-JISYO to STDOUT")
+  (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 ndbm          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     ndbm                     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  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)
   (cond
    ((rxmatch #/[.]tch$/ filename)
-    'tokyocabinet)
+    (values 'tokyocabinet filename))
    ((rxmatch #/[.]db$/ filename)
-    'dbm)
+    (values 'dbm filename))
+   ((rxmatch #/^redis:(.*)$/ filename)
+    => (lambda (m)
+         (let1 str (rxmatch-substring m 1)
+           (let1 hostname (if (< 0 (str.size))
+                              str
+                              "localhost")
+             (values 'redis hostname)))))
    (else
     (errorf "Error: analyze-kvs-type() got unsupported filename [%s] \n" filename))))
 
+
 (define (main argv)
   (cond
    ((= 0 (length argv))
@@ -95,16 +119,28 @@ core.evalStr( <<";;END-OF-SCRIPT" )
             (convert-skk-jisyo (second argv))))
        ((eq? 'load command)
         (let1 filename (third argv)
-          (set-kvs-type (analyze-kvs-type filename))
-          (if (< (length argv) 3)
-              (display-help)
-              (load-sekka-jisyo (second argv) filename))))
+          (receive (type param)
+              (analyze-kvs-type filename)
+            (set-kvs-type type)
+            (if (< (length argv) 3)
+                (display-help)
+                (load-sekka-jisyo (second argv) param)))))
        ((eq? 'dump command)
         (let1 filename (second argv)
-          (set-kvs-type (analyze-kvs-type filename))
-          (if (< (length argv) 2)
-              (display-help)
-              (dump-sekka-jisyo filename))))
+          (receive (type param)
+              (analyze-kvs-type filename)
+            (set-kvs-type type)
+            (if (< (length argv) 2)
+                (display-help)
+                (dump-sekka-jisyo param)))))
+       ((eq? 'restore command)
+        (if (< (length argv) 3)
+            (display-help)
+            (let1 target (third argv)
+              (receive (type hostname)
+                  (analyze-kvs-type target)
+                (set-kvs-type type)
+                (restore-sekka-jisyo (second argv) hostname)))))
        (else
         (errorf "Error: no such command [%s] \n" command )))))))
 

data/bin/sekka-server

@@ -27,6 +27,26 @@ TC_FILE_LIST = [ DICTDIR + "/SEKKA-JISYO.CUSTOM.tch",
 
 MEMCACHED = "localhost:11211"                # memcahced
 
+def getSekkaDbInfo( env )
+  if env.has_key?( 'SEKKA_DB' )
+    m = env['SEKKA_DB'].match( /^redis:(.*)$/ )
+    if m
+      dictSource = if 0 == m[1].size
+                    dictSource = "localhost"
+                  else
+                    dictSource = m[1]
+                  end
+      [ :redis, dictSource ]
+    elsif m = ENV['SEKKA_DB'].match( /^tokyo[a-z]+$/ )
+      [ :tokyocabinet, nil ]
+    else
+      raise RuntimeError, "Error: env var SEKKA_DB requires [redis:hostname] or [redis:] or [tokyocabinet]"
+    end
+  else
+    [ :tokyocabinet, nil ]
+  end
+end
+
 
 def main
   if not File.directory?( DICTDIR )
@@ -48,7 +68,7 @@ def main
     proxyHost = uri.host
   end
 
-  if not File.exist?( TC_FILE )
+  if not File.exist?( TSVFILE )
     STDERR.printf( "Info: Downloading SEKKA-JISYO\n" )
     # 辞書をダウンロードする
     cmd = sprintf( "curl -o %s %s",    TSVFILE, TSVURL )
@@ -76,26 +96,61 @@ def main
         exit( 1 )
       end
     }
-
-    # tsvファイルをTokyo CabinetのHashDB化する
-    STDERR.printf( "Info: Converting TSV file to Tokyo Cabinet *.tch\n" )
-    cmd = sprintf( "tchmgr importtsv %s %s", TC_FILE, TSVFILE )
-    STDERR.printf( "Command : %s\n", cmd )
-    system( cmd )
-
-    # 中身を確認する(tchmgrで読めるものができている)
-    STDERR.printf( "Info: inform *.tch\n" )
-    cmd = sprintf( "tchmgr inform %s", TC_FILE )
-    STDERR.printf( "Command : %s\n", cmd )
-    system( cmd )
-
   end
 
-  # 辞書ディレクトリに存在している辞書ファイルリストを作る
-  list = TC_FILE_LIST.select { |name| File.exist?( name ) }
+  # 環境変数から、DBの接続先情報を取得する。
+  ( dictType, dictSource ) = getSekkaDbInfo( ENV )
+
+  case dictType
+  when :tokyocabinet
+    # .tchファイルが存在すうるか調べる
+    list = TC_FILE_LIST.select { |name| File.exist?( name ) }
+
+    if 0 == list.size
+      # tsvファイルをTokyo CabinetのHashDB化する
+      STDERR.printf( "Info: Converting TSV file to Tokyo Cabinet *.tch\n" )
+      cmd = sprintf( "tchmgr importtsv %s %s", TC_FILE, TSVFILE )
+      STDERR.printf( "Command : %s\n", cmd )
+      system( cmd )
+
+      # 中身を確認する(tchmgrで読めるものができている)
+      STDERR.printf( "Info: inform *.tch\n" )
+      cmd = sprintf( "tchmgr inform %s", TC_FILE )
+      STDERR.printf( "Command : %s\n", cmd )
+      system( cmd )
+    end
+
+    # 存在する.tchファイルの中で一番最初のファイルを使う。
+    list = TC_FILE_LIST.select { |name| File.exist?( name ) }
+    dictSource = list[0]
+  when :redis
+    key = "SEKKA::VERSION"
+    # redisサーバーに辞書が投入済みか確認する
+    STDERR.printf( "Info: Checking SEKKA jisyo on redis server...\n" )
+    require 'redis'
+    require 'sekka/kvs'
+    redis = Kvs.new( :redis )
+    begin
+      redis.open( dictSource )
+      result = redis.get( key )
+    rescue => e
+      STDERR.printf( "Error: sekka-server can't connect to redis(port=%s)...\n", dictSource )
+      exit 1
+    end
+    unless result
+      # tsvファイルをuploadする。
+      STDERR.printf( "Info: Uploading...\n" )
+      cmd = sprintf( "sekka-jisyo restore %s %s:%s", TSVFILE, dictType, dictSource )
+      STDERR.printf( "Command : %s\n", cmd )
+      system( cmd )
+    end
+    STDERR.printf( "Info: [OK]\n" )
+  else
+    raise RuntimeError, sprintf( "Error: unknown dictType [%s]", dictType )
+  end
 
   # 設定項目をConfigオブジェクトに代入
-  SekkaServer::Config.setup( list[0], MEMCACHED, 12929, proxyHost, proxyPort )
+  SekkaServer::Config.setup( dictType, dictSource, MEMCACHED, 12929, proxyHost, proxyPort )
 
   # サーバースクリプトのrootディレクトリへ移動
   FileUtils.cd(File.dirname(__FILE__) + "/../")

data/emacs/sekka.el

@@ -109,6 +109,11 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   :type  'boolean
   :group 'sekka)
 
+(defcustom sekka-muhenkan-key "q"
+  "*Non-nil であれば、リアルタイムガイド表示中はqキーで無変換のままスペースを挿入する。q以外のキーも設定可能。
+但し、アルファベットのようにバッファにinsert可能な文字のみ設定可能。"
+  :type  'string
+  :group 'sekka)
 
 
 (defface sekka-guide-face
@@ -1359,6 +1364,21 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	      (sekka-insert-space arg))))))
 
 
+(defun sekka-muhenkan-key-init-function ()
+  (define-key global-map sekka-muhenkan-key
+    '(lambda (&optional arg)(interactive "P")
+       (if (< 0 sekka-timer-rest)
+	   ;; qキーで無変換+スペースを入力する
+	   (cond
+	    ((string= " " (char-to-string (preceding-char)))	 
+	     ;; 2回目のキー入力で本来のsekka-muhenkan-keyで定義された文字を挿入する
+	     (insert sekka-muhenkan-key))
+	    (t
+	     ;; 無変換で進むために、スペースを開ける。
+	     (sekka-insert-space 1)))
+	 (insert sekka-muhenkan-key)))))
+
+
 (defun sekka-realtime-guide ()
   "リアルタイムで変換中のガイドを出す
 sekka-modeがONの間中呼び出される可能性がある。"
@@ -1484,6 +1504,8 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
     (add-hook 'sekka-mode-hook 'sekka-sticky-shift-init-function))
 
   (add-hook 'sekka-mode-hook 'sekka-spacekey-init-function)
+  (when sekka-muhenkan-key
+    (add-hook 'sekka-mode-hook 'sekka-muhenkan-key-init-function))
 
   (when sekka-mode (run-hooks 'sekka-mode-hook))
 
@@ -1530,7 +1552,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "0.9.1" ;;SEKKA-VERSION
+  "0.9.2" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/jisyo-db.nnd

@@ -34,11 +34,14 @@
 ;;;  $Id: 
 ;;;
 (use srfi-1)
+(require "progressbar")
 (require "sekka/kvs")
+(require "sekka/sekkaversion")
 (use sekka.util)
 
-(define masterid "MASTER")
-(define workid   "WORK")
+(define masterid  "MASTER")
+(define workid    "WORK")
+(define versionid "SEKKA::VERSION")
 
 (define alphabet-string "abcdefghijklmnopqrstuvwxyz>@;#")
 (define alphabet-lower-list (to-list (alphabet-string.split "")))
@@ -177,6 +180,7 @@
     (kvs.clear)
     (create-keylist kvs f)
     (setup-ready-made-keylist kvs keylist)
+    (kvs.put! versionid SekkaVersion.version)
     (kvs.close)))
 
 
@@ -190,9 +194,43 @@
     (kvs.close)))
 
 
-(define (openSekkaJisyo dictSource cacheSource)
-  (when (not (rxmatch #/tch$/ dictSource))
-    (set-kvs-type 'memcache))
+
+(define (restore-sekka-jisyo-f f filename-or-hostname)
+  (define (file-length f)
+    (let1 total 0
+      (for-each
+       (lambda (x)
+         (set! total (+ 1 total)))
+       f)
+      (f.rewind)
+      total))
+    
+  (define (restore f kvs progress)
+    (let loop ([line (f.readline.chomp)])
+      (let* (
+             [key-value
+              (to-list (line.split #/[\t]+/))]
+             [key    (first key-value)]
+             [value  (if (> 2 (length key-value))
+                         ""
+                         (second key-value))])
+        (kvs.put! key value)
+        (progress.inc))
+      (when (not (f.eof))
+        (loop (f.readline.chomp)))))
+
+
+  (let1 total (file-length f)
+    (let ([kvs (Kvs.new (get-kvs-type))]
+          [progress (ProgressBar.new "Restore" total STDERR)])
+      (kvs.open filename-or-hostname)
+      (kvs.clear)
+      (restore f kvs progress)
+      (kvs.close))))
+
+
+(define (openSekkaJisyo dictType dictSource cacheSource)
+  (set-kvs-type dictType)
   (let1 kvs   (Kvs.new (get-kvs-type))
     (kvs.open     #?=dictSource)
     (let1 cachesv (if cacheSource

data/lib/sekka/kvs.rb

@@ -42,6 +42,13 @@ class Kvs
       @tcFlag = false
     end
 
+    @redisFlag = true
+    begin
+      require 'redis'
+    rescue LoadError
+      @redisFlag = false
+    end
+
     @dbmFlag = true
     begin
       require 'dbm'
@@ -58,6 +65,11 @@ class Kvs
         raise RuntimeError, "Kvs.new() missed require( 'tokyocabinet' )."
       end
 
+    when :redis
+      if not @redisFlag
+        raise RuntimeError, "Kvs.new() missed require( 'redis' )."
+      end
+
     when :memcache
       # do nothing
 
@@ -67,7 +79,7 @@ class Kvs
       else
         raise RuntimeError, "Kvs.new() missed require( 'dbm' )."
       end
-      
+
       # do nothing
 
     when :pure
@@ -83,6 +95,8 @@ class Kvs
       if not @db.open( name, TokyoCabinet::HDB::OWRITER | TokyoCabinet::HDB::OCREAT )
         raise RuntimeError, sprintf( "TokyoCabinet::HDB.open error: file=%s", name )
       end
+    when :redis
+      @db = Redis.new( :host => name )
     when :memcache
       @db = MemCache.new( name )
     when :dbm
@@ -103,8 +117,11 @@ class Kvs
   end
 
   def fixdb( )
-    if not @db.optimize( )
-      raise RuntimeError, sprintf( "TokyoCabinet::HDB.optimize error: file=%s", name )
+    case @dbtype
+    when :tokyocabinet
+      if not @db.optimize( )
+        raise RuntimeError, sprintf( "TokyoCabinet::HDB.optimize error: file=%s", name )
+      end
     end
     true
   end
@@ -119,7 +136,7 @@ class Kvs
   def pure_put!( key, value, timeout = 0 )
     if 0 < key.size
       case @dbtype
-      when :tokyocabinet, :dbm
+      when :tokyocabinet, :dbm, :redis
         @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 )
@@ -146,13 +163,21 @@ class Kvs
   end
 
   def delete( key )
-    @db.delete( key )
+    case @dbtype
+    when :redis
+      @db.del( key )
+    else
+      @db.delete( key )
+    end
+    true
   end
 
   def clear()
     case @dbtype
     when :tokyocabinet, :dbm, :pure
       @db.clear
+    when :redis
+      @db.flushall
     when :memcache
       # do nothing
     else
@@ -163,7 +188,7 @@ class Kvs
   # return array of key string
   def keys()
     case @dbtype
-    when :tokyocabinet, :dbm
+    when :tokyocabinet, :dbm, :redis
       @db.keys.map { |k|
         k.force_encoding("UTF-8")
       }
@@ -182,6 +207,10 @@ class Kvs
       @db.fwmkeys( prefix ).each { |k|
         k.force_encoding("UTF-8")
       }
+    when :redis
+      @db.keys( prefix + "*" ).each { |k|
+        k.force_encoding("UTF-8")
+      }
     when :memcache
       raise RuntimeError, "Kvs#forward_match_keys method was not implemented for memcache."
     when :dbm, :pure
@@ -197,7 +226,7 @@ class Kvs
     case @dbtype
     when :tokyocabinet, :dbm
       @db.close
-    when :memcache
+    when :memcache, :redis
       # do nothign
     when :pure
       File.open( @name, "w" ) { |f|

data/lib/sekka/sekkaversion.rb

@@ -1,6 +1,5 @@
 class SekkaVersion
-  include Singleton
   def self.version
-    "0.9.1"
+    "0.9.2"
   end
 end

data/lib/sekkaconfig.rb

@@ -40,7 +40,8 @@ module SekkaServer
   class Config
     include Singleton
 
-    def self.setup( dictSource, cacheSource = false, listenPort, proxyHost, proxyPort )
+    def self.setup( dictType, dictSource, cacheSource = false, listenPort, proxyHost, proxyPort )
+      @@dictType    = dictType
       @@dictSource  = dictSource
       @@cacheSource = cacheSource
       @@listenPort  = listenPort
@@ -48,6 +49,10 @@ module SekkaServer
       @@proxyPort   = proxyPort
     end
 
+    def self.dictType
+      @@dictType
+    end
+
     def self.dictSource
       @@dictSource
     end

data/lib/sekkaserver.rb

@@ -54,7 +54,8 @@ module SekkaServer
       @core.evalStr( "(use sekka.henkan)" )
       @core.evalStr( '(define (writeToString sexp) (write-to-string sexp))' )
       @core.evalStr( '(export-to-ruby writeToString)' )
-      (@kvs,@cachesv) = @core.openSekkaJisyo( SekkaServer::Config.dictSource,
+      (@kvs,@cachesv) = @core.openSekkaJisyo( SekkaServer::Config.dictType,
+                                              SekkaServer::Config.dictSource,
                                               SekkaServer::Config.cacheSource )
       @queue = EM::Queue.new
       @mutex = Mutex.new
@@ -62,6 +63,7 @@ module SekkaServer
       STDERR.puts(   "----- Sekka Server Started -----" )
       STDERR.printf( "  Sekka version  : %s\n", SekkaVersion.version            )
       STDERR.printf( "  Nendo version  : %s\n", Nendo::Core.version             )
+      STDERR.printf( "  dict-type      : %s\n", SekkaServer::Config.dictType    )
       STDERR.printf( "  dict-db        : %s\n", SekkaServer::Config.dictSource  )
       STDERR.printf( "  memcached      : %s\n", SekkaServer::Config.cacheSource )
       STDERR.printf( "  listenPort     : %s\n", SekkaServer::Config.listenPort  )

data/test/henkan-main.nnd

@@ -51,6 +51,8 @@
 (cond
  ((eq? dbtype 'tokyocabinet)
   (set! target "./test.tch"))
+ ((eq? dbtype 'redis)
+  (set! target "localhost"))
  ((eq? dbtype 'dbm)
   (set! target "./test"))
  ((eq? dbtype 'pure)
@@ -89,20 +91,39 @@
 (with-open "./test/sekka-dump-out-1.txt"
            (lambda (f)
              (let ((_input (f.read))
-                   (_output (StringIO.new)))
-               (_output.set_encoding "utf-8")
+                   (_output1 (StringIO.new))
+                   (_output2 (StringIO.new)))
+               (_output1.set_encoding "utf-8")
+               (_output2.set_encoding "utf-8")
                (when (or (eq? dbtype 'tokyocabinet)
+                         (eq? dbtype 'redis)
                          (eq? dbtype 'dbm)
                          (eq? dbtype 'pure))
                  (test-section "dump db")
+
                  (test* "dump DB to SEKKA jisyo file. (1)"
                         _input
                         (begin
-                          (dump-sekka-jisyo-f _output target)
+                          (dump-sekka-jisyo-f _output1 target)
                           (with-open "./test/sekka-dump-out-1.tmp"
-                                     (lambda (f) (f.write (_output.string)))
+                                     (lambda (f) (f.write (_output1.string)))
+                                     "w")
+                          (_output1.string)))
+                 
+                 (test* "dump/restore DB to SEKKA jisyo file. (1)"
+                        _input
+                        (begin
+                          ;; ---- RESTORE ----
+                          (f.rewind)
+                          (restore-sekka-jisyo-f f target)
+                          
+                          ;; ---- DUMP    ----
+                          (dump-sekka-jisyo-f _output2 target)
+                          (with-open "./test/sekka-dump-out-2.tmp"
+                                     (lambda (f) (f.write (_output2.string)))
                                      "w")
-                          (_output.string)))))))
+                          (_output2.string)))))))
+                 
   
 
 (test-section "Open the test-suite DB")
@@ -112,6 +133,9 @@
  ((eq? dbtype 'tokyocabinet)
   (kvs.open target)
   (require "tokyocabinet"))
+ ((eq? dbtype 'redis)
+  (kvs.open target)
+  (require "redis"))
  ((eq? dbtype 'dbm)
   (kvs.open target)
   (require "dbm"))
@@ -122,8 +146,6 @@
  (else
   (errorf "Unsupported db type [%s]" (symbol->string dbtype))))
 
-(define db (kvs._db))
-
 
 ;;-------------------------------------------------------------------
 (test-section "Register User dict")
@@ -171,63 +193,63 @@
 (test-section "simple db fetch")
 (test* "db fetch 1"
        "Cへんかん"
-       (. (hash-table-get db "MASTER::henkan" #f) force_encoding "UTF-8"))
+       (kvs.get "MASTER::henkan"))
 
 (test* "db fetch 2"
        "Cかに/かんい"
-       (. (hash-table-get db "MASTER::kani" #f) force_encoding "UTF-8"))
+       (kvs.get "MASTER::kani"))
 
 (test* "db fetch 3"
        "Cかんい"
-       (. (hash-table-get db "MASTER::kanni" #f) force_encoding "UTF-8"))
+       (kvs.get "MASTER::kanni"))
 
 (test* "db fetch 4"
        #f
-       (hash-table-get db "MASTER::aaaa" #f))
+       (kvs.get "MASTER::aaaa"))
 
 (test* "db fetch 5"
        "Cへんかんえんじん"
-       (. (hash-table-get db "dummy::henkanenjin" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::henkanenjin"))
 
 (test* "db fetch 6"
        "ka;ko ka@ko kakko kani kanni kaqi"
-       (. (hash-table-get db "MASTER::(ka)" #f) force_encoding "UTF-8"))
+       (kvs.get "MASTER::(ka)"))
 
 (test* "db fetch 7"
        "ka+ kaT ka`"
-       (. (hash-table-get db "MASTER::(KA)" #f) force_encoding "UTF-8"))
+       (kvs.get "MASTER::(KA)"))
 
 (test* "db fetch 8"
        "#kaime #kara# #kqme #kr#"
-       (. (hash-table-get db "MASTER::(#k)" #f) force_encoding "UTF-8"))
+       (kvs.get "MASTER::(#k)"))
 
 (test* "db fetch 9"
        "burogu+ buroguR buroguT burogu`"
-       (. (hash-table-get db "dummy::(BU)" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::(BU)"))
 
 (test* "db fetch 10"
        "/ユーザー辞書"
-       (. (hash-table-get db "dummy::ゆーざーじしょ" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::ゆーざーじしょ"))
 
 (test* "db fetch 11"
        "yu'za'jisho yu'za'jisyo yu'za'jixo yu'za'zisho yu'za'zisyo yu'za'zixo yu'za-jisho yu'za-jisyo yu'za-jixo yu'za-zisho yu'za-zisyo yu'za-zixo yu'za:jisho yu'za:jisyo yu'za:jixo yu'za:zisho yu'za:zisyo yu'za:zixo yu'za^jisho yu'za^jisyo yu'za^jixo yu'za^zisho yu'za^zisyo yu'za^zixo yu'zc'jisho yu'zc'jisyo yu'zc'jixo yu'zc'zisho yu'zc'zisyo yu'zc'zixo yu'zc-jisho yu'zc-jisyo yu'zc-jixo yu'zc-zisho yu'zc-zisyo yu'zc-zixo yu'zc:jisho yu'zc:jisyo yu'zc:jixo yu'zc:zisho yu'zc:zisyo yu'zc:zixo yu'zc^jisho yu'zc^jisyo yu'zc^jixo yu'zc^zisho yu'zc^zisyo yu'zc^zixo yu-za'jisho yu-za'jisyo yu-za'jixo yu-za'zisho yu-za'zisyo yu-za'zixo yu-za-jisho yu-za-jisyo yu-za-jixo yu-za-zisho yu-za-zisyo yu-za-zixo yu-za:jisho yu-za:jisyo yu-za:jixo yu-za:zisho yu-za:zisyo yu-za:zixo yu-za^jisho yu-za^jisyo yu-za^jixo yu-za^zisho yu-za^zisyo yu-za^zixo yu-zc'jisho yu-zc'jisyo yu-zc'jixo yu-zc'zisho yu-zc'zisyo yu-zc'zixo yu-zc-jisho yu-zc-jisyo yu-zc-jixo yu-zc-zisho yu-zc-zisyo yu-zc-zixo yu-zc:jisho yu-zc:jisyo yu-zc:jixo yu-zc:zisho yu-zc:zisyo yu-zc:zixo yu-zc^jisho yu-zc^jisyo yu-zc^jixo yu-zc^zisho yu-zc^zisyo yu-zc^zixo yu:za'jisho yu:za'jisyo yu:za'jixo yu:za'zisho yu:za'zisyo yu:za'zixo yu:za-jisho yu:za-jisyo yu:za-jixo yu:za-zisho yu:za-zisyo yu:za-zixo yu:za:jisho yu:za:jisyo yu:za:jixo yu:za:zisho yu:za:zisyo yu:za:zixo yu:za^jisho yu:za^jisyo yu:za^jixo yu:za^zisho yu:za^zisyo yu:za^zixo yu:zc'jisho yu:zc'jisyo yu:zc'jixo yu:zc'zisho yu:zc'zisyo yu:zc'zixo yu:zc-jisho yu:zc-jisyo yu:zc-jixo yu:zc-zisho yu:zc-zisyo yu:zc-zixo yu:zc:jisho yu:zc:jisyo yu:zc:jixo yu:zc:zisho yu:zc:zisyo yu:zc:zixo yu:zc^jisho yu:zc^jisyo yu:zc^jixo yu:zc^zisho yu:zc^zisyo yu:zc^zixo yu^za'jisho yu^za'jisyo yu^za'jixo yu^za'zisho yu^za'zisyo yu^za'zixo yu^za-jisho yu^za-jisyo yu^za-jixo yu^za-zisho yu^za-zisyo yu^za-zixo yu^za:jisho yu^za:jisyo yu^za:jixo yu^za:zisho yu^za:zisyo yu^za:zixo yu^za^jisho yu^za^jisyo yu^za^jixo yu^za^zisho yu^za^zisyo yu^za^zixo yu^zc'jisho yu^zc'jisyo yu^zc'jixo yu^zc'zisho yu^zc'zisyo yu^zc'zixo yu^zc-jisho yu^zc-jisyo yu^zc-jixo yu^zc-zisho yu^zc-zisyo yu^zc-zixo yu^zc:jisho yu^zc:jisyo yu^zc:jixo yu^zc:zisho yu^zc:zisyo yu^zc:zixo yu^zc^jisho yu^zc^jisyo yu^zc^jixo yu^zc^zisho yu^zc^zisyo yu^zc^zixo"
-       (. (hash-table-get db "dummy::(yu)" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::(yu)"))
 
 (test* "db fetch 12"
        "する"
-       (. (hash-table-get db "dummy::=sr" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::=sr"))
 
 (test* "db fetch 13"
        "=suru"
-       (. (hash-table-get db "dummy::{su}" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::{su}"))
 
 (test* "db fetch 14"
        "したい"
-       (. (hash-table-get db "dummy::=shitai" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::=shitai"))
 
 (test* "db fetch 15"
        "=shita =shitai"
-       (. (hash-table-get db "dummy::{sh}" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy::{sh}"))
 
 
 
@@ -241,11 +263,11 @@
 
 (test* "check user dict 1"
        "/エントリA/エントリB/エントリC"
-       (. (hash-table-get db "dummy2::てすとようえんとり" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy2::てすとようえんとり"))
 
 (test* "check user dict 2"
        "tesutoyouenntori tesutoyouentori tesutoyoueqtori tesutoyowhuenntori tesutoyowhuentori tesutoyowhueqtori tesutoypenntori tesutoypentori tesutoypeqtori"
-       (. (hash-table-get db "dummy2::(te)" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy2::(te)"))
 
 (test* "flush user dict"
        12
@@ -254,11 +276,11 @@
 ;; getに失敗しないといけない。
 (test* "check user dict 3"
        :no-entry
-       (hash-table-get db "dummy2::てすとようえんとり" :no-entry))
+       (kvs.get "dummy2::てすとようえんとり" :no-entry))
 
 (test* "check user dict 4"
        :no-entry
-       (hash-table-get db "dummy2::(te)" :no-entry))
+       (kvs.get "dummy2::(te)" :no-entry))
 
 (test*  "register user dict 2"
         #t
@@ -268,11 +290,11 @@
 ;; "エントリB" という単語が消えないといけない。
 (test* "check user dict 5"
        "/エントリA/エントリC"
-       (. (hash-table-get db "dummy2::てすとようえんとり" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy2::てすとようえんとり"))
 
 (test* "check user dict 6"
        "tesutoyouenntori tesutoyouentori tesutoyoueqtori tesutoyowhuenntori tesutoyowhuentori tesutoyowhueqtori tesutoypenntori tesutoypentori tesutoypeqtori"
-       (. (hash-table-get db "dummy2::(te)" #f) force_encoding "UTF-8"))
+       (kvs.get "dummy2::(te)"))
 
 
 ;;-------------------------------------------------------------------
@@ -1132,7 +1154,7 @@
 
 (test* "DB check after henkan kakutei 1"
        "/返還/変換"
-       (. (hash-table-get db (+ userid "::へんかん") #f) force_encoding "UTF-8"))
+       (kvs.get (+ userid "::へんかん")))
 
 (test* "henkan kakutei(for Elisp) 2"
        '(("変換" nil "へんかん" j 0) ("返還" nil "へんかん" j 1) ("変化" nil "へんか" j 2) ("返歌" nil "へんか" j 3) ("へんかん" nil "henkan" h 4) ("ヘンカン" nil "henkan" k 5) ("へにんあん" nil "henkan" h 6) ("ヘニンアン" nil "henkan" k 7) ("Ｈｅｎｋａｎ" nil "Henkan" z 8) ("Henkan" nil "Henkan" l 9))
@@ -1142,7 +1164,7 @@
 
 (test* "DB check after henkan kakutei 2"
        "/変換/返還"
-       (. (hash-table-get db (+ userid "::へんかん") #f) force_encoding "UTF-8"))
+       (kvs.get (+ userid "::へんかん")))
 
 (test* "henkan kakutei(for Elisp) 3"
        '(("デベロッパ" nil "developer" j 0) ("デベロッパー" nil "developer" j 1) ("ディベロッパー" nil "developer" j 2) ("ｄｅｖｅｌｏｐｅｒ" nil "developer" z 3) ("developer" nil "developer" l 4))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sekka
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 Z
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -116,7 +116,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: redis
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +126,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: ruby-progressbar
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,7 +144,7 @@ dependencies:
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: fuzzy-string-match
+  name: rubyforge
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -154,11 +154,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: eventmachine
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,7 +172,7 @@ dependencies:
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: memcache-client
+  name: fuzzy-string-match
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -186,8 +186,36 @@ dependencies:
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: nendo
+  name: jeweler
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: nendo
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -200,10 +228,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -214,10 +242,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: tokyocabinet
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  name: ruby-progressbar
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -228,7 +256,7 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id017
 description: Sekka is a SKK like input method. Sekka server provides REST Based API. If you are SKK user, let's try it.
 email: kiyoka@sumibi.org
 executables: