提交: eef9739562994265a5048384b2229731395e5465 - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

Commit MetaInfo

• 修訂: eef9739562994265a5048384b2229731395e5465 (tree)
• 時間: 2017-03-25 19:55:45
• 作者: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

coding style cleanup and misc fixes

Change Summary

• modified: ChangeLog
• modified: lib/ninix/alias.rb
• modified: lib/ninix/balloon.rb
• modified: lib/ninix/communicate.rb
• modified: lib/ninix/config.rb
• modified: lib/ninix/dll.rb
• modified: lib/ninix/dll/aya.rb
• modified: lib/ninix/dll/aya5.rb
• modified: lib/ninix/dll/bln.rb
• modified: lib/ninix/dll/gomi.rb
• modified: lib/ninix/dll/hanayu.rb
• modified: lib/ninix/dll/httpc.rb
• modified: lib/ninix/dll/kawari.rb
• modified: lib/ninix/dll/kawari8.rb
• modified: lib/ninix/dll/mciaudio.rb
• modified: lib/ninix/dll/mciaudior.rb
• modified: lib/ninix/dll/misaka.rb
• modified: lib/ninix/dll/niseshiori.rb
• modified: lib/ninix/dll/osuwari.rb
• modified: lib/ninix/dll/saori_cpuid.rb
• modified: lib/ninix/dll/satori.rb
• modified: lib/ninix/dll/ssu.rb
• modified: lib/ninix/dll/textcopy.rb
• modified: lib/ninix/dll/wmove.rb
• modified: lib/ninix/dll/yaya.rb
• modified: lib/ninix/entry_db.rb
• modified: lib/ninix/home.rb
• modified: lib/ninix/install.rb
• modified: lib/ninix/keymap.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/lock.rb
• modified: lib/ninix/logging.rb
• modified: lib/ninix/makoto.rb
• modified: lib/ninix/menu.rb
• modified: lib/ninix/metamagic.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/ngm.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/prefs.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix/script.rb
• modified: lib/ninix/seriko.rb
• modified: lib/ninix/sstp.rb
• modified: lib/ninix/sstplib.rb
• modified: lib/ninix/surface.rb
• modified: lib/ninix/update.rb
• modified: lib/ninix/version.rb
• modified: lib/ninix_main.rb

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat March 25 2017   Shyouzou Sugitani <[e-mail]>
+	* Copyrightを2017年に更新した.
+	* Rubyらしいコーディングスタイルへの修正.
+	* HolonとMemeクラスを拡張.
+
 Sun December 11 2016   Shyouzou Sugitani <[e-mail]>
 	* Rubyらしいコーディングスタイルへの修正.
 	* Makotoクラスのテストをtest-makoto.rbに移動.

--- a/lib/ninix/alias.rb
+++ b/lib/ninix/alias.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -16,15 +16,18 @@
 require "gtk3"
 
 require_relative "pix"
-
+require_relative "metamagic"
 
 module Balloon
 
-  class Balloon
+  class Balloon < MetaMagic::Holon
     attr_accessor :window, :user_interaction
 
     def initialize
-      @parent = nil
+      super("") # FIXME
+      @handlers = {
+        'reset_user_interaction' => 'reset_user_interaction',
+      }
       @synchronized = []
       @user_interaction = false
       @window = []
@@ -42,24 +45,6 @@ module Balloon
       @passwordinputbox.set_responsible(self)
     end
 
-    def set_responsible(parent)
-      @parent = parent
-    end
-
-    def handle_request(event_type, event, *arglist)
-      fail "assert" unless ['GET', 'NOTIFY'].include?(event_type)
-      handlers = {
-        'reset_user_interaction' => 'reset_user_interaction',
-      }
-      unless handlers.include?(event)
-        result = @parent.handle_request(
-          event_type, event, *arglist)
-      else
-        result = method(handlers[event]).call(*arglist)
-      end
-      return result if event_type == 'GET'
-    end
-
     def reset_user_interaction
       @user_interaction = false
     end

--- a/lib/ninix/communicate.rb
+++ b/lib/ninix/communicate.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  communicate.rb - ghost-to-ghost communication mechanism
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/config.rb
+++ b/lib/ninix/config.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll.rb
+++ b/lib/ninix/dll.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  dll.rb - a pseudo DLL (SHIORI/SAORI API support) module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/aya.rb
+++ b/lib/ninix/dll/aya.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  aya.rb - an aya.dll compatible Shiori module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/aya5.rb
+++ b/lib/ninix/dll/aya5.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  aya5.rb - an aya.dll(Ver.5) compatible Shiori module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/bln.rb
+++ b/lib/ninix/dll/bln.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  bln.rb - a easyballoon compatible Saori module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/gomi.rb
+++ b/lib/ninix/dll/gomi.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  gomi.rb - a gomi.dll compatible Saori module for ninix
-#  Copyright (C) 2012-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2012-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/hanayu.rb
+++ b/lib/ninix/dll/hanayu.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  hanayu.rb - a "花柚" compatible Saori module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/httpc.rb
+++ b/lib/ninix/dll/httpc.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  httpc.rb - a HTTPC compatible Saori module for ninix
-#  Copyright (C) 2011-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2011-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/kawari.rb
+++ b/lib/ninix/dll/kawari.rb
@@ -3,7 +3,7 @@
 #  kawari.rb - a "華和梨" compatible Shiori module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/kawari8.rb
+++ b/lib/ninix/dll/kawari8.rb
@@ -2,7 +2,7 @@
 #
 #  kawari8.rb - a (Real) 華和梨 loader for ninix
 #  Copyright (C) 2002, 2003 by ABE Hideaki <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/mciaudio.rb
+++ b/lib/ninix/dll/mciaudio.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  mciaudio.rb - a MCIAUDIO compatible Saori module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/mciaudior.rb
+++ b/lib/ninix/dll/mciaudior.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  mciaudior.rb - a MCIAUDIOR compatible Saori module for ninix
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/misaka.rb
+++ b/lib/ninix/dll/misaka.rb
@@ -3,7 +3,7 @@
 #  misaka.rb - a "美坂" compatible Shiori module for ninix
 #  Copyright (C) 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/niseshiori.rb
+++ b/lib/ninix/dll/niseshiori.rb
@@ -3,7 +3,7 @@
 #  niseshiori.rb - a "偽栞" compatible Shiori module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/osuwari.rb
+++ b/lib/ninix/dll/osuwari.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  osuwari.rb - a Osuwari compatible Saori module for ninix
-#  Copyright (C) 2006-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2006-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/saori_cpuid.rb
+++ b/lib/ninix/dll/saori_cpuid.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  saori_cpuid.rb - a saori_cpuid compatible Saori module for ninix
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/satori.rb
+++ b/lib/ninix/dll/satori.rb
@@ -3,7 +3,7 @@
 #  satori.rb - a "里々" compatible Shiori module for ninix
 #  Copyright (C) 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003, 2004 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/ssu.rb
+++ b/lib/ninix/dll/ssu.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  ssu.rb - a ssu compatible Saori module for ninix
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/textcopy.rb
+++ b/lib/ninix/dll/textcopy.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  textcopy.rb - a TEXTCOPY compatible Saori module for ninix
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/wmove.rb
+++ b/lib/ninix/dll/wmove.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  wmove.rb - a wmove.dll compatible Saori module for ninix
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/yaya.rb
+++ b/lib/ninix/dll/yaya.rb
@@ -2,7 +2,7 @@
 #
 #  yaya.rb - a (Real) YAYA loader for ninix
 #  Copyright (C) 2004 by linjian
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2011 by henryhu
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/entry_db.rb
+++ b/lib/ninix/entry_db.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/home.rb
+++ b/lib/ninix/home.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/install.rb
+++ b/lib/ninix/install.rb
@@ -3,7 +3,7 @@
 #  install.rb - an installer module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/keymap.rb
+++ b/lib/ninix/keymap.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/lock.rb
+++ b/lib/ninix/lock.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2011-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2011-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/logging.rb
+++ b/lib/ninix/logging.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2015, 2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2015-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/makoto.rb
+++ b/lib/ninix/makoto.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/menu.rb
+++ b/lib/ninix/menu.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/metamagic.rb
+++ b/lib/ninix/metamagic.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  metamagic.rb - unknown unknowns
-#  Copyright (C) 2011-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2011-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -19,6 +19,27 @@ module MetaMagic
       @key = key
       @baseinfo = nil
       @menuitem = nil
+      @parent = nil
+      @handlers = {}
+    end
+
+    def set_responsible(parent)
+      @parent = parent
+    end
+
+    def handle_request(event_type, event, *arglist)
+      fail "assert" unless ['GET', 'NOTIFY'].include?(event_type)
+      unless @handlers.include?(event)
+        if self.class.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = @parent.handle_request(
+            event_type, event, *arglist)
+        end
+      else
+        result = method(@handlers[event]).call(*arglist)
+      end
+      return result if event_type == 'GET'
     end
 
     def create_menuitem(data)
@@ -62,8 +83,28 @@ module MetaMagic
       @baseinfo = nil
       @menuitem = nil
       @instance = nil
+      @parent = nil
+    end
+
+    def set_responsible(parent)
+      @parent = parent
     end
    
+    def handle_request(event_type, event, *arglist)
+      fail "assert" unless ['GET', 'NOTIFY'].include?(event_type)
+      unless @handlers.include?(event)
+        if self.class.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = @parent.handle_request(
+            event_type, event, *arglist)
+        end
+      else
+        result = method(@handlers[event]).call(*arglist)
+      end
+      return result if event_type == 'GET'
+    end
+
     def create_menuitem(data)
       nil
     end

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001-2004 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2003-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/prefs.rb
+++ b/lib/ninix/prefs.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003-2005 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -40,11 +40,6 @@ module Sakura
 
     def initialize(key)
       super(key)
-      @parent = nil
-    end
-
-    def set_responsible(parent)
-      @parent = parent
     end
 
     def create_menuitem(data)
@@ -66,7 +61,7 @@ module Sakura
     end
   end
 
-  class Sakura
+  class Sakura < MetaMagic::Holon
     attr_reader :key, :cantalk, :last_script
 
     include GetText
@@ -88,7 +83,10 @@ module Sakura
     FROM_GHOST       = 2
  
     def initialize
-      @parent = nil
+      super("") # FIXME
+      @handlers = {
+        'lock_repaint' => "get_lock_repaint"
+      }
       @sstp_handle = nil
       @sstp_entry_db = nil
       @sstp_request_handler = nil
@@ -160,28 +158,6 @@ module Sakura
       @reload_event = nil
     end
 
-    def set_responsible(parent)
-      @parent = parent
-    end
-
-    def handle_request(event_type, event, *arglist)
-      fail "assert" unless ['GET', 'NOTIFY'].include?(event_type)
-      handlers = {
-        'lock_repaint' => "get_lock_repaint"
-      }
-      unless handlers.include?(event)
-        if Sakura.method_defined?(event)
-          result = method(event).call(*arglist)
-        else
-          result = @parent.handle_request(
-            event_type, event, *arglist)
-        end
-      else
-        result = method(handlers[event]).call(*arglist)
-      end
-      return result if event_type == 'GET'
-    end
-
     def get_lock_repaint(*args)
       @lock_repaint
     end
@@ -2076,7 +2052,7 @@ module Sakura
     def __yen__b(args)
       begin
         filename, x, y = expand_meta(args[0]).split(',', 3)
-      rescue ArgumentError
+      rescue ArgumentError ## FIXME: no exception in Ruby
         filename, param = expand_meta(args[0]).split(',', 2)
         raise "assert" unless param == 'inline'
         x, y = 0, 0 ## FIXME
@@ -2380,6 +2356,7 @@ module Sakura
             'NOTIFY', 'select_ghost_by_name', self, args[2], :event => 0)
         end
       elsif args[0, 2] == ['call', 'ghost'] and argc > 2
+        ## FIXME: 'random', 'lastinstalled'対応
         key = @parent.handle_request('GET', 'find_ghost_by_name', args[2])
         unless key.nil?
           @parent.handle_request('NOTIFY', 'start_sakura_cb', key, :caller => self)
@@ -2470,7 +2447,7 @@ module Sakura
         when '!stayontop'
           @surface.window_stayontop(false)
         end
-      elsif args[0, 2] == ['set', 'trayicon'] and argc > 2
+      elsif args[0, 2] == ['set', 'trayicon'] and argc > 2 ## FIXME: tasktrayicon
         path = File.join(get_prefix(), args[2])
         if File.exist?(path)
           @status_icon.set_from_file(path) # XXX
@@ -2604,9 +2581,9 @@ module Sakura
       elsif args[0] == '*'
         @balloon.append_sstp_marker(@script_side)
       elsif args[0] == 'quicksession' and argc > 1
-        if args[1] == 'true'
+        if args[1] == 'true' ## FIXME: '1'でも可
           @quick_session = true
-        elsif args[1] == 'false'
+        elsif args[1] == 'false' ## FIXME: '0'でも可
           @quick_session = false
         else
           #pass ## FIXME

--- a/lib/ninix/script.rb
+++ b/lib/ninix/script.rb
@@ -2,7 +2,7 @@
 #
 #  script.rb - a Sakura Script parser
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/seriko.rb
+++ b/lib/ninix/seriko.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -14,17 +14,18 @@
 
 require "gtk3"
 
+require_relative "metamagic"
 require_relative "logging"
 
 module Seriko
 
-  class Controller
+  class Controller < MetaMagic::Holon
 
     DEFAULT_FPS = 30.0 # current default
 
     def initialize(seriko)
+      super("") # FIXME
       @seriko = seriko
-      @parent = nil
       @exclusive_actor = nil
       @base_id = nil
       @timeout_id = nil
@@ -38,10 +39,6 @@ module Seriko
       @dirty = true
     end
 
-    def set_responsible(parent)
-      @parent = parent
-    end
-    
     def set_base_id(window, surface_id)
       case surface_id
       when '-2'
@@ -131,12 +128,16 @@ module Seriko
     end
 
     def remove_overlay(actor)
-      @dirty = true if @overlays.delete(actor)
+      @dirty = true unless @overlays.delete(actor).nil?
     end
 
     def add_overlay(window, actor, surface_id, x, y, method)
-      terminate(window) if surface_id == '-2'
-      if ['-1', '-2'].include?(surface_id)
+      case surface_id
+      when '-2'
+        terminate(window)
+        remove_overlay(actor)
+        return
+      when '-1'
         remove_overlay(actor)
         return
       end

--- a/lib/ninix/sstp.rb
+++ b/lib/ninix/sstp.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -52,7 +52,7 @@ module SSTP
     def send_response(code, data: nil)
       begin
         @request_handler.send_response(code)
-        @request_handler.write(data) if not data.nil? # FIXME
+        @request_handler.write(data) unless data.nil? # FIXME
         @request_handler.shutdown(Socket::SHUT_WR) # XXX
       rescue
         #pass
@@ -62,7 +62,7 @@ module SSTP
 
     def send_answer(value)
       charset = @request_handler.get_charset
-      answer = [value.encode(charset, :invalid => :replace, :undef => :replace), "\r\n\r\n"].join("")
+      answer = "#{value.encode(charset, :invalid => :replace, :undef => :replace)}\r\n\r\n"
       send_response(200, :data => answer) # OK
     end
 
@@ -87,11 +87,10 @@ module SSTP
   class SSTPRequestHandler < SSTPLib::BaseSSTPRequestHandler
 
     def handle(line)
-      if not @server.handle_request('GET', 'get_sakura_cantalk')
-        @error = @version = nil
-        if not parse_request(line)
-          return
-        end
+      unless @server.handle_request('GET', 'get_sakura_cantalk')
+        @error = nil
+        @version = nil
+        return unless parse_request(line)
         send_error(512)
       else
         super(line)
@@ -120,32 +119,24 @@ module SSTP
     end
 
     def handle_send(version)
-      if not check_decoder()
-        return
-      end
+      return unless check_decoder()
       sender = get_sender()
-      if sender.nil?
-        return
-      end
-      if version == 1.3
+      return if sender.nil?
+      case version
+      when 1.3
         handle = get_handle()
-        if handle.nil?
-          return
-        end
+        return if handle.nil?
       else
         handle = nil
       end
       script_odict = get_script_odict()
-      if script_odict.nil?
-        return
-      end
-      if [1.0, 1.1].include?(version)
+      return if script_odict.nil?
+      case version
+      when 1.0, 1.1
         entry_db = nil
-      elsif [1.2, 1.3, 1.4].include?(version)
+      when 1.2, 1.3, 1.4
         entry_db = get_entry_db()
-        if entry_db.nil?
-          return
-        end
+        return if entry_db.nil?
       end
       enqueue_request(sender, nil, handle, script_odict, entry_db)
     end
@@ -161,28 +152,19 @@ module SSTP
 
     def handle_notify(version)
       script_odict = {}
-      if not check_decoder()
-        return
-      end
+      return unless check_decoder()
       sender = get_sender()
-      if sender.nil?
-        return
-      end
+      return if sender.nil?
       event = get_event()
-      if event.nil?
-        return
-      end
-      if version == 1.0
+      return if event.nil?
+      case version
+      when 1.0
         entry_db = nil
-      elsif version == 1.1
+      when 1.1
         script_odict = get_script_odict()
-        if script_odict.nil?
-          return
-        end
+        return if script_odict.nil?
         entry_db = get_entry_db()
-        if entry_db.nil?
-          return
-        end
+        return if entry_db.nil?
       end
       enqueue_request(sender, event, nil, script_odict, entry_db)
     end
@@ -214,7 +196,7 @@ module SSTP
     PROHIBITED_TAGS = ['\j', '\-', '\+', '\_+', '\!', '\8', '\_v', '\C']
 
     def check_script(script)
-      if not local_request()
+      unless local_request()
         parser = Script::Parser.new
         nodes = []
         while true
@@ -227,11 +209,11 @@ module SSTP
             break
           end
         end
-        for node in nodes
-          if node[0] == Script::SCRIPT_TAG and \
-            PROHIBITED_TAGS.include?(node[1])
+        nodes.each do |node|
+          next unless node[0] == Script::SCRIPT_TAG
+          if PROHIBITED_TAGS.include?(node[1])
             send_response(400) # Bad Request
-            log_error('Script: tag ' + node[1].to_s + ' not allowed')
+            log_error("Script: tag #{node[1]} not allowed")
             return true
           end
         end
@@ -242,25 +224,19 @@ module SSTP
     def get_script_odict
       script_odict = {} # Ordered Hash
       if_ghost = nil
-      for item in @headers
-        name, value = item
-        if name != 'Script'
-          if name == ('IfGhost')
-            if_ghost = value
-          else
-            if_ghost = nil
-          end
+      @headers.each do |name, value|
+        case name
+        when 'IfGhost'
+          if_ghost = value
+        when 'Script'
+          # nop
+        else
+          if_ghost = nil
           next
         end
         script = value.to_s
-        if check_script(script)
-          return
-        end
-        if if_ghost.nil?
-          script_odict[''] = script
-        else
-          script_odict[if_ghost] = script
-        end
+        return if check_script(script)
+        script_odict[if_ghost || ''] = script
         if_ghost = nil
       end
       return script_odict
@@ -268,50 +244,36 @@ module SSTP
 
     def get_entry_db
       entry_db = EntryDB::EntryDatabase.new
-      for item in @headers
-        key, value = item
-        if key == "Entry"
-          entry = value.split(',', 2)
-          if entry.length != 2
-            send_response(400) # Bad Request
-            return nil
-          end
-          entry_db.add(entry[0].strip(), entry[1].strip())
+      @headers.each do |key, value|
+        next unless key == "Entry"
+        entry = value.split(',', 2)
+        if entry.length != 2
+          send_response(400) # Bad Request
+          return nil
         end
+        entry_db.add(entry[0].strip(), entry[1].strip())
       end
       return entry_db
     end
 
     def get_event
-      if not @headers.assoc("Event").nil?
-        event = @headers.reverse.assoc("Event")[1]
-      else
-        event = nil
-      end
+      event = @headers.reverse.assoc("Event")&.at(1)
       if event.nil?
         send_response(400) # Bad Request
         log_error('Event: header field not found')
         return nil
       end
       buf = [event]
-      for i in 0..7
-        key = ['Reference', i.to_s].join("")
-        if not @headers.assoc(key).nil?
-          value = @headers.reverse.assoc(key)[1]
-        else
-          value = nil
-        end
+      (0..7).each do |i|
+        key = "Reference#{i}"
+        value = @headers.reverse.assoc(key)&.at(1)
         buf << value
       end
       return buf
     end
 
     def get_sender
-      if not @headers.assoc('Sender').nil?
-        sender = @headers.reverse.assoc('Sender')[1]
-      else
-        sender = nil
-      end
+      sender = @headers.reverse.assoc('Sender')&.at(1)
       if sender.nil?
         send_response(400) # Bad Request
         log_error('Sender: header field not found')
@@ -321,11 +283,7 @@ module SSTP
     end
 
     def get_handle
-      if not @headers.assoc("HWnd").nil?
-        path = @headers.assoc("HWnd")[1]
-      else
-        path = nil
-      end
+      path = @headers.assoc("HWnd")&.at(1)
       if path.nil?
         send_response(400) # Bad Request
         log_error('HWnd: header field not found')
@@ -347,40 +305,27 @@ module SSTP
     end
 
     def get_charset
-      if not @headers.assoc('Charset').nil?
-        charset = @headers.reverse.assoc('Charset')[1] # XXX
-      else
-        charset = 'Shift_JIS'
-      end
-      return charset
+      @headers.reverse.assoc('Charset')&.at(1) || 'Shift_JIS' # XXX
     end
 
     def check_decoder
-      if not @headers.assoc('Charset').nil?
-        charset = @headers.reverse.assoc('Charset')[1] # XXX
-      else
-        charset = 'Shift_JIS'
-      end
-      if not Encoding.name_list.include?(charset)
-        send_response(420, :data => 'Refuse (unsupported charset)')
-        log_error('Unsupported charset ' + charset.to_s)
-      else
-        return true
-      end
+      charset = get_charset
+      return true if Encoding.name_list.include?(charset)
+      send_response(420, :data => 'Refuse (unsupported charset)')
+      log_error("Unsupported charset #{charset}")
       return false
     end
 
     def get_options
       show_sstp_marker = use_translator = true
-      if not @headers.assoc("Option").nil?
-        options = @headers.reverse.assoc("Option")[1].split(",", 0)
-        for option in options
-          option = option.strip()
-          if option == 'nodescript' and local_request()
-            show_sstp_marker = false
-          elsif option == 'notranslate'
-            use_translator = false
-          end
+      options = (@headers.reverse.assoc("Option")&.at(1) || "").split(",", 0)
+      options.each do |option|
+        option = option.strip()
+        case option
+        when 'nodescript'
+          show_sstp_marker = false if local_request()
+        when 'notranslate'
+          use_translator = false
         end
       end
       return show_sstp_marker, use_translator
@@ -401,11 +346,10 @@ module SSTP
     end
 
     def do_EXECUTE_1_3
-      if not local_request()
+      unless local_request()
         sock_domain, remote_port, remote_hostname, remote_ip = @fp.peeraddr
         send_response(420)
-        log_error(
-          'Unauthorized EXECUTE/1.3 request from ' + remote_hostname)
+        log_error("Unauthorized EXECUTE/1.3 request from #{remote_hostname}")
         return
       end
       handle_command()
@@ -420,66 +364,62 @@ module SSTP
     end
 
     def handle_command
-      if not check_decoder()
-        return
-      end
+      return unless check_decoder()
       sender = get_sender()
-      if sender.nil?
-        return
-      end
+      return if sender.nil?
       command = get_command()
-      if not @headers.assoc('Charset').nil?
-        charset = @headers.reverse.assoc('Charset')[1] # XXX
-      else
-        charset = 'Shift_JIS'
-      end
+      charset = get_charset
       charset = charset.to_s
-      if command.nil?
+      case command
+      when nil
         return
-      elsif command == 'getname'
+      when 'getname'
         send_response(200)
         name = @server.handle_request('GET', 'get_ghost_name')
-        @fp.write([name.encode(charset, :invalid => :replace, :undef => :replace),
-                   "\r\n"].join(""))
+        @fp.write(name.encode(
+                    charset, :invalid => :replace, :undef => :replace))
         @fp.write("\r\n")
-      elsif command == 'getversion'
+        @fp.write("\r\n")
+      when 'getversion'
         send_response(200)
-        @fp.write(["ninix-aya ",
-                   Version.VERSION.encode(charset, :invalid => :replace, :undef => :replace),
-                   "\r\n"].join(""))
+        @fp.write("ninix-aya ")
+        @fp.write(Version.VERSION.encode(
+                    charset, :invalid => :replace, :undef => :replace))
+        @fp.write("\r\n")
         @fp.write("\r\n")
-      elsif command == 'quiet'
+      when 'quiet'
         send_response(200)
         @server.handle_request('NOTIFY', 'keep_silence', true)
-      elsif command == 'restore'
+      when 'restore'
         send_response(200)
         @server.handle_request('NOTIFY', 'keep_silence', false)
-      elsif command == 'getnames'
+      when 'getnames'
         send_response(200)
         for name in @server.handle_request('GET', 'get_ghost_names')
-          @fp.write(
-            [name.encode(charset, :invalid => :replace, :undef => :replace), "\r\n"].join(""))
+          @fp.write(name.encode(
+                      charset, :invalid => :replace, :undef => :replace))
+          @fp.write("\r\n")
         end
         @fp.write("\r\n")
-      elsif command == 'checkqueue'
+      when 'checkqueue'
         send_response(200)
         count, total = @server.handle_request(
                  'GET', 'check_request_queue', sender)
-        @fp.write([count.to_s.encode(charset, :invalid => :replace, :undef => :replace), "\r\n"].join(""))
-        @fp.write([total.to_s.encode(charset, :invalid => :replace, :undef => :replace), "\r\n"].join(""))
+        @fp.write(count.to_s.encode(
+                    charset, :invalid => :replace, :undef => :replace))
+        @fp.write("\r\n")
+        @fp.write(total.to_s.encode(
+                    charset, :invalid => :replace, :undef => :replace))
+        @fp.write("\r\n")
         @fp.write("\r\n")
       else
         send_response(501) # Not Implemented
-        log_error('Not Implemented (' + command + ')')
+        log_error("Not Implemented (#{command})")
       end
     end
 
     def get_command
-      if @headers.assoc('Command')
-        command = @headers.reverse.assoc('Command')[1]
-      else
-        command = nil
-      end
+      command = @headers.reverse.assoc('Command')&.at(1)
       if command.nil?
         send_response(400) # Bad Request
         log_error('Command: header field not found')
@@ -489,17 +429,11 @@ module SSTP
     end
 
     def do_COMMUNICATE_1_1
-      if not check_decoder()
-        return
-      end
+      return unless check_decoder()
       sender = get_sender()
-      if sender.nil?
-        return
-      end
+      return if sender.nil?
       sentence = get_sentence()
-      if sentence.nil?
-        return
-      end
+      return if sentence.nil?
       send_response(200) # OK
       @server.handle_request(
         'NOTIFY', 'enqueue_event', 'OnCommunicate', sender, sentence)
@@ -507,11 +441,7 @@ module SSTP
     end
 
     def get_sentence
-      if @headers.assoc("Sentence")
-        sentence = @headers.reverse.assoc("Sentence")[1]
-      else
-        sentence = nil
-      end
+      sentence = @headers.reverse.assoc("Sentence")&.at(1)
       if sentence.nil?
         send_response(400) # Bad Request
         log_error('Sentence: header field not found')

--- a/lib/ninix/sstplib.rb
+++ b/lib/ninix/sstplib.rb
@@ -3,7 +3,7 @@
 #  sstplib.rb - an SSTP library module in Ruby
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -40,71 +40,41 @@ module SSTPLib
     end
 
     def parse_headers()
-      if @fp.nil?
-        return
-      end
-      headers = []
-      while true
-        line = @fp.readline()
-        if line.strip.empty?
-          break
-        end
-        if line.end_with?("\r\n")
-          line = line[0..-3]
-        elsif line.end_with?("\n")
-          line = line[0..-2]
-        end       
-        headers << line
-      end
+      return if @fp.nil?
       message = []
-      for h in headers
-        if h.include?(":")
-          key, value = h.split(":", 2)
-          message << [key, value.strip]
-        end
-      end
-      if not message.assoc("Charset").nil?
-        charset = message.reverse.assoc("Charset")[1] # XXX
-      else
-        charset = "Shift_JIS"
+      while line = @fp.gets
+        break if line.strip.empty?
+        line = line.chomp
+        next unless line.include?(":")
+        key, value = line.split(":", 2)
+        message << [key, value.strip]
       end
-      new_list = []
-      for item in message
-        key, value = item
-        new_list << [key, value.force_encoding(charset).encode("UTF-8", :invalid => :replace, :undef => :replace)]
-      end
-      message = new_list
-      return message
+      charset = message.reverse.assoc("Charset")&.at(1) || "Shift_JIS" # XXX
+      message.each {|k, v| v.force_encoding(charset).encode!("UTF-8", :invalid => :replace, :undef => :replace) }
     end
 
     def parse_request(requestline)
       requestline = requestline.encode('Shift_JIS', :invalid => :replace, :undef => :replace)
-      if requestline.end_with?("\r\n")
-        requestline = requestline[0..-3]
-      elsif requestline.end_with?("\n")
-        requestline = requestline[0..-2]
-      end
+      requestline = requestline.chomp
       @requestline = requestline
       re_requestsyntax = Regexp.new('\A([A-Z]+) SSTP/([0-9]\\.[0-9])\z')
       match = re_requestsyntax.match(requestline)
       if match.nil?
         @equestline = '-'
-        send_error(400, :message => 'Bad Request ' + requestline.to_s)
+        send_error(400, :message => "Bad Request #{requestline}")
         return false
       end
       @command, @version = match[1, 2]
-      @headers = parse_headers()
+      @headers = parse_headers
       return true
     end
 
     def handle(line)
       @error = @version = nil
-      if not parse_request(line)
-        return
-      end
+      return unless parse_request(line)
       name = ("do_#{@command}_#{@version[0]}_#{@version[2]}")
       begin
-        method(name).call()
+        method(name).call
       rescue
         send_error(
           501,
@@ -121,20 +91,20 @@ module SSTPLib
 
     def send_response(code, message: nil)
       log_request(code, :message => message)
-      @fp.write("SSTP/" + (@version or "1.0") + " " + code.to_i.to_s + " " + RESPONSES[code] + "\r\n\r\n")
+      @fp.write("SSTP/#{(@version or "1.0")} #{code} #{RESPONSES[code]}\r\n\r\n")
     end
 
     def log_error(message)
-      Logging::Logging.error('[' + timestamp + '] ' + message + '\n')
+      Logging::Logging.error("[#{timestamp}] #{message}\n")
     end
 
     def log_request(code, message: nil)
       if @requestline == '-'
         request = @requestline
       else
-        request = ['"', @requestline, '"'].join("")
+        request = "\"#{@requestline}\""
       end
-      Logging::Logging.info(client_hostname + ' [' + timestamp + '] ' + request + ' ' + code.to_s + ' ' + (message or RESPONSES[code]) + "\n")
+      Logging::Logging.info("#{client_hostname} [#{timestamp}] #{request} #{code} #{(message or RESPONSES[code])}\n")
     end
 
     def client_hostname
@@ -147,12 +117,7 @@ module SSTPLib
     end
 
     def timestamp
-      month_names = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-                     'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-      t = Time.now.localtime
-      m = month_names[t.month - 1]
-      return sprintf('%02d/%s/%d:%02d:%02d:%02d %+05d',
-                     t.day, m, t.year, t.hour, t.min, t.sec, t.utc_offset / 36)
+      Time.now.localtime.strftime("%d/%b/%Y:%H:%M:%S %z")
     end
   end
 end

--- a/lib/ninix/surface.rb
+++ b/lib/ninix/surface.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -18,40 +18,24 @@ require "gtk3"
 require_relative "keymap"
 require_relative "pix"
 require_relative "seriko"
+require_relative "metamagic"
 require_relative "logging"
 
 module Surface
 
-  class Surface
+  class Surface < MetaMagic::Holon
     attr_reader :name, :prefix, :window
 
     def initialize
+      super("") # FIXME
       @window = []
       @desc = nil
       @mikire = 0
       @kasanari = 0
       @key_press_count = 0
-    end
-
-    def set_responsible(parent)
-      @parent = parent
-    end
-
-    def handle_request(event_type, event, *arglist)
-      fail "assert" unless ['GET', 'NOTIFY'].include?(event_type)
-      handlers = {
+      @handlers = {
         'stick_window' => 'window_stick',
       }
-      if handlers.include?(event)
-        result = handlers[event].call # no argument
-      else
-        if Surface.method_defined?(event)
-          result = method(event).call(*arglist)
-        else
-          result = @parent.handle_request(event_type, event, *arglist)
-        end
-      end
-      return result if event_type == 'GET'
     end
 
     def finalize
@@ -516,9 +500,7 @@ module Surface
     end
 
     def reset_surface
-      for window in @window
-        window.reset_surface()
-      end
+      @window.map {|window| window.reset_surface }
     end
 
     def set_surface_default(side)
@@ -892,15 +874,16 @@ module Surface
     end
   end
 
-  class SurfaceWindow
+  class SurfaceWindow < MetaMagic::Holon
     attr_reader :bind
 
     def initialize(window, side, desc, surface_alias, surface_info, tooltips,
                    surfaces, seriko, region, mayuna, bind, default_id, maxsize)
+      super("") # FIXME
+      @handlers = {}
       @window = window
       @maxsize = maxsize
       @side = side
-      @parent = nil
       @desc = desc
       @alias = surface_alias
       @tooltips = tooltips
@@ -997,27 +980,6 @@ module Surface
         Gdk.Visual.get_best_depth(), scrn_w, scrn_h)
     end
 
-    def set_responsible(parent)
-      @parent = parent
-    end
-
-    def handle_request(event_type, event, *arglist)
-      fail "assert" unless ['GET', 'NOTIFY'].include?(event_type)
-      handlers = {
-            }
-      if handlers.include?(event)
-        result = handlers[event].call # no argument
-      else
-        if SurfaceWindow.method_defined?(event)
-          result = method(event).call(*arglist)
-        else
-          result = @parent.handle_request(event_type, event, *arglist)
-        end
-      end
-      return result if event_type == 'GET'
-    end
-
-    @property
     def direction
       @__direction
     end

--- a/lib/ninix/update.rb
+++ b/lib/ninix/update.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/version.rb
+++ b/lib/ninix/version.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2005-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2005-2017 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -38,7 +38,7 @@ module Version
       .concat('\_q')
       .concat('Copyright (c) 2001, 2002 Tamito KAJIYAMA\n')
       .concat('Copyright (c) 2002-2006 MATSUMURA Namihiko\n')
-      .concat('Copyright (c) 2002-2016 Shyouzou Sugitani\n')
+      .concat('Copyright (c) 2002-2017 Shyouzou Sugitani\n')
       .concat('Copyright (c) 2002, 2003 ABE Hideaki\n')
       .concat('Copyright (c) 2003-2005 Shun-ichi TAHARA\e')
   end

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2016 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003-2005 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ module Ninix_Main
   bindtextdomain("ninix-aya")
 
   def self.handleException(exception)
-    message = ("Uncaught exception (" + exception.class.to_s + ")\n" + exception.backtrace.join("\n"))
+    message = ("Uncaught exception (#{exception.class})\n" + exception.backtrace.join("\n"))
     Logging::Logging.error(message)
     response_id = 1
     dialog = Gtk::MessageDialog.new(
@@ -260,11 +260,9 @@ module Ninix_Main
           buffer = socket.gets
           handler.handle(buffer)
         rescue SocketError => e
-          Logging::Logging.error(
-            'socket.error: ' + e.message)
+          Logging::Logging.error("socket.error: #{e.message}")
         rescue SystemCallError => e
-          Logging::Logging.error(
-            'socket.error: ' + e.message + ' (' + e.errno.to_s + ')')
+          Logging::Logging.error("socket.error: #{e.message} (#{e.errno})")
         rescue # may happen when ninix is terminated
           return
         end
@@ -287,13 +285,12 @@ module Ninix_Main
         begin
           server = SSTP::SSTPServer.new(port)
         rescue SystemCallError => e
-          Logging::Logging.warning(
-            'Port ' + port.to_s + ': ' + e.message + ' (ignored)')
+          Logging::Logging.warning("Port #{port}: #{e.message} (ignored)")
           next
         end
         server.set_responsible(self)
         @sstp_servers << server
-        Logging::Logging.info('Serving SSTP on port ' + port.to_s)
+        Logging::Logging.info("Serving SSTP on port #{port}")
       end
     end
   end
@@ -844,9 +841,9 @@ module Ninix_Main
       end
       # load ghost
       @current_sakura = default_sakura
-      ##for i, name in enumerate(self.get_ghost_names()):
-      ##    Logging::Logging.info(
-      ##        'GHOST(' + i.to_s +'): ' + name)
+      ##for i, name in enumerate(get_ghost_names())
+      ##    Logging::Logging.info("GHOST(#{i}): #{name}")
+      ##end
       start_sakura(@current_sakura, :init => true, :abend => @abend)
     end