jkf 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc949b63200215816a909361e5bfd25e7e500a75
-  data.tar.gz: 4c3401109c8a2605ec059125150da420bf765bb9
+  metadata.gz: 80b961d103b0c7155b4ac36d77e9d3ddb40a03a3
+  data.tar.gz: b22def70291acf60b94fa289614fd8b254c6ac8f
 SHA512:
-  metadata.gz: 64198f8a7885426c309a9700ec4e576363bdf339f0e523a4b0ea0375552fc4d51ca5f457945cb7271fc585dc494ccf3d9f75132620dbecdc306b05c01d887f97
-  data.tar.gz: 298dd0d297f5897fd1cf4065d00a6d49e687fc577c8fc7368a71981689ba87aaa6d9cbfe099f3bd87b4201d85f7ef59352fc5a8ced0da415af1d489b2b4725fb
+  metadata.gz: 2f7e92e39cf7caa4de99366b4645de4a42a57d664eb8b10e832d1fa651a03d07d053c3f3f5eb4685a4cde3bc38f65b7c5166b8c0f65acb0d5aee33c5240d0264
+  data.tar.gz: dca0b0cbe829920b2ef816e138592965f4b62e7ca00115de5509558853987b56150f3a11b8af6a3fb7443cfeb8102e87a0710a1bcd4cd8de5ad613ae5e826c53

data/lib/jkf/converter/ki2.rb

@@ -8,9 +8,19 @@ module Jkf::Converter
              end
       @forks = []
 
+      players_flag = :sengo
+      hash['header'] && hash['header'].keys.find { |key| key =~ /[上下]手/ } && players_flag = :uwasimo
+      @players =  if players_flag == :uwasimo
+                    ['下', '上']
+                  else
+                    ['先', '後']
+                  end
+      @header2 = []
+
       result = ''
       result += convert_header(hash['header']) if hash['header']
       result += convert_initial(hash['initial']) if hash['initial']
+      result += @header2.join
       result += convert_moves(hash['moves']) if hash['moves']
       if @forks.size > 0
         result += "\n"
@@ -21,33 +31,45 @@ module Jkf::Converter
     end
 
     def convert_header(header)
-      header.map { |(key, value)| "#{key}：#{value}\n" }.join
+      header.map { |(key, value)|
+        result = "#{key}：#{value}\n"
+        if key =~ /\A[先後上下]手\Z/
+          if key =~ /[先下]/
+            @header2.unshift result
+          else
+            @header2 << result
+          end
+          nil
+        else
+          result
+        end
+      }.compact.join
     end
 
+
     def convert_initial(initial)
       result = ''
       result += "手合割：#{preset2str(initial["preset"])}\n" if initial["preset"] != "OTHER"
+      footer = ''
 
       data = initial["data"]
 
       if data
-        if data['color'] == 0
-          result += "先手番\n"
-        elsif data['color'] == 1
-          result += "後手番\n"
-        end
+        result += "#{@players[1]}手番\n" if data['color'] == 1
 
         if data['hands']
-          if data['hands'][0]
-            result += '先手の持駒：'
-            result += convert_motigoma(data['hands'][0])
-          end
           if data['hands'][1]
-            result += '後手の持駒：'
+            result += "#{@players[1]}手の持駒："
             result += convert_motigoma(data['hands'][1])
           end
+          if data['hands'][0]
+            footer += "#{@players[0]}手の持駒："
+            footer += convert_motigoma(data['hands'][0])
+          end
         end
 
+        footer += "#{@players[0]}手番\n" if data['color'] == 0
+
         if data['board']
           result += "  ９ ８ ７ ６ ５ ４ ３ ２ １\n"
           result += "+---------------------------+\n"
@@ -63,6 +85,8 @@ module Jkf::Converter
         end
       end
 
+      result += footer
+
       result
     end
 
@@ -119,7 +143,7 @@ module Jkf::Converter
       result = "まで#{index+1}手"
 
       if special == 'TORYO' || special =~ /ILLEGAL/
-        turn = index % 2 == 0 ? '後' : '先'
+        turn = @players[index % 2]
         result += "で#{turn}手の"
         result += case special
                   when "TORYO"          then "勝ち"
@@ -127,7 +151,7 @@ module Jkf::Converter
                   when "ILLEGAL_MOVE"   then "反則負け"
                   end
       else
-        turn = index % 2 == 0 ? '先' : '後'
+        turn = @players[(index+1) % 2]
         result += case special
                   when "TIME_UP"    then "で時間切れにより#{turn}手の勝ち"
                   when "CHUDAN"     then "で中断"

data/lib/jkf/converter/kif.rb

@@ -8,9 +8,19 @@ module Jkf::Converter
              end
       @forks = []
 
+      players_flag = :sengo
+      hash['header'] && hash['header'].keys.find { |key| key =~ /[上下]手/ } && players_flag = :uwasimo
+      @players =  if players_flag == :uwasimo
+                    ['下', '上']
+                  else
+                    ['先', '後']
+                  end
+      @header2 = []
+
       result = ''
       result += convert_header(hash['header']) if hash['header']
       result += convert_initial(hash['initial']) if hash['initial']
+      result += @header2.join
       result += "手数----指手---------消費時間--\n"
       result += convert_moves(hash['moves'])
       if @forks.size > 0
@@ -24,33 +34,44 @@ module Jkf::Converter
     protected
 
     def convert_header(header)
-      header.map { |(key, value)| "#{key}：#{value}\n" }.join
+      header.map { |(key, value)|
+        result = "#{key}：#{value}\n"
+        if key =~ /\A[先後上下]手\Z/
+          if key =~ /[先下]/
+            @header2.unshift result
+          else
+            @header2 << result
+          end
+          nil
+        else
+          result
+        end
+      }.compact.join
     end
 
     def convert_initial(initial)
       result = ''
       result += "手合割：#{preset2str(initial["preset"])}\n" if initial["preset"] != "OTHER"
+      footer = ''
 
       data = initial["data"]
 
       if data
-        if data['color'] == 0
-          result += "先手番\n"
-        elsif data['color'] == 1
-          result += "後手番\n"
-        end
+        result += "#{@players[1]}手番\n" if data['color'] == 1
 
         if data['hands']
-          if data['hands'][0]
-            result += '先手の持駒：'
-            result += convert_motigoma(data['hands'][0])
-          end
           if data['hands'][1]
-            result += '後手の持駒：'
+            result += "#{@players[1]}手の持駒："
             result += convert_motigoma(data['hands'][1])
           end
+          if data['hands'][0]
+            footer += "#{@players[0]}手の持駒："
+            footer += convert_motigoma(data['hands'][0])
+          end
         end
 
+        footer += "#{@players[0]}手番\n" if data['color'] == 0
+
         if data['board']
           result += "  ９ ８ ７ ６ ５ ４ ３ ２ １\n"
           result += "+---------------------------+\n"
@@ -66,6 +87,8 @@ module Jkf::Converter
         end
       end
 
+      result += footer
+
       result
     end
 
@@ -134,7 +157,7 @@ module Jkf::Converter
       result = "まで#{index+1}手"
 
       if special == 'TORYO' || special =~ /ILLEGAL/
-        turn = index % 2 == 0 ? '後' : '先'
+        turn = @players[index % 2]
         result += "で#{turn}手の"
         result += case special
                   when "TORYO"          then "勝ち"
@@ -142,7 +165,7 @@ module Jkf::Converter
                   when "ILLEGAL_MOVE"   then "反則負け"
                   end
       else
-        turn = index % 2 == 0 ? '先' : '後'
+        turn = @players[(index+1) % 2]
         result += case special
                   when "TIME_UP"    then "で時間切れにより#{turn}手の勝ち"
                   when "CHUDAN"     then "で中断"

data/lib/jkf/version.rb

@@ -1,3 +1,3 @@
 module Jkf
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jkf
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - iyuuya