jkf 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cad7bbf021250fb745379dfde6cdd189ac23065f
-  data.tar.gz: eff17d1efc52ff07bdc58bc6d4b61afa0022a1fb
+SHA256:
+  metadata.gz: ea59b45dcef66f1538bdd64d25fba421e6c5c7f458846dccfd5727b49755d420
+  data.tar.gz: db04f6d1d141e00700d785c4026064ae69d6a547051defdb52fb325c3d98acb5
 SHA512:
-  metadata.gz: 081f1b970eb509aaa33495fb14459d6a37ce7510f59d94a1ee9ea1c3b2f23319b6ccb36383029f456cfa681d3ae5e7ab164dfde4f647ae25d8ddd3d1f46a7906
-  data.tar.gz: 7d0bb2322d33f323f64b82350108721b2d6694a04000879a58e9d87299bc4426deed8b730c28f85288b8b54d73e7f011d41d37cbeac1e2b3f60f81e145686a18
+  metadata.gz: 9104756b9fecb562b97e90ff5e191603b1b4437e94edd228a4c2f986f0e09c64d1047236c7c432f16b904e079241d0425c0e6f97d5e010dc2505da0d3adb4d50
+  data.tar.gz: fe28d5a3f3077d27b854435242ed4d98a71eec681b089428a990501b42a9ab4189138a681ce565c395d8e9c8e3d812eb8894ed70dc625d94b9f251485d047867

data/lib/jkf/converter/csa.rb

@@ -27,7 +27,7 @@ module Jkf::Converter
 
     def convert_initial(initial)
       result = ""
-      data = initial["data"]
+      data = initial["data"] || {}
       result += if initial["preset"] == "OTHER"
                   convert_board(data["board"])
                 else
@@ -56,9 +56,10 @@ module Jkf::Converter
 
     def convert_moves(moves)
       result = ""
+      before_pos = nil
       moves.each do |move|
         next if move == {}
-        result += convert_move(move["move"]) if move["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"])
@@ -66,14 +67,20 @@ module Jkf::Converter
           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_move(move)
+    def convert_move(move, before_pos)
       result = csa_color(move["color"])
       result += move["from"] ? pos2str(move["from"]) : "00"
-      result + pos2str(move["to"]) + move["piece"]
+      result += if move["to"]
+                  pos2str(move["to"]) + move["piece"]
+                else
+                  pos2str(before_pos) + move["piece"]
+                end
+      result
     end
 
     def convert_special(special, color = nil)
@@ -111,7 +118,8 @@ module Jkf::Converter
     def convert_preset(preset)
       "PI" +
         case preset
-        when "HIRATE"
+        when "HIRATE" # 平手
+          ""
         when "KY" # 香落ち
           "11KY"
         when "KY_R" # 右香落ち

data/lib/jkf/converter/kif.rb

@@ -10,7 +10,7 @@ module Jkf::Converter
       setup_players!(jkf)
 
       result = ""
-      result += convert_header(jkf["header"]) if jkf["header"]
+      result += convert_header(jkf["header"], jkf) if jkf["header"]
       result += convert_initial(jkf["initial"]) if jkf["initial"]
       result += @header2.join
       result += "手数----指手---------消費時間--\n"
@@ -23,7 +23,7 @@ module Jkf::Converter
       result
     end
 
-    def convert_header(header)
+    def convert_header(header, jkf)
       header.map do |(key, value)|
         result = "#{key}：#{value}\n"
         if key =~ /\A[先後上下]手\Z/
@@ -33,6 +33,8 @@ module Jkf::Converter
             @header2 << result
           end
           nil
+        elsif key == "手合割" && jkf["initial"] && jkf["initial"]["preset"] && value == preset2str(jkf["initial"]["preset"])
+          nil
         else
           result
         end

data/lib/jkf/converter/kifuable.rb

@@ -108,8 +108,6 @@ module Jkf::Converter
                  n2zen(move["to"]["x"]) + n2kan(move["to"]["y"])
                elsif move["same"]
                  "同　"
-               else
-                 raise "error??"
                end
       result += csa2kind(move["piece"])
       result += "成" if move["promote"]

data/lib/jkf/version.rb

@@ -1,4 +1,4 @@
 module Jkf
   # Gem version
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jkf
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - iyuuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies: []
 description: converter/parser of records of shogi
 email:
@@ -66,10 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: jkf/csa/kif/ki2 parser and converter
 test_files: []
-has_rdoc: