sekka 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdda3d8bdbf3dd519dfc6d3eeb202f0968bd3f0f
-  data.tar.gz: ef1a33ab474b7bb5deebaeb49e8ab32e7deaa3ee
+  metadata.gz: e3485dd4e71a4fd13a045a227b6300cc99ba2a82
+  data.tar.gz: b033b003f3d31322ea053f08f109d872e638e814
 SHA512:
-  metadata.gz: 124923840d365584238349826ad008200173fa8c43809a8aa351e87b4c9d205f35ffc01dc7ee864a5273222670fd15e819372c64e4b39ce1c7edcd1f9a635105
-  data.tar.gz: e29b0b82b8eb6d4a850e4204a768025972c20a4f0c3e675bec835210ecae4da751469ddf2d05f544ec711d552c707bc0c1f0f8842ba900d95b0aceda5b5d2b36
+  metadata.gz: 895c7ccd8ea688d1e2f8cade2802b338c18f5efa17fb23915850d34c00c7450e09c8768008ef2ff01f7eb8377a709eb0088a7595c112444c8c67b6e214262437
+  data.tar.gz: 7a911146acc8dba8e8bafeb01495781d62f05b21ff4f0c592862d6205730f8115e7f3f7d8dd1b16d1879cbcae9b23792ffb99f7795b24371b229c9f0bf4456cf

data/README.md

@@ -1,6 +1,6 @@
 # Sekka (石火) SKK like Japanese input method
+ [![Build Status](https://travis-ci.org/kiyoka/sekka.svg?branch=master)](https://travis-ci.org/kiyoka/sekka)
 
- [![Build Status](https://secure.travis-ci.org/kiyoka/sekka.png)](http://travis-ci.org/kiyoka/sekka)
 
 ##  Sekka(石火)はSKKライクな日本語入力メソッドです。
  <http://oldtype.sumibi.org/show-page/Sekka>

data/Rakefile

@@ -77,7 +77,7 @@ end
 
 task :compile do
   # generate version.rb
-  dictVersion = "1.4.0"
+  dictVersion = "1.4.1"
   vh = Jeweler::VersionHelper.new "."
   open( "./lib/sekka/sekkaversion.rb", "w" ) {|f|
     f.puts(   "class SekkaVersion" )
@@ -163,8 +163,13 @@ task :bench do
 end
 
 task :alljisyo  => [ :alljisyoS, :alljisyoL ]
-task :alljisyoS => [ :jisyoS, :loadS, :dumpS ]
-task :alljisyoL => [ :jisyoL, :loadL, :dumpL ]
+task :alljisyoS => [ :jisyoS, :loadS, :dumpS, :md5 ]
+task :alljisyoL => [ :jisyoL, :loadL, :dumpL, :md5 ]
+
+task :md5 do
+  sh "md5sum ./data/SEKKA-JISYO.SMALL.N.tsv > ./data/SEKKA-JISYO.SMALL.N.md5"
+  sh "md5sum ./data/SEKKA-JISYO.LARGE.N.tsv > ./data/SEKKA-JISYO.LARGE.N.md5"
+end
 
 task :jisyoS do
   generateTypes.each {|x|
@@ -172,6 +177,7 @@ task :jisyoS do
     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}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase3   >> ./data/SEKKA-JISYO.SMALL.#{x}"
   }
 end
 
@@ -184,34 +190,35 @@ task :jisyoL do
     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}"
+    sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase3   >> ./data/SEKKA-JISYO.LARGE.#{x}"
   }
 end
 
 task :loadS do
   generateTypes.each {|x|
-    sh "ruby ./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#xmsiz=1024m"
   }
 end
 
 task :loadL do
   generateTypes.each {|x|
-    sh "ruby ./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#xmsiz=1024m"
   }
 end
 
 task :dumpS do
   generateTypes.each {|x|
-    sh "ruby ./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#xmsiz=1024m > ./data/SEKKA-JISYO.SMALL.#{x}.tsv"
   }
 end
 
 task :dumpL do
   generateTypes.each {|x|
-    sh "ruby ./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#xmsiz=1024m > ./data/SEKKA-JISYO.LARGE.#{x}.tsv"
   }
 end
 
-
+# SKK-JISYO.hiragana-phrase はWikipediaから作られる。
 task :phrase => [ "/tmp/jawiki.txt.gz", "./data/wikipedia/jawiki.hiragana.txt" ] do
   sh "sort ./data/wikipedia/jawiki.hiragana.txt | uniq -c | sort > ./data/wikipedia/ranking.txt"
   sh "ruby -I ./lib /usr/local/bin/nendo ./data/hiragana_phrase_in_wikipedia2.nnd ./data/wikipedia/ranking.txt > ./data/SKK-JISYO.hiragana-phrase"
@@ -234,6 +241,7 @@ file "/tmp/jawiki.txt.gz" do
 end
 
 
+# SKK-JISYO.hiragana-phrase2 はIPADicから作られる。
 task :phrase2 => [ "./data/ipadic.all.utf8.txt" ] do
   sh "time ruby -I ./lib /usr/local/bin/nendo ./data/hiragana_phrase_in_ipadic.nnd             ./data/ipadic.all.utf8.txt | sort | uniq > ./data/SKK-JISYO.hiragana-phrase2"
 end
@@ -244,12 +252,16 @@ file "./data/ipadic.all.utf8.txt" do
   sh "iconv -f euc-jp -t utf-8 /tmp/ipadic-2.7.0/*.dic > ./data/ipadic.all.utf8.txt"
 end
 
+# SKK-JISYO.hiragana-phrase3 kiyokaが普段の運用で不足していると思ったものを手で補ったもの。
+# SKK-JISYO.hiragana-phrase3 はgitにコミットする必要あり。
+#
 
 task :rackup do
   # how to install mongrel is "gem install mongrel --pre"
   sh "ruby -I ./lib ./bin/sekka-server"
 end
 
+# SKK-JISYO.L.hira-kata はSKK辞書のカタカナ語を抜き出したもの。
 task :katakanago do
   sh "nkf --euc ./data/SKK-JISYO.L.201008 > tmpfile.euc"
   sh "/usr/share/skktools/filters/abbrev-convert.rb -k tmpfile.euc | skkdic-expr2 | iconv -f=EUC-JP -t=UTF-8 > ./data/SKK-JISYO.L.hira-kata"

data/VERSION.yml

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

data/emacs/sekka.el

@@ -133,10 +133,14 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 (defvar sekka-mode nil             "漢字変換トグル変数")
 (defun sekka-modeline-string ()
   ;; 接続先sekka-serverのホスト名を表示する。
-  (format " Sekka[%s]" (if current-sekka-server-url
-			   (url-host
-			    (url-generic-parse-url current-sekka-server-url))
-			 "")))
+  (format " Sekka[%s%s]"
+	  (if current-sekka-server-url
+	      (url-host
+	       (url-generic-parse-url current-sekka-server-url))
+	    "")
+	  (if sekka-uploading-flag
+	      "(UPLOADING)"
+	    "")))
 (defvar sekka-select-mode nil      "候補選択モード変数")
 (or (assq 'sekka-mode minor-mode-alist)
     (setq minor-mode-alist (cons
@@ -189,6 +193,10 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 ;;; 現在のsekka-serverの接続先
 (defvar current-sekka-server-url     nil)
 
+;;; 辞書のアップロード中かどうか
+(defvar sekka-uploading-flag         nil)
+
+
 ;;; 候補選択モード用
 (defvar sekka-history-stack '())        ; 過去に変換した、場所と変換候補の状態を保存しておくスタック
 ;; データ構造は以下の通り。
@@ -520,14 +528,17 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 				(list (car (sekka-divide-into-few-line str)))
 			      (sekka-divide-into-few-line str)))
 		  (x '()))
+      (setq sekka-uploading-flag t)
+      (redraw-modeline)
       (cc:thread 100
 	(while (< 0 (length str-lst))
 	  (setq x (pop str-lst))
 	  ;;(message "Requesting to sekka server...")
 	  (sekka-debug-print (format "register [%s]\n" x))
 	  (lexical-let ((result (sekka-rest-request "register" `((dict . ,x)))))
-	    (sekka-debug-print (format "register-result:%S\n" result))
-	    (message result)))))
+	    (sekka-debug-print (format "register-result:%S\n" result))))
+	(setq sekka-uploading-flag nil)
+	(redraw-modeline)))
     t))
 
 
@@ -1637,7 +1648,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.5.4" ;;SEKKA-VERSION
+  "1.5.5" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/google-ime.nnd

@@ -53,9 +53,9 @@
          (apply zip kouho-list)))))
 
 
-(define (request-google-ime keyword unit-test proxy-host proxy-port)
+(define (request-google-ime keyword proxy-host proxy-port)
   (let* ((body "")
-         (target "google-ime-api-normalizer.heroku.com")
+         (target "www.google.com")
          (_ (Net::HTTP.version_1_2))
          (http (if proxy-host
                    (let1 proxy-class (Net::HTTP.Proxy proxy-host proxy-port)
@@ -65,8 +65,7 @@
     (set! http.read_timeout 20)
     (http.start 
      (&block ()
-       (let* ((path (sprintf "/transliterate%s?langpair=%s&text=%s"
-                             (if unit-test "_test" "")
+       (let* ((path (sprintf "/transliterate?langpair=%s&text=%s"
                              "ja-Hira|ja" (URI.encode keyword)))
               (response (http.get path)))
          (set! body response.body))))

data/lib/sekka/henkan.nnd

@@ -535,6 +535,6 @@
 
 ;; ユーザー定義語彙の登録処理
 (define (googleIme keyword proxy-host proxy-port)
-  (request-google-ime keyword #f proxy-host proxy-port))
+  (request-google-ime keyword proxy-host proxy-port))
 ;; Export to Ruby world
 (export-to-ruby googleIme)

data/lib/sekka/sekkaversion.rb

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

data/test/google-ime.nnd

@@ -67,21 +67,16 @@
 (test-section "request to google-ime")
 
 (test* "request online (1)"
-       '("日本語" "ニホンゴ" "ニホン語" "にほんご" "ﾆﾎﾝｺﾞ")
-       (request-google-ime "1" #t nil nil))
+       '("日本語" "ニホンゴ" "にほんご" "ﾆﾎﾝｺﾞ")
+       (request-google-ime "にほんご" nil nil))
 
 (test* "request online (2)"
-       '("変換" "返還" "へんかん" "偏官" "変漢")
-       (request-google-ime "2" #t nil nil))
+       '("変換" "返還" "偏官" "へんかん" "ヘンカン")
+       (request-google-ime "へんかん" nil nil))
 
 (test* "request online (3)"
-       '()
-       (request-google-ime "3" #t nil nil))
-
-(test* "request online (4)"
-       '()
-       (request-google-ime "4" #t nil nil))
-
+       '("日本" "にほん" "二本" "２本" "2本")
+       (request-google-ime "にほん" nil nil))
 
 ;;===================================================================
 (test-end)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine