jkf 0.5.0 → 0.5.2

data/lib/jkf/converter/ki2.rb

@@ -1,113 +1,115 @@
-module Jkf::Converter
-  # KI2 Converter
-  class Ki2 < Base
-    include Kifuable
+module Jkf
+  module Converter
+    # KI2 Converter
+    class Ki2 < Base
+      include Kifuable
 
-    protected
+      protected
 
-    def convert_root(jkf)
-      reset!
-      setup_players!(jkf)
+      def convert_root(jkf)
+        reset!
+        setup_players!(jkf)
 
-      result = ""
-      result += convert_header(jkf["header"]) if jkf["header"]
-      result += convert_initial(jkf["initial"]) if jkf["initial"]
-      result += @header2.join + "\n"
-      result += convert_moves(jkf["moves"]) if jkf["moves"]
-      if !@forks.empty?
-        result += "\n"
-        result += @forks.join("\n")
-      end
+        result = ''
+        result += convert_header(jkf['header']) if jkf['header']
+        result += convert_initial(jkf['initial']) if jkf['initial']
+        result += @header2.join + "\n"
+        result += convert_moves(jkf['moves']) if jkf['moves']
+        unless @forks.empty?
+          result += "\n"
+          result += @forks.join("\n")
+        end
 
-      result
-    end
+        result
+      end
 
-    def convert_header(header)
-      header.map do |(key, value)|
-        result = add_header(key, value)
-        if key =~ /\A[先後上下]手\Z/
-          nil
-        else
-          result
-        end
-      end.compact.join
-    end
+      def convert_header(header)
+        header.filter_map do |(key, value)|
+          result = add_header(key, value)
+          if /\A[先後上下]手\Z/.match?(key)
+            nil
+          else
+            result
+          end
+        end.join
+      end
 
-    def add_header(key, value)
-      result = "#{key}：#{value}\n"
-      if key =~ /\A[先後上下]手\Z/
-        if key =~ /[先下]/
-          @header2.unshift result
-        else
-          @header2 << result
+      def add_header(key, value)
+        result = "#{key}：#{value}\n"
+        if /\A[先後上下]手\Z/.match?(key)
+          if /[先下]/.match?(key)
+            @header2.unshift result
+          else
+            @header2 << result
+          end
         end
+        result
       end
-      result
-    end
 
-    def convert_moves(moves, idx = 0)
-      result = ""
-      j = 0
-      before_split = ""
-      moves.each_with_index do |move, i|
-        if move["special"]
-          # first_board+speical分を引く(-2)
-          result += convert_special_and_split(move, i + idx - 2)
-        else
-          result += before_split
-          if move["move"]
-            j += 1
-            result_move, before_split = convert_move_and_split(move, j)
-            result += result_move
-          end
+      def convert_moves(moves, idx = 0)
+        result = ''
+        j = 0
+        before_split = ''
+        moves.each_with_index do |move, i|
+          if move['special']
+            # first_board+speical分を引く(-2)
+            result += convert_special_and_split(move, i + idx - 2)
+          else
+            result += before_split
+            if move['move']
+              j += 1
+              result_move, before_split = convert_move_and_split(move, j)
+              result += result_move
+            end
 
-          if move["comments"]
-            if !(result.end_with?("\n") || result.empty?)
-              result += "\n"
-              before_split = ""
-              j = 0
+            if move['comments']
+              unless result.end_with?("\n") || result.empty?
+                result += "\n"
+                before_split = ''
+                j = 0
+              end
+              result += convert_comments(move['comments'])
             end
-            result += convert_comments(move["comments"])
-          end
 
-          @forks.unshift convert_forks(move["forks"], i + idx) if move["forks"]
+            @forks.unshift convert_forks(move['forks'], i + idx) if move['forks']
+          end
         end
+        result
       end
-      result
-    end
 
-    def convert_special_and_split(hash, index)
-      "\n" + convert_special(hash["special"], index)
-    end
+      def convert_special_and_split(hash, index)
+        "\n" + convert_special(hash['special'], index)
+      end
 
-    def convert_move_and_split(move, num)
-      result = convert_move(move["move"])
-      split = if num % 6 == 0
-                "\n"
-              else
-                result.size == 4 ? " " * 4 : " " * 2
-              end
-      [result, split]
-    end
+      def convert_move_and_split(move, num)
+        result = convert_move(move['move'])
+        split = if num % 6 == 0
+                  "\n"
+                else
+                  result.size == 4 ? ' ' * 4 : ' ' * 2
+                end
+        [result, split]
+      end
 
-    def convert_move(move)
-      result = move["color"] == 0 ? "▲" : "△"
-      result += convert_piece_with_pos(move)
-      result += csa2relative(move["relative"]) if move["relative"]
-      result
-    end
+      def convert_move(move)
+        result = move['color'] == 0 ? '▲' : '△'
+        result += convert_piece_with_pos(move)
+        result += csa2relative(move['relative']) if move['relative']
+        result
+      end
 
-    def csa2relative(relative)
-      case relative
-      when "L" then "左"
-      when "C" then "直"
-      when "R" then "右"
-      when "U" then "上"
-      when "M" then "寄"
-      when "D" then "引"
-      when "H" then "打"
-      else
-        ""
+      def csa2relative(relative)
+        case relative
+        when 'L' then '左'
+        when 'C' then '直'
+        when 'R' then '右'
+        when 'U' then '上'
+        when 'M' then '寄'
+        when 'D' then '引'
+        when 'H' then '打'
+        else
+          ''
+        end
       end
     end
   end

data/lib/jkf/converter/kif.rb

@@ -1,120 +1,126 @@
-module Jkf::Converter
-  # KIF Converter
-  class Kif < Base
-    protected
+module Jkf
+  module Converter
+    # KIF Converter
+    class Kif < Base
+      protected
 
-    include Kifuable
+      include Kifuable
 
-    def convert_root(jkf)
-      reset!
-      setup_players!(jkf)
+      def convert_root(jkf)
+        reset!
+        setup_players!(jkf)
 
-      result = ""
-      result += convert_header(jkf["header"], jkf) if jkf["header"]
-      result += convert_initial(jkf["initial"]) if jkf["initial"]
-      result += @header2.join
-      result += "手数----指手---------消費時間--\n"
-      result += convert_moves(jkf["moves"])
-      if !@forks.empty?
-        result += "\n"
-        result += @forks.join("\n")
-      end
+        result = ''
+        result += convert_header(jkf['header'], jkf) if jkf['header']
+        result += convert_initial(jkf['initial']) if jkf['initial']
+        result += @header2.join
+        result += "手数----指手---------消費時間--\n"
+        result += convert_moves(jkf['moves'])
+        unless @forks.empty?
+          result += "\n"
+          result += @forks.join("\n")
+        end
 
-      result
-    end
+        result
+      end
 
-    def convert_header(header, jkf)
-      header.map do |(key, value)|
-        result = "#{key}：#{value}\n"
-        if key =~ /\A[先後上下]手\Z/
-          if key =~ /[先下]/
-            @header2.unshift result
+      def convert_header(header, jkf)
+        header.filter_map do |(key, value)|
+          result = "#{key}：#{value}\n"
+          if /\A[先後上下]手\Z/.match?(key)
+            if /[先下]/.match?(key)
+              @header2.unshift result
+            else
+              @header2 << result
+            end
+            nil
+          elsif key == '手合割' && jkf['initial'] && jkf['initial']['preset'] && value == preset2str(jkf['initial']['preset'])
+            nil
           else
-            @header2 << result
+            result
           end
-          nil
-        elsif key == "手合割" && jkf["initial"] && jkf["initial"]["preset"] && value == preset2str(jkf["initial"]["preset"])
-          nil
-        else
-          result
-        end
-      end.compact.join
-    end
+        end.join
+      end
 
-    def convert_moves(moves, idx = 0)
-      result = ""
-      moves.each_with_index do |move, i|
-        if move["special"]
-          result += convert_special_line(move, i + idx)
-        else
-          result += convert_move_line(move, i + idx) if move["move"]
-          result += convert_comments(move["comments"]) if move["comments"]
-          @forks.unshift convert_forks(move["forks"], i + idx) if move["forks"]
+      def convert_moves(moves, idx = 0)
+        result = ''
+        moves.each_with_index do |move, i|
+          if move['special']
+            result += convert_special_line(move, i + idx)
+          else
+            result += convert_move_line(move, i + idx) if move['move']
+            result += convert_comments(move['comments']) if move['comments']
+            @forks.unshift convert_forks(move['forks'], i + idx) if move['forks']
+          end
         end
+        result
       end
-      result
-    end
 
-    def convert_move_line(move, index)
-      result = "%4d " % [index]
-      result += convert_move(move["move"])
-      result += convert_time(move["time"]) if move["time"]
-      result += "+" if move["forks"]
-      result + "\n"
-    end
+      def convert_move_line(move, index)
+        result = '%4d ' % [index]
+        result += convert_move(move['move'])
+        result += convert_time(move['time']) if move['time']
+        result += '+' if move['forks']
+        result + "\n"
+      end
 
-    def convert_special_line(move, index)
-      result = "%4d " % [index]
-      result += ljust(special2kan(move["special"]), 13)
-      result += convert_time(move["time"]) if move["time"]
-      result += "+" if move["forks"]
-      result += "\n"
-      # first_board+speical分を引く(-2)
-      result + convert_special(move["special"], index - 2)
-    end
+      def convert_special_line(move, index)
+        result = '%4d ' % [index]
+        result += ljust(special2kan(move['special']), 13)
+        result += convert_time(move['time']) if move['time']
+        result += '+' if move['forks']
+        result += "\n"
+        # first_board+speical分を引く(-2)
+        result + convert_special(move['special'], index - 2)
+      end
 
-    def convert_move(move)
-      result = convert_piece_with_pos(move)
-      result += if move["from"]
-                  "(#{pos2str(move['from'])})"
-                else
-                  "打"
-                end
-      ljust(result, 13)
-    end
+      def convert_move(move)
+        result = convert_piece_with_pos(move)
+        result += if move['from']
+                    "(#{pos2str(move['from'])})"
+                  else
+                    '打'
+                  end
+        ljust(result, 13)
+      end
 
-    def convert_time(time)
-      "(%2d:%02d/%02d:%02d:%02d)" % [
-        time["now"]["m"],
-        time["now"]["s"],
-        time["total"]["h"],
-        time["total"]["m"],
-        time["total"]["s"]
-      ]
-    end
+      def convert_time(time)
+        '(%2d:%02d/%02d:%02d:%02d)' % [
+          time['now']['m'],
+          time['now']['s'],
+          time['total']['h'],
+          time['total']['m'],
+          time['total']['s']
+        ]
+      end
 
-    def special2kan(special)
-      case special
-      when "CHUDAN" then "中断"
-      when "TORYO" then "投了"
-      when "JISHOGI" then "持将棋"
-      when "SENNICHITE" then "千日手"
-      when "TSUMI" then "詰み"
-      when "FUZUMI" then "不詰"
-      when "TIME_UP" then "切れ負け"
-      when "ILLEGAL_ACTION" then "反則勝ち"
-      when "ILLEGAL_MOVE" then "反則負け"
+      def special2kan(special)
+        SPECIAL_NAME_TO_KIF_MAPPING[special]
       end
-    end
 
-    def ljust(str, n)
-      len = 0
-      str.each_codepoint { |codepoint| len += codepoint > 255 ? 2 : 1 }
-      str + (" " * (n - len))
-    end
+      SPECIAL_NAME_TO_KIF_MAPPING = {
+        'CHUDAN' => '中断',
+        'TORYO' => '投了',
+        'JISHOGI' => '持将棋',
+        'SENNICHITE' => '千日手',
+        'TSUMI' => '詰み',
+        'FUZUMI' => '不詰',
+        'TIME_UP' => '切れ負け',
+        'ILLEGAL_ACTION' => '反則勝ち',
+        'ILLEGAL_MOVE' => '反則負け'
+      }.freeze
+
+      private_constant :SPECIAL_NAME_TO_KIF_MAPPING
 
-    def pos2str(pos)
-      "%d%d" % [pos["x"], pos["y"]]
+      def ljust(str, n)
+        len = 0
+        str.each_codepoint { |codepoint| len += codepoint > 255 ? 2 : 1 }
+        str + (' ' * (n - len))
+      end
+
+      def pos2str(pos)
+        '%d%d' % [pos['x'], pos['y']]
+      end
     end
   end
 end