sekka 0.8.2 → 0.8.3

data/lib/sekka/google-ime.nnd

@@ -0,0 +1,73 @@
+:; #-*- mode: nendo; syntax: scheme -*-;;
+;;;
+;;; google-imd.nnd - google-imdを使ってひらがなから、漢字変換候補を取得する
+;;;  
+;;;   Copyright (c) 2010  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+;;;   
+;;;   Redistribution and use in source and binary forms, with or without
+;;;   modification, are permitted provided that the following conditions
+;;;   are met:
+;;;   
+;;;   1. Redistributions of source code must retain the above copyright
+;;;      notice, this list of conditions and the following disclaimer.
+;;;  
+;;;   2. Redistributions in binary form must reproduce the above copyright
+;;;      notice, this list of conditions and the following disclaimer in the
+;;;      documentation and/or other materials provided with the distribution.
+;;;  
+;;;   3. Neither the name of the authors nor the names of its contributors
+;;;      may be used to endorse or promote products derived from this
+;;;      software without specific prior written permission.
+;;;  
+;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;  
+;;;  $Id: 
+;;;
+(use srfi-1)
+(use rfc.json)
+(require "net/http")
+
+(define (json-string->sekka-result-string jsonstr)
+  (let* ((obj (parse-json-string jsonstr))
+         (kouho-list (filter-map
+                      (lambda (entry)
+                        (if (vector? entry)
+                            (vector->list (vector-ref entry 1))
+                            false))
+                      (vector->list obj))))
+    (if (null? kouho-list)
+        kouho-list
+        (map
+         (lambda (x)
+           (string-join x))
+         (apply zip kouho-list)))))
+
+
+(define (request-google-ime keyword unit-test proxy-host proxy-port)
+  (let* ((body "")
+         (target "google-ime-api-normalizer.heroku.com")
+         (_ (Net::HTTP.version_1_2))
+         (http (if proxy-host
+                   (let1 proxy-class (Net::HTTP.Proxy proxy-host proxy-port)
+                     (proxy-class.new target))
+                   (Net::HTTP.new target))))
+    (set! http.open_timeout (if unit-test 30 5))
+    (set! http.read_timeout (if unit-test 30 5))
+    (http.start 
+     (&block ()
+       (let* ((path (sprintf "/transliterate%s?langpair=%s&text=%s"
+                             (if unit-test "_test" "")
+                             "ja-Hira|ja" (URI.encode keyword)))
+              (response (http.get path)))
+         (set! body response.body))))
+    (json-string->sekka-result-string body)))

data/lib/sekka/henkan.nnd

@@ -34,10 +34,12 @@
 ;;;  $Id: 
 ;;;
 (use srfi-1)
+(use rfc.json)
 (use sekka.util)
 (use sekka.convert-jisyo)
 (use sekka.jisyo-db)
 (use sekka.alphabet-lib)
+(use sekka.google-ime)
 (require "sekka/approximatesearch")
 
 
@@ -477,3 +479,9 @@
 ;; Export to Ruby world
 (export-to-ruby registerUserJisyo)
 
+
+;; ユーザー定義語彙の登録処理
+(define (googleIme keyword proxy-host proxy-port)
+  (request-google-ime keyword #f proxy-host proxy-port))
+;; Export to Ruby world
+(export-to-ruby googleIme)

data/lib/sekka/sekkaversion.rb

@@ -1,6 +1,6 @@
 class SekkaVersion
   include Singleton
   def self.version
-    "0.8.2"
+    "0.8.3"
   end
 end

data/lib/sekkaconfig.rb

@@ -40,10 +40,12 @@ module SekkaServer
   class Config
     include Singleton
     
-    def self.setup( dictSource, cacheSource = false, listenPort )
+    def self.setup( dictSource, cacheSource = false, listenPort, proxyHost, proxyPort )
       @@dictSource  = dictSource
       @@cacheSource = cacheSource
       @@listenPort  = listenPort
+      @@proxyHost   = proxyHost
+      @@proxyPort   = proxyPort
     end
     
     def self.dictSource
@@ -57,6 +59,14 @@ module SekkaServer
     def self.listenPort
       @@listenPort
     end
+
+    def self.proxyHost
+      @@proxyHost
+    end
+
+    def self.proxyPort
+      @@proxyPort
+    end
   end
 end
 

data/lib/sekkaserver.rb

@@ -42,6 +42,7 @@ require 'uri'
 require 'date'
 require './lib/sekkaconfig'
 require './lib/sekka/sekkaversion'
+require 'memcache'
 
 module SekkaServer
   class Server
@@ -56,12 +57,15 @@ module SekkaServer
       (@kvs,@cachesv) = @core.openSekkaJisyo( SekkaServer::Config.dictSource,
                                               SekkaServer::Config.cacheSource )
       @queue = EM::Queue.new
+      @mutex = Mutex.new
 
       STDERR.puts(   "----- Sekka Server Started -----" )
-      STDERR.printf( "  version  :  %s\n", SekkaVersion.version            )
-      STDERR.printf( "  dict-db  :  %s\n", SekkaServer::Config.dictSource  )
-      STDERR.printf( "  memcached:  %s\n", SekkaServer::Config.cacheSource )
+      STDERR.printf( "  version   : %s\n", SekkaVersion.version            )
+      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  )
+      STDERR.printf( "  proxyHost : %s\n", SekkaServer::Config.proxyHost   )
+      STDERR.printf( "  proxyPort : %s\n", SekkaServer::Config.proxyPort   )
       STDERR.puts(   "--------------------------------" )
 
       begin
@@ -69,28 +73,60 @@ module SekkaServer
           Thread.pass
           EventMachine::run {
             d = DateTime.now
-            EventMachine::PeriodicTimer.new( 5 ) do
-              while not @queue.empty?
+            EventMachine::PeriodicTimer.new( 1 ) do
+              if not @queue.empty?
                 @queue.pop { |word|
                   arr = word.split( /[ ]+/ )
-                  userid   = arr[0]
-                  dictline = 
-                  if 3 == arr.size 
-                    arr[1] + " " + arr[2]
-                  else
-                    ";; comment"
-                  end
-                  registered = @core.registerUserJisyo(userid, @kvs, dictline)
-                  if registered
-                    str = d.strftime( "%D %X" )
-                    puts "Info: [" + str + "]added to dict                      userid[" + userid + "] dictline[" + dictline + "]"
-                    @core.flushCacheServer( @cachesv )
-                  else
-                    puts "Info: ignored (already added or comment) userid[" + userid + "] dictline[" + dictline + "]"
-                  end
+                  command   = arr[0]
+                  userid    = arr[1]
+                  @mutex.synchronize {
+                    case command
+                    when 'r' # register
+                      dictline = 
+                        if 4 == arr.size 
+                          arr[2] + " " + arr[3]
+                        else
+                          ";; comment"
+                        end
+                      STDERR.puts "Info: processing [register(" + dictline + ")] batch command..."
+                      begin
+                        registered = @core.registerUserJisyo(userid, @kvs, dictline)
+                      rescue RuntimeError
+                        "Info: missing [register(" + dictline + ")] batch command..."
+                      end
+                      if registered
+                        str = d.strftime( "%D %X" )
+                        STDERR.puts "Info: [" + str + "]added to dict                      userid[" + userid + "] dictline[" + dictline + "]"
+                        @core.flushCacheServer( @cachesv )
+                      else
+                        STDERR.puts "Info: ignored (already added or comment) userid[" + userid + "] dictline[" + dictline + "]"
+                      end
+                    when 'k' # kakutei
+                      arr = word.split( /[ ]+/ )
+                      _key   = arr[2]
+                      _tango = arr[3]
+                      STDERR.puts "Info: processing [kakutei(" + _tango + ")] batch command..."
+                      begin
+                        @core.sekkaKakutei( userid, @kvs, @cachesv, _key, _tango )
+                      rescue RuntimeError
+                        STDERR.puts "Info: missing [kakutei(" + _tango + ")] batch command..."
+                      end
+
+                      STDERR.printf( "Info: kakutei [%s:%s] \n", _key, _tango )
+                    when 'f' # flush
+                      STDERR.puts "Info: processing [flush] batch command..."
+                      begin
+                        n = @core.flushUserJisyo( userid, @kvs )
+                      rescue RuntimeError
+                        STDERR.puts "Info: missing [flush] batch command..."
+                      end
+                      @core.flushCacheServer( @cachesv )
+                      STDERR.printf( "info : flush [%s] user's dict %d entries. \n", userid, n )
+                    end
+                  }
                 }
               end
-            end
+            end          
           }
         end
         @thread.run
@@ -110,20 +146,42 @@ module SekkaServer
                  _yomi   = URI.decode( req.params[  'yomi'].force_encoding("UTF-8") )
                  _limit  = URI.decode( req.params[ 'limit'].force_encoding("UTF-8") )
                  _method = URI.decode( req.params['method'].force_encoding("UTF-8") )
-                 @core.writeToString( @core.sekkaHenkan( userid, @kvs, @cachesv, _yomi, _limit.to_i, _method ))
+                 @mutex.synchronize {
+                    begin
+                      @core.writeToString( @core.sekkaHenkan( userid, @kvs, @cachesv, _yomi, _limit.to_i, _method ))
+                    rescue MemCache::MemCacheError
+                      "sekka-server: memcached server is down (or may be offline)"
+                    end
+                 }
                when "/kakutei"
                  _key    = URI.decode( req.params[   'key'].force_encoding("UTF-8") )
                  _tango  = URI.decode( req.params[ 'tango'].force_encoding("UTF-8") )
-                 @core.sekkaKakutei( userid, @kvs, @cachesv, _key, _tango )
+                 @queue.push( 'k ' + userid + " " + _key + " " + _tango )
                when "/register"
                  dict    = URI.decode( req.params['dict'].force_encoding( "UTF-8" ) ).split( "\n" )
-                 dict.each { |x| @queue.push( userid + " " + x ) }
+                 dict.each { |x|
+                    @queue.push( 'r ' + userid + " " + x )
+                 }
                  sprintf( "sekka-server:register request (%s) words added, current-queue-size (%s)", dict.size, @queue.size )
                when "/flush"
-                 @core.flushCacheServer( @cachesv )
-                 n = @core.flushUserJisyo( userid, @kvs )
-                 printf( "info : flush [%s] user's dict %d entries.", userid, n )
-                 sprintf( "sekka-server:flush request successful. flush (%d) entries.", n )
+                 @queue.push( 'f ' + userid )
+                 sprintf( "sekka-server:flush request successful." )
+               when "/googleime"
+                 _yomi   = URI.decode( req.params[  'yomi'].force_encoding("UTF-8") )
+                 printf( "info : google-ime request [%s]\n", _yomi )
+                 result = "sekka-server: google-ime error"
+                 begin
+                   result = @core.googleIme( _yomi,
+                                             SekkaServer::Config.proxyHost,
+                                             SekkaServer::Config.proxyPort )
+                 rescue Timeout
+                   result = "sekka-server: Timeout to request google-ime (may be offline)"
+                 rescue SocketError
+                   result = "sekka-server: SocketError to request google-ime (may be offline)"
+                 rescue Errno::ECONNREFUSED
+                   result = "sekka-server: http proxy server is down (or may be offline)"
+                 end
+                 @core.writeToString( result )
                else
                  sprintf( "sekka-server:unknown path name. [%s]", req.path )
                end

data/script/sekkaserver.debian

@@ -0,0 +1,60 @@
+#!/bin/sh
+
+###
+### /etc/init.d/sekkaserver file for Debian
+###
+
+### BEGIN INIT INFO
+# Provides:          sekkaserver
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $network $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start sekka-server daemon
+### END INIT INFO
+
+
+# Defaults
+RUN_MODE="daemons"
+
+PIDFILE=/home/sekka/.sekka-server/pid
+LOGFILE=/home/sekka/.sekka-server/server.log
+
+# clear conflicting settings from the environment
+unset TMPDIR
+
+. /lib/lsb/init-functions
+
+case "$1" in
+    start)
+	log_daemon_msg "Starting sekka-server daemon"
+	su - sekka -c "nohup sekka-server > ${LOGFILE} &"
+	log_end_msg 0
+	;;
+    stop)
+	log_daemon_msg "Stopping sekka-server daemon"
+	kill -KILL `cat ${PIDFILE}`
+	log_end_msg 0
+	;;
+    status)
+	log_daemon_msg "sekka-server status"
+	ps -p `cat ${PIDFILE}` | grep sekka-server
+	if [ "$?" = "0" ] ; then 
+		echo "   sekka-server is running" 
+	else	
+		echo "   sekka-server is not running" 
+	fi
+	log_end_msg 0
+	;;
+    restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+    *)
+	echo "Usage: /etc/init.d/sekkaserver {status|start|stop|restart}"
+	exit 1
+	;;
+esac
+
+exit 0

data/test/google-ime.nnd

@@ -0,0 +1,87 @@
+;;-*- mode: nendo; syntax: scheme -*-
+;;;
+;;; google-ime.nnd - google-ime部のテスト
+;;;  
+;;;   Copyright (c) 2010  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+;;;   
+;;;   Redistribution and use in source and binary forms, with or without
+;;;   modification, are permitted provided that the following conditions
+;;;   are met:
+;;;   
+;;;   1. Redistributions of source code must retain the above copyright
+;;;      notice, this list of conditions and the following disclaimer.
+;;;  
+;;;   2. Redistributions in binary form must reproduce the above copyright
+;;;      notice, this list of conditions and the following disclaimer in the
+;;;      documentation and/or other materials provided with the distribution.
+;;;  
+;;;   3. Neither the name of the authors nor the names of its contributors
+;;;      may be used to endorse or promote products derived from this
+;;;      software without specific prior written permission.
+;;;  
+;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;  
+;;;  $Id: 
+;;;
+(use nendo.test)
+(use sekka.google-ime)
+
+(test-start "google-ime")
+
+;;===================================================================
+
+;;-------------------------------------------------------------------
+(test-section "conversion json => sekka result")
+
+(test* "no split (1)"
+       '("四文字熟語" "４文字熟語" "4文字熟語" "よんもじじゅくご" "ヨンモジジュクゴ")
+       (json-string->sekka-result-string
+        "[[\"よんもじじゅくご\", [\"四文字熟語\", \"４文字熟語\", \"4文字熟語\", \"よんもじじゅくご\", \"ヨンモジジュクゴ\"]]]"))
+
+(test* "no split (2)"
+       '()
+       (json-string->sekka-result-string
+        "[]"))
+
+(test* "split (1)"
+       '("曖昧文字列" "あいまいもじれつ" "アイマイモジレツ")
+       (json-string->sekka-result-string
+        "[[\"あいまい\", [\"曖昧\", \"あいまい\", \"アイマイ\", \"愛舞\", \"愛麻衣\"]],  [\"もじれつ\", [\"文字列\", \"もじれつ\", \"モジレツ\"]]]"))
+
+(test* "split (2)"
+       '("竹内関数" "竹内関数" "竹内巻数" "武内函数" "タケウチ韓嵩")
+       (json-string->sekka-result-string
+        "[[\"たけうち\", [\"竹内\", \"竹内\", \"竹内\", \"武内\", \"タケウチ\"]], [\"かんすう\", [\"関数\", \"関数\", \"巻数\", \"函数\", \"韓嵩\"]]]"))
+
+;;-------------------------------------------------------------------
+(test-section "request to google-ime")
+
+(test* "request online (1)"
+       '("日本語" "ニホンゴ" "ニホン語" "にほんご" "ﾆﾎﾝｺﾞ")
+       (request-google-ime "1" #t nil nil))
+
+(test* "request online (2)"
+       '("変換" "返還" "へんかん" "偏官" "変漢")
+       (request-google-ime "2" #t nil nil))
+
+(test* "request online (3)"
+       '()
+       (request-google-ime "3" #t nil nil))
+
+(test* "request online (4)"
+       '()
+       (request-google-ime "4" #t nil nil))
+
+
+;;===================================================================
+(test-end)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +09:00
+date: 2011-02-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,8 +106,8 @@ dependencies:
         segments: 
         - 0
         - 4
-        - 0
-        version: 0.4.0
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -154,11 +154,13 @@ files:
 - bin/sekka-server
 - emacs/http-cookies.el
 - emacs/http-get.el
+- emacs/popup.el
 - emacs/sekka.el
 - lib/sekka.ru
 - lib/sekka/alphabet-lib.nnd
 - lib/sekka/approximatesearch.rb
 - lib/sekka/convert-jisyo.nnd
+- lib/sekka/google-ime.nnd
 - lib/sekka/henkan.nnd
 - lib/sekka/jisyo-db.nnd
 - lib/sekka/kvs.rb
@@ -167,10 +169,12 @@ files:
 - lib/sekka/util.nnd
 - lib/sekkaconfig.rb
 - lib/sekkaserver.rb
+- script/sekkaserver.debian
 - test/alphabet-lib.nnd
 - test/approximate-bench.nnd
 - test/azik-verification.nnd
 - test/common.nnd
+- test/google-ime.nnd
 - test/henkan-main.nnd
 - test/jisyo.nnd
 - test/roman-lib.nnd