sekka 0.9.5 → 0.9.6

data/bin/sekka-server

@@ -11,14 +11,16 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/sekka/sekkaversion")
 
 
 DICTDIR = File.expand_path( "~/.sekka-server" )
-DICTURL = "http://sumibi.org/sekka/dict/" + SekkaVersion.version
+DICTURL = "https://raw.github.com/kiyoka/sekka/master/public_dict/" + SekkaVersion.dictVersion
+
 
 PIDFILE = DICTDIR + "/pid"
 
 TC_FILE = DICTDIR + "/SEKKA-JISYO.SMALL.tch"
 TSVFILE = DICTDIR + "/SEKKA-JISYO.SMALL.tsv"
 SUMFILE = DICTDIR + "/SEKKA-JISYO.SMALL.md5"
-TSVURL  = DICTURL + "/SEKKA-JISYO.SMALL.tsv"
+
+URLURL  = DICTURL + "/SEKKA-JISYO.SMALL.url"
 SUMURL  = DICTURL + "/SEKKA-JISYO.SMALL.md5"
 
 TC_FILE_LIST = [ DICTDIR + "/SEKKA-JISYO.CUSTOM.tch",
@@ -71,7 +73,13 @@ def main
   if not File.exist?( TSVFILE )
     STDERR.printf( "Info: Downloading SEKKA-JISYO\n" )
     # 辞書をダウンロードする
-    cmd = sprintf( "curl -o %s %s",    TSVFILE, TSVURL )
+    cmd = sprintf( "curl %s",          URLURL )
+    STDERR.printf( "Command : %s\n", cmd )
+    tsvurl = 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( "Command : %s\n", cmd )
     system( cmd )
     cmd = sprintf( "curl -o %s %s",    SUMFILE, SUMURL )

data/emacs/sekka.el

@@ -1620,7 +1620,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "0.9.5" ;;SEKKA-VERSION
+  "0.9.6" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/sekkaversion.rb

@@ -1,5 +1,4 @@
 class SekkaVersion
-  def self.version
-    "0.9.5"
-  end
+  def  self.version()     "0.9.6"  end
+  def  self.dictVersion() "0.9.2"  end
 end

data/lib/sekkaserver.rb

@@ -146,14 +146,21 @@ module SekkaServer
                format = URI.decode( req.params['format'].force_encoding("UTF-8") )
                case req.path
                when "/henkan"
-                 _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") )
+                 _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") )
+                 _orRedis = if :redis == SekkaServer::Config.dictType then "or Redis-server" else "" end
                  @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)"
+                    rescue Timeout
+                      result = "sekka-server: Timeout to request memcached server #{_orRedis} (may be offline)"
+                    rescue SocketError
+                      result = "sekka-server: SocketError to request memcached server #{_orRedis} (may be offline)"
+                    rescue Errno::ECONNREFUSED
+                      result = "sekka-server: ConnectionRefused to request memcached server #{_orRedis} (may be offline)"
                     end
                  }
                when "/kakutei"
@@ -182,7 +189,7 @@ module SekkaServer
                  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)"
+                   result = "sekka-server: ConnectionRefused to request google-ime (or may be offline)"
                  end
                  @core.writeToString( result )
                else

data/test/memcache.nnd

@@ -40,7 +40,6 @@
 (define dbtype   'memcache)
 (define userid   "temp")
 (define cachesv (Kvs.new dbtype))
-(cachesv.open "localhost:11211")
 
 (test-start "memcached I/F")
 ;;===================================================================
@@ -48,6 +47,18 @@
 ;;-------------------------------------------------------------------
 (test-section "memcached access")
 
+(test* "db connect NG and Exception"
+       (test-error MemCache::MemCacheError)
+       (let1 sv (Kvs.new dbtype)
+         (sv.open "localhost:11111")
+         (sv.put! "temp::1" "one")))
+
+(test* "db connect OK"
+       "one"
+       (begin
+         (cachesv.open "localhost:11211")
+         (cachesv.put! "temp::1" "one")))
+
 (test* "db store 1"
        "one"
        (cachesv.put! "temp::1" "one"))

data/test/redis.nnd

@@ -0,0 +1,88 @@
+;;-*- mode: nendo; syntax: scheme -*-
+;;;
+;;; redis.nnd - Redisサーバーへのアクセスのテスト
+;;;  
+;;;   Copyright (c) 2011  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: 
+;;;
+(require "sekka/kvs")
+(use nendo.test)
+(load "./test/common.nnd")
+
+(define dbtype   'redis)
+(define userid   "temp")
+(define cachesv (Kvs.new dbtype))
+
+(test-start "redis I/F")
+;;===================================================================
+
+;;-------------------------------------------------------------------
+(test-section "redis server access")
+
+(test* "db connect NG and Exception"
+       (test-error SocketError)
+       (let1 sv (Kvs.new dbtype)
+         (sv.open "nohost.example.com")
+         (sv.put! "temp::1" "one")))
+
+(test* "db connect NG and Exception"
+       (test-error Timeout::Error)
+       (let1 sv (Kvs.new dbtype)
+         (sv.open "126.0.0.1")
+         (sv.put! "temp::1" "one")))
+
+(test* "db connect OK"
+       "one"
+       (begin
+         (cachesv.open "localhost")
+         (cachesv.put! "temp::1" "one")))
+
+(print "sleep 100")
+(.sleep 100)
+
+
+(test* "db store 1"
+       "one"
+       (cachesv.put! "temp::1" "one"))
+
+(test* "db fetch  1"
+       "one"
+       (cachesv.get "temp::1"))
+
+(test* "db fetch  fallback"
+       false
+       (cachesv.get "temp::none" false))
+
+
+;;===================================================================
+
+
+(test-end)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sekka
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -220,12 +220,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 5
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 6
+        - 1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: *id015
@@ -304,6 +304,7 @@ files:
 - test/henkan-main.nnd
 - test/jisyo.nnd
 - test/memcache.nnd
+- test/redis.nnd
 - test/roman-lib.nnd
 - test/sharp-number.nnd
 - test/skk-azik-table.nnd
@@ -339,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Sekka is a SKK like input method.