sekka 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2b64092011062870613c3906c9855418ca0e68
-  data.tar.gz: f2b131d6ff3d7b7f181a078fac541e03ac6d5b4c
+  metadata.gz: 00d097bb5742731c2ba0f3e31fc5b351bbaa8e3f
+  data.tar.gz: 97c2a40bab221f79c2f4972f1caa30d219f69388
 SHA512:
-  metadata.gz: b5091ad9ac65a240b45208acff8299269cfcf9210c7b95ccb92d61af5c52bc1cb1836201a9b7049c5c044011fcbae4840b5b20c5b140570456ee958de7ab1bc6
-  data.tar.gz: a782b597e4c870ca2cd3cf7deb32063b6183fe78d8cf0bc01ad54ceb5f2a2cb7905a9bc86ddbfefca0143944c3738a949ef5a89db46fe82583c873e7f251d5a9
+  metadata.gz: 2fa69b1b1e4735fe87b07574f75d8480ee0d9ca29560685e85fc85fe63799f4974bd2d8feb415814c91e20714a12ee8b418e512d77920f02dc95b43bcc6d21ed
+  data.tar.gz: 3329fd198f1a35fe4556c6d246e655b5607b929a138e1f8c349562ec707f18afa078ee957ca9b8bae478a14673ae53fa816e4833df4f31df3d941b059ba6aa6a

data/Rakefile

@@ -55,7 +55,7 @@ begin
     gemspec.required_ruby_version = '>= 1.9.2'
     gemspec.add_dependency( "eventmachine" )
     gemspec.add_dependency( "memcache-client" )
-    gemspec.add_dependency( "nendo", "= 0.6.4" )
+    gemspec.add_dependency( "nendo", "= 0.6.5" )
     gemspec.add_dependency( "distributed-trie" )
     gemspec.add_dependency( "rack" )
     gemspec.add_dependency( "ruby-progressbar" )
@@ -70,7 +70,7 @@ end
 
 task :compile do
   # generate version.rb
-  dictVersion = "1.3.0"
+  dictVersion = "1.3.1"
   vh = Jeweler::VersionHelper.new "."
   open( "./lib/sekka/sekkaversion.rb", "w" ) {|f|
     f.puts(   "class SekkaVersion" )

data/VERSION.yml

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

data/emacs/sekka.el

@@ -317,7 +317,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 		  sekka-server-url-2)
     (if (< 0 (length sekka-server-url-3))
 	(setq current-sekka-server-url sekka-server-url-3)
-      (sekka-next-sekka-server-message "third"  "sekka-server-url-3")))
+      (setq current-sekka-server-url sekka-server-url)))
    (t
     (when (< 0 (length sekka-server-url))
       (setq current-sekka-server-url sekka-server-url)))))
@@ -337,8 +337,9 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   (defun one-request (func-name arg-alist)
     (let ((result (sekka-rest-request-sub func-name arg-alist)))
       (if (or
-	   (string-match-p "^curl: [(]6[)] " result) ;; Couldn't resolve host 'aaa.example.com' 
-	   (string-match-p "^curl: [(]7[)] " result) ;; Couldn't connect to host 'localhost'
+	   (string-match-p "^curl: [(]6[)] "  result) ;; Couldn't resolve host 'aaa.example.com' 
+	   (string-match-p "^curl: [(]7[)] "  result) ;; Couldn't connect to host 'localhost'
+	   (string-match-p "^curl: [(]28[)] " result) ;; Operation timed out after XXXX milliseconds with 0 bytes received
 	   )
 	  (progn
 	    (sekka-next-sekka-server)
@@ -1620,7 +1621,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.2.2" ;;SEKKA-VERSION
+  "1.2.3" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/convert-jisyo.nnd

@@ -105,9 +105,6 @@
          ((not fields)
           ;; フォーマットエラー
           #f)
-         ((rxmatch #/\;\;/ line)
-          ;; フォーマットエラー
-          #f)
          ((and (is-hiragana (first fields))
                (= 1 (length fields)))
           ;; 平仮名フレーズ

data/lib/sekka/jisyo-db.nnd

@@ -126,16 +126,20 @@
                                    (length okuri-ari-list)
                                    (length okuri-nashi-list)
                                    (length hiragana-phrase-list))))))
+      (set! keylist '()) ;; free memory
 
       (let1 trie (DistributedTrie::Trie.new kvs (+ okuri-ari-prefix ":" userid ":"))
         (trie-add-autocommit trie   okuri-ari-list       progress))
+      (set! okuri-ari-list '()) ;; free memory
       
       (let1 trie (DistributedTrie::Trie.new kvs (+ okuri-nashi-prefix ":" userid ":"))
         (trie-add-autocommit trie   okuri-nashi-list     progress))
+      (set! okuri-nashi-list '()) ;; free memory
       
       (let1 trie (DistributedTrie::Trie.new kvs (+ hiragana-phrase-prefix ":" userid ":"))
-        (trie-add-autocommit trie   hiragana-phrase-list progress)))))
-
+        (trie-add-autocommit trie   hiragana-phrase-list progress))
+      (set! hiragana-phrase-list '()) ;; free memory
+      )))
 
 (define (append-entry userid kvs _key value)
   (let1 key (+ userid ":" _key)

data/lib/sekka/sekkaversion.rb

@@ -1,4 +1,4 @@
 class SekkaVersion
-  def  self.version()     "1.2.2"  end
-  def  self.dictVersion() "1.3.0"  end
+  def  self.version()     "1.2.3"  end
+  def  self.dictVersion() "1.3.1"  end
 end

data/lib/sekkaconfig.rb

@@ -72,6 +72,10 @@ module SekkaServer
     def self.proxyPort
       @@proxyPort
     end
+
+    def self.maxQueryLength
+      25
+    end
   end
 end
 

data/lib/sekkaserver.rb

@@ -77,6 +77,7 @@ module SekkaServer
       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.printf( "  maxQueryLength : %s\n", SekkaServer::Config.maxQueryLength )
       STDERR.puts(   "--------------------------------" )
 
       begin
@@ -160,9 +161,13 @@ module SekkaServer
                  _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 ))
+                      if SekkaServer::Config.maxQueryLength < _yomi.size
+                        result = sprintf( "sekka-server: query string is too long (over %d character length)", SekkaServer::Config.maxQueryLength )
+                      else
+                        @core.writeToString( @core.sekkaHenkan( userid, @kvs, @cachesv, _yomi, _limit.to_i, _method ))
+                      end
                     rescue MemCache::MemCacheError
-                      "sekka-server: memcached server is down (or may be offline)"
+                      result = "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

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

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

data/test/skk-jisyo-in-1.txt

@@ -48,4 +48,3 @@ wake /ウェイク/
 んん //
 ;; くみこむ ("動詞" "自立")
 くみこむ  //
-くみこむ  //  ;; くみこむ ("動詞" "自立")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: distributed-trie
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: distributed-trie
   requirement: !ruby/object:Gem::Requirement