Commit: 2e0724aabae74c1570e6013373b2b99e8250060a - ruby-gtk3 (git)

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

Commit MetaInfo

• Revision: 2e0724aabae74c1570e6013373b2b99e8250060a (tree)
• Time: 2016-12-11 14:43:42
• Author: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

coding style cleanup

Change Summary

• modified: lib/ninix/alias.rb
• modified: lib/ninix/communicate.rb
• modified: lib/ninix/config.rb
• modified: lib/ninix/dll/textcopy.rb
• modified: lib/ninix/dll/yaya.rb

Incremental Difference

--- a/lib/ninix/alias.rb
+++ b/lib/ninix/alias.rb
@@ -18,16 +18,18 @@ module Alias
 
   def self.fatal(error)
     Logging::Logging.error('alias.rb: ' + error.to_s)
-    NConfig.null_config()
+    NConfig.null_config
   end
 
   def self.create_from_file(path)
-    f = File.open(path, 'rb')
     buf = []
-    while line = f.gets
-      buf << line.strip unless line.strip.empty?
-    end
-    return create_from_buffer(buf)
+    File::open(path, 'rb') {|f|
+      while line = f.gets
+        line = line.strip
+        buf << line unless line.empty?
+      end
+    }
+    create_from_buffer(buf)
   end
 
   def self.create_from_buffer(buf)
@@ -39,7 +41,7 @@ module Alias
       i += 1
       next if line.length.zero?
       match = re_alias.match(line)
-      if not match.nil?
+      unless match.nil?
         name = line
         table = {}
         begin
@@ -110,6 +112,6 @@ module Alias
         dic[key] = value
       end
     end
-    return dic
+    dic
   end
 end

--- a/lib/ninix/communicate.rb
+++ b/lib/ninix/communicate.rb
@@ -32,7 +32,7 @@ module Communicate
     end
 
     def notify_all(event, references)
-      for sakura in @ghosts.keys()
+      @ghosts.each_key do |sakura|
         sakura.enqueue_event(event, *references)
       end
     end
@@ -52,9 +52,7 @@ module Communicate
                      event, name, selfname, shell_name,
                      flag_break, communicate,
                      sstp, notranslate, script, references)
-      if script.empty? and not ON_OTHER_EVENT.include?(event)
-        return
-      end
+      return if script.empty? and not ON_OTHER_EVENT.include?(event)
       on_other_event = nil
       if ON_OTHER_EVENT.include?(event)
         if flag_break and ['OnClose', 'OnVanishSelected'].include?(event)

--- a/lib/ninix/config.rb
+++ b/lib/ninix/config.rb
@@ -25,26 +25,21 @@ module NConfig
   end
 
   def self.create_from_file(path)
-    charset = 'CP932' # default
-    f = File.open(path, 'rb')
-    if f.read(3).bytes == [239, 187, 191] # "\xEF\xBB\xBF"
-      f.close
-      f = File.open(path, 'rb:BOM|UTF-8')
-      charset = 'UTF-8'
-    else
-      f.seek(0) # rewind
-    end
+    has_bom = File.open(path) {|f| f.read(3) } == "\xEF\xBB\xBF"
+    charset = has_bom ? 'UTF-8' : 'CP932'
     buf = []
-    while line = f.gets
-      buf << line.strip unless line.strip.empty?
-    end
-    f.close
+    File.open(path, has_bom ? 'rb:BOM|UTF-8' : 'rb') {|f|
+      while line = f.gets
+        line = line.strip
+        buf << line unless line.empty?
+      end
+    }
     return create_from_buffer(buf, :charset => charset)
   end
 
   def self.create_from_buffer(buf, charset: 'CP932')
     dic = Config.new
-    for line in buf
+    buf.each do |line|
       line = line.force_encoding(charset).encode(
         "UTF-8", :invalid => :replace, :undef => :replace)
       key, value = line.split(",", 2)
@@ -68,6 +63,6 @@ module NConfig
   end
 
   def self.null_config()
-    NConfig::Config.new()
+    NConfig::Config.new
   end
 end

--- a/lib/ninix/dll/textcopy.rb
+++ b/lib/ninix/dll/textcopy.rb
@@ -22,18 +22,18 @@ module Textcopy
   class Saori < DLL::SAORI
 
     def initialize
-      super()
+      super
       @clipboard = nil
     end
 
     def setup
       @clipboard = Gtk::Clipboard.get('PRIMARY')
-      return 1
+      1
     end
 
     def finalize
       @clipboard = nil
-      return 1
+      1
     end
 
     def execute(argument)

--- a/lib/ninix/dll/yaya.rb
+++ b/lib/ninix/dll/yaya.rb
@@ -51,7 +51,7 @@ module Yaya
           result = 105
         end
       end
-      return result
+      result
     end
 
     def show_description
@@ -76,8 +76,7 @@ module Yaya
       )
       path[0, @dir.bytesize] = @dir
       @id = $_yaya.multi_load(path, @dir.bytesize)
-      ret = 1
-      return ret
+      1
     end
 
     def unload
@@ -95,7 +94,7 @@ module Yaya
       rlen =[req_string.bytesize].pack("l!")
       ret = $_yaya.multi_request(@id, request, rlen)
       rlen, = rlen.unpack("l!")
-      return ret[0, rlen].to_s
+      ret[0, rlen].to_s
     end
   end
 end