提交: 5c96eaff0a7378d578cd515ec6c1336eaedf7ce6 - ruby-gtk3 (git)

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

Commit MetaInfo

• 修訂: 5c96eaff0a7378d578cd515ec6c1336eaedf7ce6 (tree)
• 時間: 2016-12-11 15:08:05
• 作者: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

coding style cleanup and misc fixes

Change Summary

• modified: ChangeLog
• modified: lib/ninix/home.rb
• modified: lib/ninix/makoto.rb
• modified: test/test-makoto.rb

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun December 11 2016   Shyouzou Sugitani <[e-mail]>
+	* Rubyらしいコーディングスタイルへの修正.
+	* Makotoクラスのテストをtest-makoto.rbに移動.
+
 Thu October 20 2016   Shyouzou Sugitani <[e-mail]>
 	* deprecatedになっているGtkのWidgetを使用しないようにした.
 	  (Gtk::ActionGroupとGtk::UIManagerの2つ.)

--- a/lib/ninix/home.rb
+++ b/lib/ninix/home.rb
@@ -25,15 +25,15 @@ module Home
   end
 
   def self.get_archive_dir()
-    File.join(get_ninix_home(), 'archive')
+    File.join(get_ninix_home, 'archive')
   end
 
   def self.get_pango_fontrc()
-    File.join(get_ninix_home(), 'pango_fontrc')
+    File.join(get_ninix_home, 'pango_fontrc')
   end
 
   def self.get_preferences()
-    File.join(get_ninix_home(), 'preferences')
+    File.join(get_ninix_home, 'preferences')
   end
 
   def self.get_normalized_path(path)
@@ -46,18 +46,18 @@ module Home
 
   def self.load_config()
     return nil unless File.exists?(get_ninix_home())
-    ghosts = search_ghosts()
-    balloons = search_balloons()
-    nekoninni = search_nekoninni()
-    katochan = search_katochan()
-    kinoko = search_kinoko()
+    ghosts = search_ghosts
+    balloons = search_balloons
+    nekoninni = search_nekoninni
+    katochan = search_katochan
+    kinoko = search_kinoko
     return ghosts, balloons, nekoninni, katochan, kinoko
   end
 
   def self.get_shiori()
     table = {}
     shiori_lib = DLL::Library.new('shiori', :saori_lib => nil)
-    path = DLL.get_path()
+    path = DLL.get_path
     Dir.foreach(path, :encoding => 'UTF-8') do |filename|
       next if filename == '..' or filename == '.'
       if File.readable_real?(File.join(path, filename))
@@ -68,9 +68,7 @@ module Home
         name = basename if ['.rb'].include?(ext)
         unless name.nil? or table.include?(name)
           shiori = shiori_lib.request(['', name])
-          unless shiori.nil?
-            table[name] = shiori
-          end
+          table[name] = shiori unless shiori.nil?
         end
       end
     end

--- a/lib/ninix/makoto.rb
+++ b/lib/ninix/makoto.rb
@@ -21,7 +21,7 @@ module Makoto
       i, text = expand(s, i)
       buf << text
     end
-    return buf.join
+    buf.join
   end
 
   def self.expand(s, start)
@@ -67,55 +67,17 @@ module Makoto
         i += 1
       end
     end
-    if validity == 2
+    case validity
+    when 2
       expanded = segments[1..segments.length-1].sample
       unless repeat_count.nil?
         expanded = (expanded * rand(repeat_count))
       end
       return i, segments[0] + expanded
-    elsif validity.zero?
+    when 0
       return j, buf.join
     else
       return j, s[start..s.length-1]
     end
   end
-
-  def self.test(verbose: 0)
-    for test, expected in [['a(1)b', ['a1b']],
-                           ['a(1|2)b', ['a1b', 'a2b']],
-                           ['a(1)2b', ['ab', 'a1b', 'a11b']],
-                           ['a(1|2)1b', ['ab', 'a1b', 'a2b']],
-                           ['(1|2)(a|b)', ['1a', '1b', '2a', '2b']],
-                           ['((1|2)|(a|b))', ['1', '2', 'a', 'b']],
-                           ['()', ['']],
-                           ['()2', ['']],
-                           ['a()b', ['ab']],
-                           ['a()2b', ['ab']],
-                           ['a\(1\|2\)b', ['a(1|2)b']],
-                           ['\((1|2)\)', ['(1)', '(2)']],
-                           ['\(1)', ['(1)']],
-                           ['a|b', ['a|b']],
-                           # errornous cases
-                           ['(1', ['(1']],
-                           ['(1\)', ['(1\)']],
-                           ['(1|2', ['(1|2']],
-                           ['(1|2\)', ['(1|2\)']],
-                           ['(1|2)(a|b', ['1(a|b', '2(a|b']],
-                           ['((1|2)|(a|b)', ['((1|2)|(a|b)']],
-                           ]
-      result = execute(test)
-      print("'", test.to_s, "'", ' => ', "'", result.to_s, "'", ' ... ',) unless verbose.zero?
-      begin
-        if expected.nil?
-          fail "assert" unless result == test
-        else
-          fail "assert" unless expected.include?(result)
-        end
-        print("OK\n") unless verbose.zero?
-      rescue #AssertionError
-        print("NG\n") unless verbose.zero?
-        raise
-      end
-    end
-  end
 end

--- a/test/test-makoto.rb
+++ b/test/test-makoto.rb
@@ -7,9 +7,48 @@ module NinixTest
     def initialize
       print("testing...\n")
       for i in 0...1000
-        Makoto.test()
+        do_test()
+      end
+      do_test(:verbose => 1)
+    end
+
+    def do_test(verbose: 0)
+      for test, expected in [['a(1)b', ['a1b']],
+                             ['a(1|2)b', ['a1b', 'a2b']],
+                             ['a(1)2b', ['ab', 'a1b', 'a11b']],
+                             ['a(1|2)1b', ['ab', 'a1b', 'a2b']],
+                             ['(1|2)(a|b)', ['1a', '1b', '2a', '2b']],
+                             ['((1|2)|(a|b))', ['1', '2', 'a', 'b']],
+                             ['()', ['']],
+                             ['()2', ['']],
+                             ['a()b', ['ab']],
+                             ['a()2b', ['ab']],
+                             ['a\(1\|2\)b', ['a(1|2)b']],
+                             ['\((1|2)\)', ['(1)', '(2)']],
+                             ['\(1)', ['(1)']],
+                             ['a|b', ['a|b']],
+                             # errornous cases
+                             ['(1', ['(1']],
+                             ['(1\)', ['(1\)']],
+                             ['(1|2', ['(1|2']],
+                             ['(1|2\)', ['(1|2\)']],
+                             ['(1|2)(a|b', ['1(a|b', '2(a|b']],
+                             ['((1|2)|(a|b)', ['((1|2)|(a|b)']],
+                            ]
+        result = Makoto.execute(test)
+        print("'", test.to_s, "'", ' => ', "'", result.to_s, "'", ' ... ',) unless verbose.zero?
+        begin
+          if expected.nil?
+            fail "assert" unless result == test
+          else
+            fail "assert" unless expected.include?(result)
+          end
+          print("OK\n") unless verbose.zero?
+        rescue #AssertionError
+          print("NG\n") unless verbose.zero?
+          raise
+        end
       end
-      Makoto.test(:verbose => 1)
     end
   end
 end