sekka 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf4756e5b5ff60d017c674400dade5489f8ac9b
-  data.tar.gz: c06ee065d02bae383dd05b1c8f16f42b809cff72
+  metadata.gz: 60bdf6a44d924978bd822a1964693ba999eb0032
+  data.tar.gz: 9da6c58564582ae7bc4e0e4c4c16e388a1487c48
 SHA512:
-  metadata.gz: d361b6d1e981ba6a6d5e979355086f3dc8d8c3f9d09565559645ea2c51fddfded924e83fa809764a47f42451fc539bd00ee3ea30cc47a5a3a28357681114b32b
-  data.tar.gz: 902bc3b838becaf488eff1143bb9e89e4d42808c37721287e2a2d16de3f338ad5e55ada20bb614c9c7b64a5ee3511c5750e136ef7b39388987c93e9bee8f1ef4
+  metadata.gz: ac0e777364bf1e07232486b74b3e50bb552ce774d7492920ee0869b430eee72f741a8967fdcd2a8e0f092a0adc367ac96cec2a25a51f017bc426fc1c41085e9a
+  data.tar.gz: 5a2964f084b8f1c8dc488e7c82e5ed6b08e99f232d95c1c42b9727add922093db317d8b79c7347da9b516636c1005312477c7dbd6b0683b89d42f19e6c44278f

data/VERSION.yml

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

data/emacs/sekka.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
 ;; Author: Kiyoka Nishiyama <kiyoka@sumibi.org>
-;; Version: 1.5.7          ;;SEKKA-VERSION
+;; Version: 1.5.8          ;;SEKKA-VERSION
 ;; Keywords: ime, skk, japanese
 ;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.0"))
 ;; URL: https://github.com/kiyoka/sekka
@@ -82,6 +82,11 @@
   :type  'string
   :group 'sekka)
 
+(defcustom sekka-use-curl t
+  "non-nil でcurlコマンドを使う。nilでEmacs Lisp(url.elを使う)"
+  :type  'boolean
+  :group 'sekka)
+
 (defcustom sekka-curl "curl"
   "curlコマンドの絶対パスを設定する"
   :type  'string
@@ -208,6 +213,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	  (goto-char (point-max))
 	  (insert string)))))
 
+;; HTTPクライアントの多重起動防止用
+(defvar sekka-busy 0)
 
 ;;; 現在のsekka-serverの接続先
 (defvar current-sekka-server-url     nil)
@@ -378,7 +385,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	result)))
   (let ((arg-alist
 	 (cons
-	  `(userid . ,sekka-login-name)
+	  `("userid" . ,sekka-login-name)
 	  arg-alist)))
     (or
      (one-request func-name arg-alist)
@@ -397,7 +404,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	       (list "--noproxy" sekka-no-proxy-hosts)
 	     nil)
 	   (sekka-construct-curl-argstr (cons
-					 '(format . "sexp")
+					 '("format" . "sexp")
 					 arg-alist))))
 	 (buffername "*sekka-output*")
 	 (result ""))
@@ -429,12 +436,74 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
    "henkan"
    '(
      ("yomi"   . "Nihon")
-     (limit    . "1")
-     (method   . "normal")
+     ("limit"  . "1")
+     ("method" . "normal")
      ("userid" . "kiyoka")))
   )
 
-	
+
+(defun sekka-url-http-post (url args)
+  "Send ARGS to URL as a POST request."
+  (progn
+    (setq url-request-method "POST")
+    (setq url-http-version "1.0")
+    (setq url-request-extra-headers
+	  '(("Content-Type" . "application/x-www-form-urlencoded")))
+    (setq url-request-data
+	  (mapconcat (lambda (arg)
+		       (concat (url-hexify-string (car arg))
+			       "="
+			       (url-hexify-string (cdr arg))))
+		     args
+		     "&"))
+    (let* ((lines
+	    (let ((buf (url-retrieve-synchronously url)))
+	      (sekka-debug-print (buffer-name buf))
+	      (sekka-debug-print "\n")
+	      (if buf
+		  (with-current-buffer buf
+		    (decode-coding-string 
+		     (let ((str (buffer-substring-no-properties (point-min) (point-max))))
+		       (sekka-debug-print (format "http result code:%s\n" url-http-response-status))
+		       (sekka-debug-print (format "(%d-%d) eoh=%s\n" (point-min) (point-max) url-http-end-of-headers))
+		       (sekka-debug-print (format "<<<%s>>>\n" str))
+		       str)
+		     'utf-8))
+                (list "curl: (7)  Couldn't connect to host 'localhost'")))) ;; Emulate curl error.
+           (line-list
+            (split-string lines "\n")))
+      
+      (car (reverse line-list)))))
+
+;;
+;; http request function with pure emacs
+;;   (no proxy supported)
+(defun sekka-rest-request-by-pure (func-name arg-alist)
+  (setq sekka-busy (+ sekka-busy 1))
+  (sekka-debug-print (format "sekka-busy=%d\n" sekka-busy))
+  (let* ((arg-alist 
+	  (cons
+	   '("format" . "sexp")
+	   arg-alist))
+	 (result
+	  (sekka-url-http-post 
+	   (concat current-sekka-server-url func-name)
+	   arg-alist)))
+    (setq sekka-busy (- sekka-busy 1))
+    (sekka-debug-print (format "sekka-busy=%d\n" sekka-busy))
+    result))
+
+(when nil
+  ;; unit test
+  (setq sekka-login-name (user-login-name))
+  (setq current-sekka-server-url "http://localhost:12929/")
+  (sekka-rest-request-by-pure
+   "henkan"
+   '(
+     ("yomi"   . "Nihon")
+     ("limit"  . "1")
+     ("method" . "normal")
+     ("userid" . "kiyoka"))))
 
 (defun sekka-rest-request-sub (func-name arg-alist)
   (if sekka-psudo-server
@@ -452,7 +521,11 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	;;    "(\"初回起動\", \"諸快気堂\", \"諸開基堂\", \"しょかいきどう\", \"ショカイキドウ\")"
 	))
     ;; 実際のサーバに接続する
-    (sekka-rest-request-by-curl func-name arg-alist)))
+    (cond
+     (sekka-use-curl
+      (sekka-rest-request-by-curl func-name arg-alist))
+     (t
+      (sekka-rest-request-by-pure func-name arg-alist)))))
 
 ;;
 ;; 現在時刻をUNIXタイムを返す(単位は秒)
@@ -476,9 +549,9 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   (sekka-debug-print (format "henkan-send  :[%s]\n"  yomi))
 
   (let (
-	(result (sekka-rest-request "henkan" `((yomi   . ,yomi)
-					       (limit  . ,(format "%d" limit))
-					       (method . ,sekka-roman-method)))))
+	(result (sekka-rest-request "henkan" `(("yomi"   . ,yomi)
+					       ("limit"  . ,(format "%d" limit))
+					       ("method" . ,sekka-roman-method)))))
     (sekka-debug-print (format "henkan-result:%S\n" result))
     (if (eq (string-to-char result) ?\( )
 	(progn
@@ -502,8 +575,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   ;;(message "Requesting to sekka server...")
   
   (let ((result (sekka-rest-request "kakutei" `(
-						(key   . ,key)
-						(tango . ,tango)))))
+						("key"   . ,key)
+						("tango" . ,tango)))))
     (sekka-debug-print (format "kakutei-result:%S\n" result))
     (message result)
     t))
@@ -518,7 +591,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   ;;(message "Requesting to sekka server...")
   
   (let ((result (sekka-rest-request "googleime" `(
-						  (yomi  . ,yomi)))))
+						  ("yomi"  . ,yomi)))))
     (sekka-debug-print (format "googleime-result:%S\n" result))
     (progn
       (message nil)
@@ -554,7 +627,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	  (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)))))
+	  (lexical-let ((result (sekka-rest-request "register" `(("dict" . ,x)))))
 	    (sekka-debug-print (format "register-result:%S\n" result))))
 	(setq sekka-uploading-flag nil)
 	(redraw-modeline)))
@@ -853,6 +926,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
     (define-key map "\C-r"      'popup-select)
     map))
 
+
 ;; 選択操作回数のインクリメント
 (defun sekka-select-operation-inc ()
   (incf sekka-select-operation-times)
@@ -872,7 +946,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 			 :scroll-bar t
 			 :margin t
 			 :keymap sekka-popup-menu-keymap
-			 :initial-index sekka-cand-cur)))
+                         :initial-index sekka-cand-cur)))
       (let ((selected-word (car (split-string result " "))))
 	(setq sekka-cand-cur (sekka-find-by-tango selected-word))))))
 
@@ -1497,6 +1571,10 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   "リアルタイムで変換中のガイドを出す
 sekka-modeがONの間中呼び出される可能性がある。"
   (cond
+   ((< 0 sekka-busy)
+    ;; 残り回数のデクリメント
+    (setq sekka-timer-rest (- sekka-timer-rest 1))
+    (sekka-debug-print "busy!\n"))
    ((or (null sekka-mode)
 	(> 1 sekka-timer-rest))
     (cancel-timer sekka-timer)
@@ -1666,7 +1744,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.5.7" ;;SEKKA-VERSION
+  "1.5.8" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/sekkaversion.rb

@@ -1,4 +1,4 @@
 class SekkaVersion
-  def  self.version()     "1.5.7"  end
+  def  self.version()     "1.5.8"  end
   def  self.dictVersion() "1.4.1"  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: memcache-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -70,56 +70,56 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Sekka is a SKK like input method. Sekka server provides REST Based API.
@@ -134,9 +134,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".gitignore"
-- ".travis.yml"
+- .gemtest
+- .gitignore
+- .travis.yml
 - COPYING
 - DESIGN
 - README.md
@@ -253,17 +253,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Sekka is a SKK like input method.