sekka 1.4.0 → 1.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjIyNDQ3NjBhZmM1MzhiNGVkMTE1MDY0N2EwM2NlOTkxMjgyMGVmNQ==
-  data.tar.gz: !binary |-
-    ODM2ZWIzMjRhYmJmNGNhMGQ4ZWRhMGVhMThhMDRiZGYzY2Y1OTRmNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTZlYTYwNTE2MzU4YTRjNjdlY2NlYzJmZWU5MmU3NmE4ZWViZmE2Mjg3Zjc5
-    Yzc3MDcwZGYwZGUxNTE5YjZhMDZkMTlhMDJhNmQ4MGViZmJhYzFhYjgwNGQ1
-    ZGE4NzFjNzMyOThlYjZhMzkyNmFmMjk5ZTVjODg3NjE1YTY3YWY=
-  data.tar.gz: !binary |-
-    NTgzMTY4MWM2NzNmYWI3MjY4ZThjZjliNjBmYjgxZGFmNTcyZmVmN2NlNjNi
-    ZTcyMDM5ZjkyOTNiNmFjNDI3Mzg3MzJmOGQ5ZTg5ZmFiZjg2Mjk0YzZiMDU1
-    NDRlOTdhMWMzN2U5NTY3YTQzMmEwN2RhMWJmZDEzNWQ4OTQwNGY=
+SHA1:
+  metadata.gz: 63653bf0ea892633864db0ac60ca1e1d08023440
+  data.tar.gz: 18a98c08d61e515eaee30cc6ee1b499ee68a51c3
+SHA512:
+  metadata.gz: 3a6b9dd120e4279405218ea7423af020f9a7baee09bd5aaf2a766b3f171c50eded38c5c64ccb9377df99a0cb4815f8bedf02d0ec96f73e27748a3e6cce6f209c
+  data.tar.gz: 5b5d025e73f0d48a1a877d15068ade452e76984cf8328fff13b391b4f723822699e4a623fdf281cb54772db64a1b9abe46c54949514c23b31bafcffab8502381

data/Rakefile

@@ -12,17 +12,18 @@
 #
 # Enviroment Variables:
 #   Please select from
-#     DB=dbm
+#     DB=gdbm
 #     DB=tokyocabinet
 #     DB=redis
 #     DB=                (default)
-#     DB=all             dbm/tokyocabinet/redis
+#     DB=all             gdbm/tokyocabinet/redis
 #
 
 require 'rake'
 
 # generate `normal' and `azik' dictionary
-generateTypes = [ "N", "A" ]
+# (generateTypes = [ "N", "A" ])
+generateTypes = [ "N" ]
 
 begin
   require 'jeweler2'
@@ -108,8 +109,8 @@ task :compile do
 end
 
 task :test do
-  sh "ruby -I ./lib ./bin/sekka-path > /tmp/path1"
-  path1 = open( "/tmp/path1" ) {|f|
+  sh "ruby -I ./lib ./bin/sekka-path > ./path1.tmp"
+  path1 = open( "./path1.tmp" ) {|f|
     f.readline.chomp
   }
   path2 = File.dirname( __FILE__ )
@@ -118,7 +119,9 @@ task :test do
     exit 1
   end
 
-  sh "/bin/rm -f test.record test.tch"
+  ["test.record", "test.tch", "test.db" ].each {|name|
+    File.unlink( name ) if File.exist?( name )
+  }
   files = []
   files << "./test/memcache.nnd"
   files << "./test/util.nnd"
@@ -130,8 +133,8 @@ task :test do
   files << "./test/google-ime.nnd"
   STDERR.printf( "Info:  env DB=%s\n", ENV['DB'] )
   case ENV['DB']
-  when 'dbm'
-    files << "./test/henkan-main.nnd  dbm"
+  when 'gdbm'
+    files << "./test/henkan-main.nnd  gdbm"
   when 'tokyocabinet'
     files << "./test/henkan-main.nnd  tokyocabinet"
   when 'redis'
@@ -140,7 +143,7 @@ task :test do
   when 'pure'
     files << "./test/henkan-main.nnd  pure"
   when 'all'
-    files << "./test/henkan-main.nnd  dbm"
+    files << "./test/henkan-main.nnd  gdbm"
     files << "./test/henkan-main.nnd  tokyocabinet"
     files << "./test/henkan-main.nnd  redis"
     files << "./test/henkan-main.nnd  pure"
@@ -149,8 +152,7 @@ task :test do
     files << "./test/henkan-main.nnd  pure"
   end
   files.each {|filename|
-    nendopath = `which nendo`.chomp
-    sh  sprintf( "ruby -I ./lib %s %s", nendopath, filename )
+    sh  sprintf( "ruby -I ./lib -S nendo %s", filename )
   }
   sh "cat test.record"
 end
@@ -166,46 +168,46 @@ task :alljisyoL => [ :jisyoL, :loadL, :dumpL ]
 
 task :jisyoS do
   generateTypes.each {|x|
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.201008           >  ./data/SEKKA-JISYO.SMALL.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.hira-kata        >> ./data/SEKKA-JISYO.SMALL.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase    >> ./data/SEKKA-JISYO.SMALL.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase2   >> ./data/SEKKA-JISYO.SMALL.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.201008           >  ./data/SEKKA-JISYO.SMALL.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.hira-kata        >> ./data/SEKKA-JISYO.SMALL.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase    >> ./data/SEKKA-JISYO.SMALL.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase2   >> ./data/SEKKA-JISYO.SMALL.#{x}"
   }
 end
 
 task :jisyoL do
   generateTypes.each {|x|
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.201008           >  ./data/SEKKA-JISYO.LARGE.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.hira-kata        >> ./data/SEKKA-JISYO.LARGE.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.fullname           >> ./data/SEKKA-JISYO.LARGE.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.jinmei             >> ./data/SEKKA-JISYO.LARGE.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.station            >> ./data/SEKKA-JISYO.LARGE.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase    >> ./data/SEKKA-JISYO.LARGE.#{x}"
-    sh "time ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase2   >> ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.201008           >  ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.hira-kata        >> ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.fullname           >> ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.jinmei             >> ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.station            >> ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase    >> ./data/SEKKA-JISYO.LARGE.#{x}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase2   >> ./data/SEKKA-JISYO.LARGE.#{x}"
   }
 end
 
 task :loadS do
   generateTypes.each {|x|
-    sh "time ./bin/sekka-jisyo load    ./data/SEKKA-JISYO.SMALL.#{x}  ./data/SEKKA-JISYO.SMALL.#{x}.tch"
+    sh "ruby ./bin/sekka-jisyo load    ./data/SEKKA-JISYO.SMALL.#{x}  ./data/SEKKA-JISYO.SMALL.#{x}.tch"
   }
 end
 
 task :loadL do
   generateTypes.each {|x|
-    sh "time ./bin/sekka-jisyo load    ./data/SEKKA-JISYO.LARGE.#{x}  ./data/SEKKA-JISYO.LARGE.#{x}.tch"
+    sh "ruby ./bin/sekka-jisyo load    ./data/SEKKA-JISYO.LARGE.#{x}  ./data/SEKKA-JISYO.LARGE.#{x}.tch"
   }
 end
 
 task :dumpS do
   generateTypes.each {|x|
-    sh "time ./bin/sekka-jisyo dump    ./data/SEKKA-JISYO.SMALL.#{x}.tch > ./data/SEKKA-JISYO.SMALL.#{x}.tsv"
+    sh "ruby ./bin/sekka-jisyo dump    ./data/SEKKA-JISYO.SMALL.#{x}.tch > ./data/SEKKA-JISYO.SMALL.#{x}.tsv"
   }
 end
 
 task :dumpL do
   generateTypes.each {|x|
-    sh "time ./bin/sekka-jisyo dump    ./data/SEKKA-JISYO.LARGE.#{x}.tch > ./data/SEKKA-JISYO.LARGE.#{x}.tsv"
+    sh "ruby ./bin/sekka-jisyo dump    ./data/SEKKA-JISYO.LARGE.#{x}.tch > ./data/SEKKA-JISYO.LARGE.#{x}.tsv"
   }
 end
 

data/VERSION.yml

@@ -1,5 +1,4 @@
 ---
 :major: 1
-:minor: 4
+:minor: 5
 :patch: 0
-

data/bin/sekka-jisyo

@@ -48,8 +48,9 @@ core.evalStr( <<";;END-OF-SCRIPT" )
   (let1 lines (with-open
                filename
                (lambda (f)
-                 (convert-skk-jisyo-f f)))
-    (for-each print lines)))
+                 (convert-skk-jisyo-f f))
+	       "r:UTF-8")
+	(for-each print lines)))
 
 
 (define (load-sekka-jisyo sekka-file target)
@@ -59,7 +60,8 @@ core.evalStr( <<";;END-OF-SCRIPT" )
      (load-sekka-jisyo-f
       f
       (target.gsub #/[.]db$/ "") ;; drop ".db" suffix
-      ))))
+      )))
+  "r:UTF-8")
 
 
 (define (dump-sekka-jisyo sekka-file)
@@ -72,7 +74,8 @@ core.evalStr( <<";;END-OF-SCRIPT" )
    (lambda (f)
      (restore-sekka-jisyo-f
       f
-      target))))
+      target)))
+  "r:UTF-8")
 
 
 (define (display-help)
@@ -80,11 +83,11 @@ core.evalStr( <<";;END-OF-SCRIPT" )
   (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 ndbm          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     ndbm                     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")
@@ -97,7 +100,7 @@ core.evalStr( <<";;END-OF-SCRIPT" )
    ((rxmatch #/[.]tch/ filename)
     (values 'tokyocabinet filename))
    ((rxmatch #/[.]db$/ filename)
-    (values 'dbm filename))
+    (values 'gdbm filename))
    ((rxmatch #/^redis:(.*)$/ filename)
     => (lambda (m)
          (let1 str (rxmatch-substring m 1)

data/bin/sekka-server

@@ -22,7 +22,11 @@ if ENV.has_key?( 'SEKKA_AZIK' )
 end
 
 DICTSIZE = if ENV.has_key?( 'SEKKA_LARGE' )
-             "LARGE"
+             if 1 == ENV[ 'SEKKA_LARGE' ].to_i
+               "LARGE"
+             else
+               "SMALL"
+             end
            else
              "SMALL"
            end
@@ -32,6 +36,9 @@ TC_FILE = DICTDIR + "/SEKKA-JISYO.#{DICTSIZE}.#{DICTTYPE}.tch" + TC_OPTS
 TSVFILE = DICTDIR + "/SEKKA-JISYO.#{DICTSIZE}.#{DICTTYPE}.tsv"
 SUMFILE = DICTDIR + "/SEKKA-JISYO.#{DICTSIZE}.#{DICTTYPE}.md5"
 
+GDBM_FILE = DICTDIR + "/SEKKA-JISYO.#{DICTSIZE}.#{DICTTYPE}.db"
+
+
 URLURL  = DICTURL + "/SEKKA-JISYO.#{DICTSIZE}.#{DICTTYPE}.url"
 SUMURL  = DICTURL + "/SEKKA-JISYO.#{DICTSIZE}.#{DICTTYPE}.md5"
 
@@ -49,6 +56,8 @@ def getSekkaDbInfo( env )
       [ :redis, dictSource ]
     elsif m = ENV['SEKKA_DB'].match( /^tokyo[a-z]+$/ )
       [ :tokyocabinet, nil ]
+    elsif m = ENV['SEKKA_DB'].match( /^gdbm$/i )
+      [ :gdbm, nil ]
     else
       raise RuntimeError, "Error: env var SEKKA_DB requires [redis:hostname] or [redis:] or [tokyocabinet]"
     end
@@ -62,6 +71,13 @@ def checkJisyoIsInstalled( dictType, dictSource )
   STDERR.printf( "Info: Checking SEKKA jisyo on #{dictType} server...\n" )
   begin
     result = case dictType
+             when :gdbm
+               require 'sekka/kvs'
+               tc = Kvs.new( :gdbm )
+               tc.open( dictSource )
+               ret = tc.get( key )
+               tc.close()
+               ret
              when :tokyocabinet
                require 'tokyocabinet'
                require 'sekka/kvs'
@@ -147,6 +163,19 @@ def main
   ( dictType, dictSource ) = getSekkaDbInfo( ENV )
 
   case dictType
+  when :gdbm
+    # GDBMに辞書が投入済みか確認する
+    ok = checkJisyoIsInstalled( dictType, GDBM_FILE )
+    unless ok
+      # tsvファイルをuploadする
+      STDERR.printf( "Info: Uploading...\n" )
+      cmd = sprintf( "sekka-jisyo restore %s %s", TSVFILE, GDBM_FILE )
+      STDERR.printf( "Command : %s\n", cmd )
+      system( cmd )
+    end
+    STDERR.printf( "Info: [OK]\n" )
+    dictSource = GDBM_FILE
+
   when :tokyocabinet
     # TokyoCabinetに辞書が投入済みか確認する
     ok = checkJisyoIsInstalled( dictType, TC_FILE )

data/emacs/sekka.el

@@ -77,7 +77,7 @@
   :type  'integer
   :group 'sekka)
 
-(defcustom sekka-realtime-guide-limit-lines 5
+(defcustom sekka-realtime-guide-limit-lines 3
   "最後に変換した行から N 行離れたらリアルタイムガイド表示が止まる"
   :type  'integer
   :group 'sekka)
@@ -280,14 +280,16 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 
 
 (defun sekka-construct-curl-argstr (arg-alist)
-  (apply 'concat
-	 (mapcar
-	  (lambda (x)
-	    (format "--data '%s=%s' " (car x)
-		    (if (stringp (cdr x))
-			(http-url-encode (cdr x) 'utf-8)
-		      (cdr x))))
-	  arg-alist)))
+  (apply
+   'append
+   (mapcar
+    (lambda (x)
+      (list "--data" (format "%s=%s"
+			     (car x)
+			     (if (stringp (cdr x))
+				 (http-url-encode (cdr x) 'utf-8)
+			       (cdr x)))))
+    arg-alist)))
 
 ;; test-code
 (when nil
@@ -296,7 +298,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
      ("yomi"   .  "kanji")
      ("limit"  .  2)
      ("method" .  "normal")
-     )))
+     ))
+  )
 
 
 ;;
@@ -345,16 +348,63 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	    (sekka-next-sekka-server)
 	    nil)
 	result)))
+  (let ((arg-alist
+	 (cons
+	  `(userid . ,sekka-login-name)
+	  arg-alist)))
+    (or
+     (one-request func-name arg-alist)
+     (one-request func-name arg-alist)
+     (one-request func-name arg-alist)
+     (concat
+      "Error: All sekka-server are down. "
+      " " sekka-server-url
+      " " sekka-server-url-2
+      " " sekka-server-url-3))))
+
+(defun sekka-rest-request-by-curl (func-name arg-alist)
+  (let* ((lst
+	  (append
+	   (if (< 0 (length sekka-no-proxy-hosts))
+	       (list "--noproxy" sekka-no-proxy-hosts)
+	     nil)
+	   (sekka-construct-curl-argstr (cons
+					 '(format . "sexp")
+					 arg-alist))))
+	 (buffername "*sekka-output*")
+	 (result ""))
+    (sekka-debug-print (format "arg-lst :[%S]\n" lst))
+    (progn
+      (apply
+       'call-process
+       sekka-curl
+       nil buffername nil
+       "--silent" "--show-error"
+       "--max-time" (format "%d" sekka-server-timeout)
+       "--insecure"
+       "--header" "Content-Type: application/x-www-form-urlencoded"
+       (concat current-sekka-server-url func-name)
+       lst)
+      (setq result
+	    (with-current-buffer buffername
+	      (buffer-substring-no-properties (point-min) (point-max))))
+      (kill-buffer buffername)
+      result)))
+
 
-  (or
-   (one-request func-name arg-alist)
-   (one-request func-name arg-alist)
-   (one-request func-name arg-alist)
-   (concat
-    "Error: All sekka-server are down. "
-    " " sekka-server-url
-    " " sekka-server-url-2
-    " " sekka-server-url-3)))
+(when nil
+  ;; unit test
+  (setq sekka-curl "curl")
+  (setq sekka-login-name (user-login-name))
+  (setq current-sekka-server-url "http://localhost:12929/")
+  (sekka-rest-request-by-curl
+   "henkan"
+   '(
+     ("yomi"   . "Nihon")
+     (limit    . "1")
+     (method   . "normal")
+     ("userid" . "kiyoka")))
+  )
 
 	
 
@@ -374,31 +424,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	;;    "(\"初回起動\", \"諸快気堂\", \"諸開基堂\", \"しょかいきどう\", \"ショカイキドウ\")"
 	))
     ;; 実際のサーバに接続する
-    (let ((command
-	   (concat
-	    sekka-curl " --silent --show-error "
-	    (if (< 0 (length sekka-no-proxy-hosts))
-		(concat " --noproxy " sekka-no-proxy-hosts)
-	      "")
-	    (format " --max-time %d " sekka-server-timeout)
-	    " --insecure "
-	    " --header 'Content-Type: application/x-www-form-urlencoded' "
-	    (format "%s%s " current-sekka-server-url func-name)
-	    (sekka-construct-curl-argstr (cons
-					  '("format" . "sexp")
-					  arg-alist))
-	    (format "--data 'userid=%s' " sekka-login-name))))
-
-      (sekka-debug-print (format "curl-command :%s\n" command))
-      
-      (let (
-	    (result
-	     (shell-command-to-string
-	      command)))
-	
-	(sekka-debug-print (format "curl-result-sexp :%s\n" result))
-	result))))
-      
+    (sekka-rest-request-by-curl func-name arg-alist)))
+
 ;;
 ;; 現在時刻をUNIXタイムを返す(単位は秒)
 ;;
@@ -422,7 +449,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 
   (let (
 	(result (sekka-rest-request "henkan" `((yomi   . ,yomi)
-					       (limit  . ,limit)
+					       (limit  . ,(format "%d" limit))
 					       (method . ,sekka-roman-method)))))
     (sekka-debug-print (format "henkan-result:%S\n" result))
     (if (eq (string-to-char result) ?\( )
@@ -1621,7 +1648,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.4.0" ;;SEKKA-VERSION
+  "1.5.0" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/jisyo-db.nnd

@@ -252,6 +252,7 @@
                                            [output . ,STDERR]
                                            [format . ,progressbar-format]
                                            )))])
+      (f.set_encoding "utf-8" "utf-8")
       (kvs.open filename-or-hostname)
       (kvs.clear)
       (restore f kvs progress)

data/lib/sekka/kvs.rb

@@ -49,11 +49,11 @@ class Kvs
       @redisFlag = false
     end
 
-    @dbmFlag = true
+    @gdbmFlag = true
     begin
-      require 'dbm'
+      require 'gdbm'
     rescue LoadError
-      @dbmFlag = false
+      @gdbmFlag = false
     end
 
     @dbtype = dbtype
@@ -73,11 +73,11 @@ class Kvs
     when :memcache
       # do nothing
 
-    when :dbm
-      if @dbmFlag
+    when :gdbm
+      if @gdbmFlag
         # do nothing
       else
-        raise RuntimeError, "Kvs.new() missed require( 'dbm' )."
+        raise RuntimeError, "Kvs.new() missed require( 'gdbm' )."
       end
 
       # do nothing
@@ -101,8 +101,11 @@ class Kvs
       @db = MemCache.new( name,
                           :connect_timeout => 1000.0,
                           :timeout => 1000.0 )
-    when :dbm
-      @db = DBM.new( name )
+    when :gdbm
+      if not name.match( /.db$/ )
+        name = name + ".db"
+      end
+      @db = GDBM.new( name, nil, GDBM::FAST | GDBM::WRCREAT )
     when :pure
       @name = name
       if File.exist?( @name )
@@ -138,7 +141,7 @@ class Kvs
   def pure_put!( key, value, timeout = 0 )
     if 0 < key.size
       case @dbtype
-      when :tokyocabinet, :dbm, :redis
+      when :tokyocabinet, :gdbm, :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 )
@@ -176,7 +179,7 @@ class Kvs
 
   def clear()
     case @dbtype
-    when :tokyocabinet, :dbm, :pure
+    when :tokyocabinet, :gdbm, :pure
       @db.clear
     when :redis
       @db.flushall
@@ -190,7 +193,7 @@ class Kvs
   # return array of key string
   def keys()
     case @dbtype
-    when :tokyocabinet, :dbm, :redis
+    when :tokyocabinet, :gdbm, :redis
       @db.keys.map { |k|
         k.force_encoding("UTF-8")
       }
@@ -215,7 +218,7 @@ class Kvs
       }
     when :memcache
       raise RuntimeError, "Kvs#forward_match_keys method was not implemented for memcache."
-    when :dbm, :pure
+    when :gdbm, :pure
       self.keys( ).select {|key|
         key.match( "^" + prefix )
       }
@@ -226,7 +229,7 @@ class Kvs
 
   def close()
     case @dbtype
-    when :tokyocabinet, :dbm
+    when :tokyocabinet, :gdbm
       @db.close
     when :memcache, :redis
       # do nothing

data/lib/sekka/sekkaversion.rb

@@ -1,4 +1,4 @@
 class SekkaVersion
-  def  self.version()     "1.4.0"  end
+  def  self.version()     "1.5.0"  end
   def  self.dictVersion() "1.4.0"  end
 end

data/lib/sekkaserver.rb

@@ -37,7 +37,6 @@
 require 'rack'
 require 'nendo'
 require 'eventmachine'
-require 'syslog'
 require 'uri'
 require 'date'
 require 'sekkaconfig'
@@ -51,7 +50,13 @@ module SekkaServer
       @core = Nendo::Core.new()
       @core.loadInitFile
       @core.disableRuntimeCheck( )
-      @core.evalStr( "(use debug.syslog)" )
+      begin
+        require 'syslog'
+        @core.evalStr( "(use debug.syslog)" )
+      rescue LoadError
+        STDERR.printf( "Sekka Warning: this platform does not support 'syslog'...\n" )
+        @core.evalStr( "(use debug.null)" )
+      end
       @core.evalStr( "(use sekka.henkan)" )
       @core.evalStr( '(define (writeToString sexp) (write-to-string sexp))' )
       @core.evalStr( '(export-to-ruby writeToString)' )

data/test/henkan-bench.nnd

@@ -58,7 +58,7 @@
 
 
 ;;-------------------------------------------------------------------
-(let1 kvs      (Kvs.new     'dbm)
+(let1 kvs      (Kvs.new     'gdbm)
   (kvs.open    "./test")
 
   (bench-task #f

data/test/henkan-main.nnd

@@ -54,7 +54,7 @@
   (set! target "./test.tch"))
  ((eq? dbtype 'redis)
   (set! target "localhost"))
- ((eq? dbtype 'dbm)
+ ((eq? dbtype 'gdbm)
   (set! target "./test"))
  ((eq? dbtype 'pure)
   (set! target "./test.dump"))
@@ -70,22 +70,23 @@
 (with-open "./test/skk-jisyo-in-1.txt"
            (lambda (_input)
              (let1 sekka-jisyo-data
-                 (with-open "./test/sekka-jisyo-out-1.txt"
-                            (lambda (f)
-                              (read f)))
-
-               (test* "Create test jisyo"
-                      sekka-jisyo-data          
-                      (convert-skk-jisyo-f _input))
-               
-               (test* "default KVS type" 'tokyocabinet (get-kvs-type))
-               
-               (set-kvs-type dbtype)
-               (test* "changed KVS type" dbtype (get-kvs-type))
-               
-               (let1 sio (StringIO.new (string-join sekka-jisyo-data "\n"))
-                 (sio.set_encoding "utf-8")
-                 (load-sekka-jisyo-f sio target)))))
+		   (with-open #?="./test/sekka-jisyo-out-1.txt"
+			      (lambda (f)
+				(read f))
+			      "r:UTF-8")
+		   (test* "Create test jisyo"
+			  sekka-jisyo-data          
+			  (convert-skk-jisyo-f _input))
+		   
+		   (test* "default KVS type" 'tokyocabinet (get-kvs-type))
+		   
+		   (set-kvs-type #?=dbtype)
+		   (test* "changed KVS type" dbtype (get-kvs-type))
+		   
+		   (let1 sio (StringIO.new (string-join sekka-jisyo-data "\n"))
+			 (sio.set_encoding "utf-8")
+			 (load-sekka-jisyo-f sio target))))
+	   "r:UTF-8")
 
 
 ;;-------------------------------------------------------------------
@@ -98,7 +99,7 @@
                (_output2.set_encoding "utf-8")
                (when (or (eq? dbtype 'tokyocabinet)
                          (eq? dbtype 'redis)
-                         (eq? dbtype 'dbm)
+                         (eq? dbtype 'gdbm)
                          (eq? dbtype 'pure))
                  (begin
                    (test-section "dump db")
@@ -126,7 +127,9 @@
                                        (lambda (f) (f.write (_output2.string)))
                                        "w")
                             (Digest::MD5.hexdigest
-                             (_output2.string)))))))))
+                             (_output2.string))))))))
+	   "r:UTF-8")
+
                  
   
 
@@ -140,9 +143,9 @@
  ((eq? dbtype 'redis)
   (kvs.open target)
   (require "redis"))
- ((eq? dbtype 'dbm)
+ ((eq? dbtype 'gdbm)
   (kvs.open target)
-  (require "dbm"))
+  (require "gdbm"))
  ((eq? dbtype 'pure)
   (kvs.open target))
  ((eq? dbtype 'memcache)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: memcache-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,70 +56,70 @@ dependencies:
   name: distributed-trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: memcache-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -140,42 +140,42 @@ dependencies:
   name: distributed-trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Sekka is a SKK like input method. Sekka server provides REST Based API.
@@ -190,7 +190,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gemtest
+- ".gemtest"
 - COPYING
 - Rakefile
 - VERSION.yml
@@ -246,17 +246,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Sekka is a SKK like input method.