jkf 0.5.0 → 0.5.1

data/bin/console

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "jkf"
+require 'bundler/setup'
+require 'jkf'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-if require "pry"
+if require 'pry'
   Pry.start
 else
-  require "irb"
+  require 'irb'
   IRB.start
 end

data/jkf.gemspec

@@ -1,24 +1,23 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jkf/version"
+require 'jkf/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "jkf"
+  spec.name = 'jkf'
   spec.version = Jkf::VERSION
-  spec.authors = ["iyuuya"]
-  spec.email = ["i.yuuya@gmail.com"]
+  spec.authors = ['iyuuya']
+  spec.email = ['i.yuuya@gmail.com']
 
-  spec.summary = "jkf/csa/kif/ki2 parser and converter"
-  spec.description = "converter/parser of records of shogi"
-  spec.homepage = "https://github.com/iyuuya/jkf"
-  spec.license = "MIT"
+  spec.summary = 'jkf/csa/kif/ki2 parser and converter'
+  spec.description = 'converter/parser of records of shogi'
+  spec.homepage = 'https://github.com/iyuuya/jkf'
+  spec.license = 'MIT'
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir = "exe"
+  spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/jkf/converter/base.rb

@@ -1,13 +1,15 @@
-module Jkf::Converter
-  # Base of Converter
-  class Base
-    # start convert
-    # 
-    # @param [String, Hash] jkf
-    # @return [String] kif or ki2 or csa text
-    def convert(jkf)
-      jkf = jkf.is_a?(Hash) ? jkf : JSON.parse(jkf)
-      convert_root(jkf)
+module Jkf
+  module Converter
+    # Base of Converter
+    class Base
+      # start convert
+      # 
+      # @param [String, Hash] jkf
+      # @return [String] kif or ki2 or csa text
+      def convert(jkf)
+        jkf = jkf.is_a?(Hash) ? jkf : JSON.parse(jkf)
+        convert_root(jkf)
+      end
     end
   end
 end

data/lib/jkf/converter/csa.rb

@@ -1,174 +1,165 @@
-module Jkf::Converter
-  # CSA v2.2 Converter
-  class Csa < Base
-    VERSION = "2.2".freeze
-
-    protected
-
-    def convert_root(jkf)
-      result = version
-      result += convert_information(jkf["header"]) if jkf["header"]
-      result += convert_initial(jkf["initial"]) if jkf["initial"]
-      result += convert_moves(jkf["moves"]) if jkf["moves"]
-      result
-    end
-
-    def convert_information(header)
-      result = ""
-      if header["先手"] || header["下手"]
-        result += "N+" + (header.delete("先手") || header.delete("下手") || "") + "\n"
-      end
-      if header["後手"] || header["上手"]
-        result += "N-" + (header.delete("後手") || header.delete("上手") || "") + "\n"
+module Jkf
+  module Converter
+    # CSA v2.2 Converter
+    class Csa < Base
+      VERSION = '2.2'.freeze
+
+      protected
+
+      def convert_root(jkf)
+        result = version
+        result += convert_information(jkf['header']) if jkf['header']
+        result += convert_initial(jkf['initial']) if jkf['initial']
+        result += convert_moves(jkf['moves']) if jkf['moves']
+        result
       end
-      header.each { |(k, v)| result += "$#{csa_header_key(k)}:#{v}\n" }
-      result
-    end
 
-    def convert_initial(initial)
-      result = ""
-      data = initial["data"] || {}
-      result += if initial["preset"] == "OTHER"
-                  convert_board(data["board"])
-                else
-                  convert_preset(initial["preset"])
-                end
-      # 持駒
-      if data["hands"]
-        result += convert_hands(data["hands"], 0)
-        result += convert_hands(data["hands"], 1)
+      def convert_information(header)
+        result = ''
+        if header['先手'] || header['下手']
+          result += 'N+' + (header.delete('先手') || header.delete('下手') || '') + "\n"
+        end
+        if header['後手'] || header['上手']
+          result += 'N-' + (header.delete('後手') || header.delete('上手') || '') + "\n"
+        end
+        header.each { |(k, v)| result += "$#{csa_header_key(k)}:#{v}\n" }
+        result
       end
-      result += csa_color(data["color"]) + "\n" if data["color"]
-      result
-    end
 
-    def convert_hands(hands, color)
-      result = ""
-      sum = 0
-      hands[color].each_value { |n| sum += n }
-      if sum > 0
-        result += "P#{csa_color(color)}"
-        hands[color].to_a.reverse_each { |(k, v)| v.times { result += "00#{k}" } }
-        result += "\n"
+      def convert_initial(initial)
+        result = ''
+        data = initial['data'] || {}
+        result += if initial['preset'] == 'OTHER'
+                    convert_board(data['board'])
+                  else
+                    convert_preset(initial['preset'])
+                  end
+        # 持駒
+        if data['hands']
+          result += convert_hands(data['hands'], 0)
+          result += convert_hands(data['hands'], 1)
+        end
+        result += csa_color(data['color']) + "\n" if data['color']
+        result
       end
-      result
-    end
 
-    def convert_moves(moves)
-      result = ""
-      before_pos = nil
-      moves.each do |move|
-        next if move == {}
-        result += convert_move(move["move"], before_pos) if move["move"]
-        result += convert_special(move["special"], move["color"]) if move["special"]
-        if move["time"]
-          result += "," + convert_time(move["time"])
-        elsif move["move"] || move["special"]
+      def convert_hands(hands, color)
+        result = ''
+        sum = 0
+        hands[color].each_value { |n| sum += n }
+        if sum > 0
+          result += "P#{csa_color(color)}"
+          hands[color].to_a.reverse_each { |(k, v)| v.times { result += "00#{k}" } }
           result += "\n"
         end
-        result += convert_comments(move["comments"]) if move["comments"]
-        before_pos = move["move"]["to"] if move["move"] && move["move"]["to"]
+        result
       end
-      result
-    end
 
-    def convert_move(move, before_pos)
-      result = csa_color(move["color"])
-      result += move["from"] ? pos2str(move["from"]) : "00"
-      result += if move["to"]
-                  pos2str(move["to"]) + move["piece"]
-                else
-                  pos2str(before_pos) + move["piece"]
-                end
-      result
-    end
+      def convert_moves(moves)
+        result = ''
+        before_pos = nil
+        moves.each do |move|
+          next if move == {}
+          result += convert_move(move['move'], before_pos) if move['move']
+          result += convert_special(move['special'], move['color']) if move['special']
+          if move['time']
+            result += ',' + convert_time(move['time'])
+          elsif move['move'] || move['special']
+            result += "\n"
+          end
+          result += convert_comments(move['comments']) if move['comments']
+          before_pos = move['move']['to'] if move['move'] && move['move']['to']
+        end
+        result
+      end
 
-    def convert_special(special, color = nil)
-      result = "%"
-      result += csa_color(color) if color
-      result + special
-    end
+      def convert_move(move, before_pos)
+        result = csa_color(move['color'])
+        result += move['from'] ? pos2str(move['from']) : '00'
+        result += if move['to']
+                    pos2str(move['to']) + move['piece']
+                  else
+                    pos2str(before_pos) + move['piece']
+                  end
+        result
+      end
 
-    def convert_time(time)
-      sec = (time["now"]["m"] * 60) + time["now"]["s"]
-      "T#{sec}\n"
-    end
+      def convert_special(special, color = nil)
+        result = '%'
+        result += csa_color(color) if color
+        result + special
+      end
 
-    def convert_comments(comments)
-      comments.map { |comment| "'#{comment}" }.join("\n") + "\n"
-    end
+      def convert_time(time)
+        sec = (time['now']['m'] * 60) + time['now']['s']
+        "T#{sec}\n"
+      end
 
-    def convert_board(board)
-      result = ""
-      9.times do |y|
-        result += "P#{y + 1}"
-        9.times do |x|
-          piece = board[8 - x][y]
-          result += if piece == {}
-                      " * "
-                    else
-                      csa_color(piece["color"]) + piece["kind"]
-                    end
-        end
-        result += "\n"
+      def convert_comments(comments)
+        comments.map { |comment| "'#{comment}" }.join("\n") + "\n"
       end
-      result
-    end
 
-    def convert_preset(preset)
-      "PI" +
-        case preset
-        when "HIRATE" # 平手
-          ""
-        when "KY" # 香落ち
-          "11KY"
-        when "KY_R" # 右香落ち
-          "91KY"
-        when "KA" # 角落ち
-          "22KA"
-        when "HI" # 飛車落ち
-          "82HI"
-        when "HIKY" # 飛香落ち
-          "22HI11KY91KY"
-        when "2" # 二枚落ち
-          "82HI22KA"
-        when "3" # 三枚落ち
-          "82HI22KA91KY"
-        when "4" # 四枚落ち
-          "82HI22KA11KY91KY"
-        when "5" # 五枚落ち
-          "82HI22KA81KE11KY91KY"
-        when "5_L" # 左五枚落ち
-          "82HI22KA21KE11KY91KY"
-        when "6" # 六枚落ち
-          "82HI22KA21KE81KE11KY91KY"
-        when "8" # 八枚落ち
-          "82HI22KA31GI71GI21KE81KE11KY91KY"
-        when "10" # 十枚落ち
-          "82HI22KA41KI61KI31GI71GI21KE81KE11KY91KY"
+      def convert_board(board)
+        result = ''
+        9.times do |y|
+          result += "P#{y + 1}"
+          9.times do |x|
+            piece = board[8 - x][y]
+            result += if piece == {}
+                        ' * '
+                      else
+                        csa_color(piece['color']) + piece['kind']
+                      end
+          end
+          result += "\n"
         end
-    end
+        result
+      end
 
-    def csa_color(color)
-      color == 0 ? "+" : "-"
-    end
+      def convert_preset(preset)
+        'PI' + PRESET_NAME_TO_CSA_MAPPING[preset]
+      end
 
-    def pos2str(pos)
-      "%d%d" % [pos["x"], pos["y"]]
-    end
+      PRESET_NAME_TO_CSA_MAPPING = {
+        'HIRATE' => '', # 平手
+        'KY' => '11KY', # 香落ち
+        'KY_R' => '91KY', # 右香落ち
+        'KA' => '22KA', # 角落ち
+        'HI' => '82HI', # 飛車落ち
+        'HIKY' => '22HI11KY91KY', # 飛香落ち
+        '2' => '82HI22KA', # 二枚落ち
+        '3' => '82HI22KA91KY', # 三枚落ち
+        '4' => '82HI22KA11KY91KY', # 四枚落ち
+        '5' => '82HI22KA81KE11KY91KY', # 五枚落ち
+        '5_L' => '82HI22KA21KE11KY91KY', # 左五枚落ち
+        '6' => '82HI22KA21KE81KE11KY91KY', # 六枚落ち
+        '8' => '82HI22KA31GI71GI21KE81KE11KY91KY', # 八枚落ち
+        '10' => '82HI22KA41KI61KI31GI71GI21KE81KE11KY91KY' # 十枚落ち
+      }.freeze
+
+      private_constant :PRESET_NAME_TO_CSA_MAPPING
+
+      def csa_color(color)
+        color == 0 ? '+' : '-'
+      end
 
-    def version
-      "V#{VERSION}\n"
-    end
+      def pos2str(pos)
+        '%d%d' % [pos['x'], pos['y']]
+      end
+
+      def version
+        "V#{VERSION}\n"
+      end
 
-    def csa_header_key(key)
-      {
-        "棋戦" => "EVENT",
-        "場所" => "SITE",
-        "開始日時" => "START_TIME",
-        "終了日時" => "END_TIME",
-        "持ち時間" => "TIME_LIMIT"
-      }[key] || key
+      def csa_header_key(key)
+        {
+          '棋戦' => 'EVENT',
+          '場所' => 'SITE',
+          '開始日時' => 'START_TIME',
+          '終了日時' => 'END_TIME',
+          '持ち時間' => 'TIME_LIMIT'
+        }[key] || key
+      end
     end
   end
 end

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