jkf 0.5.0 → 0.5.1

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.map do |(key, value)|
+          result = "#{key}：#{value}\n"
+          if key =~ /\A[先後上下]手\Z/
+            if 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.compact.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

data/lib/jkf/converter/kifuable.rb

@@ -1,188 +1,188 @@
-module Jkf::Converter
-  # Intersection of KIF and KI2
-  module Kifuable
-    protected
-
-    def convert_initial(initial)
-      result = convert_handicap(initial["preset"])
-      footer = ""
-
-      data = initial["data"]
-      if data
-        result += convert_teban(data, 1)
-        if hands = data["hands"]
-          result += convert_hands(hands, 1) if hands[1]
-          footer += convert_hands(hands, 0) if hands[0]
-        end
-        footer += convert_teban(data, 0)
+module Jkf
+  module Converter
+    # Intersection of KIF and KI2
+    module Kifuable
+      protected
+
+      def convert_initial(initial)
+        result = convert_handicap(initial['preset'])
+        footer = ''
+
+        data = initial['data']
+        if data
+          result += convert_teban(data, 1)
+          if (hands = data['hands'])
+            result += convert_hands(hands, 1) if hands[1]
+            footer += convert_hands(hands, 0) if hands[0]
+          end
+          footer += convert_teban(data, 0)
 
-        result += convert_board(data["board"]) if data["board"]
+          result += convert_board(data['board']) if data['board']
+        end
+        result + footer
       end
-      result + footer
-    end
 
-    def convert_handicap(preset)
-      preset == "OTHER" ? "" : "手合割：#{preset2str(preset)}\n"
-    end
+      def convert_handicap(preset)
+        preset == 'OTHER' ? '' : "手合割：#{preset2str(preset)}\n"
+      end
 
-    def convert_teban(data, color)
-      data["color"] == color ? "#{@players[color]}手番\n" : ""
-    end
+      def convert_teban(data, color)
+        data['color'] == color ? "#{@players[color]}手番\n" : ''
+      end
 
-    def convert_hands(hands, color)
-      "#{@players[color]}手の持駒：" + convert_motigoma(hands[color])
-    end
+      def convert_hands(hands, color)
+        "#{@players[color]}手の持駒：" + convert_motigoma(hands[color])
+      end
 
-    def convert_board(board)
-      result = "  ９ ８ ７ ６ ５ ４ ３ ２ １\n+---------------------------+\n"
-      9.times do |y|
-        line = "|"
-        9.times do |x|
-          line += convert_board_piece(board[8 - x][y])
+      def convert_board(board)
+        result = "  ９ ８ ７ ６ ５ ４ ３ ２ １\n+---------------------------+\n"
+        9.times do |y|
+          line = '|'
+          9.times do |x|
+            line += convert_board_piece(board[8 - x][y])
+          end
+          line += "|#{n2kan(y + 1)}\n"
+          result += line
         end
-        line += "|#{n2kan(y + 1)}\n"
-        result += line
+        result + "+---------------------------+\n"
       end
-      result + "+---------------------------+\n"
-    end
 
-    def convert_comments(comments)
-      comments.map { |comment| "*#{comment}\n" }.join
-    end
+      def convert_comments(comments)
+        comments.map { |comment| "*#{comment}\n" }.join
+      end
 
-    def convert_motigoma(pieces)
-      pieces.to_a.reverse.map do |(piece, num)|
-        if num > 0
-          str = csa2kind(piece)
-          if num > 1
-            str += n2kan(num / 10) if num / 10 > 0
-            num %= 10
-            str += n2kan(num)
+      def convert_motigoma(pieces)
+        pieces.to_a.reverse.map do |(piece, num)|
+          if num > 0
+            str = csa2kind(piece)
+            if num > 1
+              str += n2kan(num / 10) if num / 10 > 0
+              num %= 10
+              str += n2kan(num)
+            end
+            str
           end
-          str
-        end
-      end.compact.join("　") + "　\n"
-    end
+        end.compact.join('　') + "　\n"
+      end
 
-    def convert_board_piece(piece)
-      result = ""
+      def convert_board_piece(piece)
+        result = ''
 
-      if piece == {}
-        result = " ・"
-      else
-        result += piece["color"] == 0 ? " " : "v"
-        result += csa2kind(piece["kind"])
+        if piece == {}
+          result = ' ・'
+        else
+          result += piece['color'] == 0 ? ' ' : 'v'
+          result += csa2kind(piece['kind'])
+        end
+
+        result
       end
 
-      result
-    end
+      def convert_special(special, index)
+        result = "まで#{index + 1}手"
+
+        if special == 'TORYO' || special =~ /ILLEGAL/
+          turn = @players[index % 2]
+          result += "で#{turn}手の"
+          result += { 'TORYO' => '勝ち',
+                      'ILLEGAL_ACTION' => '反則勝ち',
+                      'ILLEGAL_MOVE' => '反則負け' }[special]
+        else
+          turn = @players[(index + 1) % 2]
+          result += case special
+                    when 'TIME_UP' then "で時間切れにより#{turn}手の勝ち"
+                    when 'CHUDAN' then 'で中断'
+                    when 'JISHOGI' then 'で持将棋'
+                    when 'SENNICHITE' then 'で千日手'
+                    when 'TSUMI' then 'で詰み'
+                    when 'FUZUMI' then 'で不詰'
+                    end
+        end
 
-    def convert_special(special, index)
-      result = "まで#{index + 1}手"
-
-      if special == "TORYO" || special =~ /ILLEGAL/
-        turn = @players[index % 2]
-        result += "で#{turn}手の"
-        result += case special
-                  when "TORYO" then "勝ち"
-                  when "ILLEGAL_ACTION" then "反則勝ち"
-                  when "ILLEGAL_MOVE" then "反則負け"
-                  end
-      else
-        turn = @players[(index + 1) % 2]
-        result += case special
-                  when "TIME_UP" then "で時間切れにより#{turn}手の勝ち"
-                  when "CHUDAN" then "で中断"
-                  when "JISHOGI" then "で持将棋"
-                  when "SENNICHITE" then "で千日手"
-                  when "TSUMI" then "で詰み"
-                  when "FUZUMI" then "で不詰"
-                  end
-      end
-
-      result + "\n"
-    end
+        result + "\n"
+      end
 
-    def convert_piece_with_pos(move)
-      result = if move["to"]
-                 n2zen(move["to"]["x"]) + n2kan(move["to"]["y"])
-               elsif move["same"]
-                 "同　"
-               end
-      result += csa2kind(move["piece"])
-      result += "成" if move["promote"]
-      result
-    end
+      def convert_piece_with_pos(move)
+        result = if move['to']
+                   n2zen(move['to']['x']) + n2kan(move['to']['y'])
+                 elsif move['same']
+                   '同　'
+                 end
+        result += csa2kind(move['piece'])
+        result += '成' if move['promote']
+        result
+      end
 
-    def convert_forks(forks, index)
-      result = "\n"
-      result = "変化：%4d手\n" % [index] # ki2の場合\nなし
-      forks.each do |moves|
-        result += convert_moves(moves, index)
+      def convert_forks(forks, index)
+        result = "\n"
+        result = "変化：%4d手\n" % [index] # ki2の場合\nなし
+        forks.each do |moves|
+          result += convert_moves(moves, index)
+        end
+        result
       end
-      result
-    end
 
-    def reset!
-      @forks = []
-      @header2 = []
-    end
+      def reset!
+        @forks = []
+        @header2 = []
+      end
 
-    def setup_players!(jkf)
-      players_flag = :sengo
-      jkf["header"] && jkf["header"].keys.detect { |key| key =~ /[上下]手/ } && players_flag = :uwasimo
-      @players = if players_flag == :uwasimo
-                   ["下", "上"]
-                 else
-                   ["先", "後"]
-                 end
-    end
+      def setup_players!(jkf)
+        players_flag = :sengo
+        jkf['header']&.keys&.detect { |key| key =~ /[上下]手/ } && players_flag = :uwasimo
+        @players = if players_flag == :uwasimo
+                     ['下', '上']
+                   else
+                     ['先', '後']
+                   end
+      end
 
-    def n2zen(n)
-      "０１２３４５６７８９"[n]
-    end
+      def n2zen(n)
+        '０１２３４５６７８９'[n]
+      end
 
-    def n2kan(n)
-      "〇一二三四五六七八九"[n]
-    end
+      def n2kan(n)
+        '〇一二三四五六七八九'[n]
+      end
 
-    def csa2kind(csa)
-      {
-        "FU" => "歩",
-        "KY" => "香",
-        "KE" => "桂",
-        "GI" => "銀",
-        "KI" => "金",
-        "KA" => "角",
-        "HI" => "飛",
-        "OU" => "玉",
-        "TO" => "と",
-        "NY" => "成香",
-        "NK" => "成桂",
-        "NG" => "成銀",
-        "UM" => "馬",
-        "RY" => "龍"
-      }[csa]
-    end
+      def csa2kind(csa)
+        {
+          'FU' => '歩',
+          'KY' => '香',
+          'KE' => '桂',
+          'GI' => '銀',
+          'KI' => '金',
+          'KA' => '角',
+          'HI' => '飛',
+          'OU' => '玉',
+          'TO' => 'と',
+          'NY' => '成香',
+          'NK' => '成桂',
+          'NG' => '成銀',
+          'UM' => '馬',
+          'RY' => '龍'
+        }[csa]
+      end
 
-    def preset2str(preset)
-      {
-        "HIRATE" => "平手",
-        "KY" => "香落ち",
-        "KY_R" => "右香落ち",
-        "KA" => "角落ち",
-        "HI" => "飛車落ち",
-        "HIKY" => "飛香落ち",
-        "2" => "二枚落ち",
-        "3" => "三枚落ち",
-        "4" => "四枚落ち",
-        "5" => "五枚落ち",
-        "5_L" => "左五枚落ち",
-        "6" => "六枚落ち",
-        "8" => "八枚落ち",
-        "10" => "十枚落ち",
-        "OTHER" => "その他"
-      }[preset]
+      def preset2str(preset)
+        {
+          'HIRATE' => '平手',
+          'KY' => '香落ち',
+          'KY_R' => '右香落ち',
+          'KA' => '角落ち',
+          'HI' => '飛車落ち',
+          'HIKY' => '飛香落ち',
+          '2' => '二枚落ち',
+          '3' => '三枚落ち',
+          '4' => '四枚落ち',
+          '5' => '五枚落ち',
+          '5_L' => '左五枚落ち',
+          '6' => '六枚落ち',
+          '8' => '八枚落ち',
+          '10' => '十枚落ち',
+          'OTHER' => 'その他'
+        }[preset]
+      end
     end
   end
 end

data/lib/jkf/converter.rb

@@ -1,14 +1,12 @@
 module Jkf
-  # Define converter namespace
   module Converter
-    # Convert error
     class ConvertError < StandardError; end
   end
 end
 
-require "json"
-require "jkf/converter/base"
-require "jkf/converter/kifuable"
-require "jkf/converter/kif"
-require "jkf/converter/ki2"
-require "jkf/converter/csa"
+require 'json'
+require_relative 'converter/base'
+require_relative 'converter/kifuable'
+require_relative 'converter/kif'
+require_relative 'converter/ki2'
+require_relative 'converter/csa'