jkf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c91b3b16debff343f298891452919ea2ec20527
-  data.tar.gz: b7c82914f613103e23087dd55f824da707846ca8
+  metadata.gz: bc949b63200215816a909361e5bfd25e7e500a75
+  data.tar.gz: 4c3401109c8a2605ec059125150da420bf765bb9
 SHA512:
-  metadata.gz: c38021483c7d0457332083545ae03081f45de7bd8c43378d6c66f656cc0436f308422a253822a3545152c597a56621ffeccdb5e45e722faa0f1c6fc0ec8208ae
-  data.tar.gz: 41dae1d0deaed3ed33d21955429ab23f7f70f0e316b77dd0637b64b4412a36058a150be2cccd547cdb31774caeabe853c8cd14ce8e7bc00a710c033dcae24ccc
+  metadata.gz: 64198f8a7885426c309a9700ec4e576363bdf339f0e523a4b0ea0375552fc4d51ca5f457945cb7271fc585dc494ccf3d9f75132620dbecdc306b05c01d887f97
+  data.tar.gz: 298dd0d297f5897fd1cf4065d00a6d49e687fc577c8fc7368a71981689ba87aaa6d9cbfe099f3bd87b4201d85f7ef59352fc5a8ced0da415af1d489b2b4725fb

data/lib/jkf/converter/ki2.rb

@@ -168,7 +168,7 @@ module Jkf::Converter
     end
 
     def convert_motigoma(pieces)
-      pieces.map do |piece, num|
+      pieces.to_a.reverse.map do |(piece, num)|
         if num > 0
           str = csa2kind(piece)
           if num > 1

data/lib/jkf/converter/kif.rb

@@ -184,7 +184,7 @@ module Jkf::Converter
     end
 
     def convert_motigoma(pieces)
-      pieces.map do |piece, num|
+      pieces.to_a.reverse.map do |piece, num|
         if num > 0
           str = csa2kind(piece)
           if num > 1

data/lib/jkf/parser/kif.rb

@@ -57,7 +57,7 @@ module Jkf::Parser
                         end
                         if ret["initial"] && ret["initial"]["data"]
                           if ret["header"]["手番"]
-                            ret["initial"]["data"]["color"] = ("下先".index(ret["header"]["手番"]) >= 0 ? 0 : 1)
+                            ret["initial"]["data"]["color"] = ("下先".include?(ret["header"]["手番"]) ? 0 : 1)
                             ret["header"].delete("手番")
                           else
                             ret["initial"]["data"]["color"] = 0
@@ -81,6 +81,7 @@ module Jkf::Parser
                           fork_stack << _fork
                           fork_stack << now_fork
                         end
+                        reverse_color(ret['moves']) if ret["initial"] && ret["initial"]["data"] && ret["initial"]["data"]["color"] == 1
                         ret
                       }.call(s2, s3, s4, s6, s7)
                       s0 = s1
@@ -634,8 +635,8 @@ module Jkf::Parser
               s6 = parse_from
               if s6 != :failed
                 @reported_pos = s4
-                s5 = -> (fugou, from) {
-                  ret = { "piece" => fugou["piece"] }
+                s5 = -> (teban, fugou, from) {
+                  ret = { "color" => teban2color(teban.join), "piece" => fugou["piece"] }
                   if fugou["to"]
                     ret["to"] = fugou["to"]
                   else
@@ -644,7 +645,7 @@ module Jkf::Parser
                   ret["promote"] = true if fugou["promote"]
                   ret["from"] = from if from
                   ret
-                }.call(s5, s6)
+                }.call(s2, s5, s6)
                 s4 = s5
               else
                 @current_pos = s4
@@ -1519,6 +1520,11 @@ module Jkf::Parser
       }[preset.gsub(/\s/, "")]
     end
 
+    def teban2color(teban)
+      teban = teban.to_i unless teban.is_a? Fixnum
+      (teban+1) % 2
+    end
+
     def make_hand(str)
       # Kifu for iPhoneは半角スペース区切り
       kinds = str.split(/[ 　]/)
@@ -1532,5 +1538,12 @@ module Jkf::Parser
 
       ret
     end
+
+    def reverse_color(moves)
+      moves.each do |move|
+        move['move']['color'] = (move['move']['color'] + 1) % 2 if move['move'] && move['move']['color']
+        move['forks'].each { |_fork| reverse_color(_fork) } if move['forks']
+      end
+    end
   end
 end

data/lib/jkf/version.rb

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

metadata

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