feen 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ffebf45c7d54e896af8ea265e9a3e6be43f5d3367f8f4d75a3be35ede0769c
-  data.tar.gz: b942b667c90dadea80c7dfadb87872a3024c3a15dbaf866814c530957ad12fd3
+  metadata.gz: 4120730f5c39a876c2dc1bba4536f997b822ddfee043e37cdb1dc68f1ffcbb31
+  data.tar.gz: 3a0365e075d0c0238625d841c78ccb52e21106bc47cc312ce6b1e4e47d08d6b9
 SHA512:
-  metadata.gz: 921e336e081f5d238e05750f245e81aa5d1b10a8b7fd5eddd1eec95518d3b210c77a4d14ecf3d53f6098217c3113a3dba27abaafddc5cb981f7f3d304bc00202
-  data.tar.gz: 840842f00f4da13daefefac0389a616296c692e8da099da0c37959e5ea6e1ae2fcb5fbb3a3e0643bbd903874f61d11b1ef398db30e29ee1c432654492ffdd305
+  metadata.gz: 202e76081fbe4cbef65fdfa4833d370d7e2310ff6d3498fffa2baf10118afa12c1f15260a2e3f2f2ceecec6a99601b8a5bb89508e5e188583fad5015d944deb5
+  data.tar.gz: c9f8c235a87923c74d7f804535ad740d86eadfebd23c4cfa7756d4a9159a1a30c97874e619bad8e6f84a1def42f500048a6196a44a6f6422918237d4b89d4440

data/README.md

@@ -40,11 +40,11 @@ require "feen"
 FEEN.dump(
   "active_side_id": 0,
   "board": {
-    "3": "s",
-    "4": "k" ,
-    "5": "s",
-    "22": "+P",
-    "43": "+B"
+     3 => "s",
+     4 => "k" ,
+     5 => "s",
+    22 => "+P",
+    43 => "+B"
   },
   "indexes": [9, 9],
   "pieces_in_hand_grouped_by_sides": [
@@ -59,11 +59,11 @@ FEEN.parse("3,s,k,s,3/9/4,+P,4/9/7,+B,1/9/9/9/9 0 S/b,g,g,g,g,n,n,n,n,p,p,p,p,p,
 # => {
 #      "active_side_id": 0,
 #      "board": {
-#        "3": "s",
-#        "4": "k" ,
-#        "5": "s",
-#        "22": "+P",
-#        "43": "+B"
+#         3 => "s",
+#         4 => "k" ,
+#         5 => "s",
+#        22 => "+P",
+#        43 => "+B"
 #      },
 #      "indexes": [9, 9],
 #      "pieces_in_hand_grouped_by_sides": [

data/lib/feen/dumper.rb

@@ -36,9 +36,9 @@ module FEEN
     # @return [String] The FEEN string representing the position.
     def self.call(active_side_id:, board:, indexes:, pieces_in_hand_grouped_by_sides:)
       [
-        Board.new(*indexes, **board).to_s,
+        Board.new(indexes, board).to_s,
         Turn.dump(active_side_id, pieces_in_hand_grouped_by_sides.length),
-        PiecesInHand.dump(*pieces_in_hand_grouped_by_sides)
+        PiecesInHand.dump(pieces_in_hand_grouped_by_sides)
       ].join(" ")
     end
   end

data/lib/feen/dumper/board.rb

@@ -5,53 +5,57 @@ module FEEN
     # The board class.
     #
     # @example Dump an empty board of Xiangqi
-    #   Board.new(10, 9).to_s # => "9/9/9/9/9/9/9/9/9/9"
+    #   Board.new([10, 9]).to_s # => "9/9/9/9/9/9/9/9/9/9"
     #
     # @example Dump the Xiangqi starting position board
-    #   Board.new(10, 9,
-    #     "0": "車",
-    #     "1": "馬",
-    #     "2": "象",
-    #     "3": "士",
-    #     "4": "將",
-    #     "5": "士",
-    #     "6": "象",
-    #     "7": "馬",
-    #     "8": "車",
-    #     "19": "砲",
-    #     "25": "砲",
-    #     "27": "卒",
-    #     "29": "卒",
-    #     "31": "卒",
-    #     "33": "卒",
-    #     "35": "卒",
-    #     "54": "兵",
-    #     "56": "兵",
-    #     "58": "兵",
-    #     "60": "兵",
-    #     "62": "兵",
-    #     "64": "炮",
-    #     "70": "炮",
-    #     "81": "俥",
-    #     "82": "傌",
-    #     "83": "相",
-    #     "84": "仕",
-    #     "85": "帥",
-    #     "86": "仕",
-    #     "87": "相",
-    #     "88": "傌",
-    #     "89": "俥").to_s # => "車,馬,象,士,將,士,象,馬,車/9/1,砲,5,砲,1/卒,1,卒,1,卒,1,卒,1,卒/9/9/兵,1,兵,1,兵,1,兵,1,兵/1,炮,5,炮,1/9/俥,傌,相,仕,帥,仕,相,傌,俥"
+    #   Board.new(
+    #     [10, 9],
+    #     {
+    #        0 => "車",
+    #        1 => "馬",
+    #        2 => "象",
+    #        3 => "士",
+    #        4 => "將",
+    #        5 => "士",
+    #        6 => "象",
+    #        7 => "馬",
+    #        8 => "車",
+    #       19 => "砲",
+    #       25 => "砲",
+    #       27 => "卒",
+    #       29 => "卒",
+    #       31 => "卒",
+    #       33 => "卒",
+    #       35 => "卒",
+    #       54 => "兵",
+    #       56 => "兵",
+    #       58 => "兵",
+    #       60 => "兵",
+    #       62 => "兵",
+    #       64 => "炮",
+    #       70 => "炮",
+    #       81 => "俥",
+    #       82 => "傌",
+    #       83 => "相",
+    #       84 => "仕",
+    #       85 => "帥",
+    #       86 => "仕",
+    #       87 => "相",
+    #       88 => "傌",
+    #       89 => "俥"
+    #     }
+    #   ).to_s # => "車,馬,象,士,將,士,象,馬,車/9/1,砲,5,砲,1/卒,1,卒,1,卒,1,卒,1,卒/9/9/兵,1,兵,1,兵,1,兵,1,兵/1,炮,5,炮,1/9/俥,傌,相,仕,帥,仕,相,傌,俥"
     class Board
       # @param indexes [Array] The shape of the board.
       # @param board [Hash] The indexes of each piece on the board.
-      def initialize(*indexes, **board)
+      def initialize(indexes, board)
         @indexes = indexes
-        @squares = Array.new(length) { |i| board.fetch(i.to_s.to_sym, nil) }
+        @squares = Array.new(length) { |i| board.fetch(i, nil) }
       end
 
       # @return [String] The string representing the board.
       def to_s
-        unflatten(@squares, *@indexes)
+        unflatten(@squares, @indexes)
       end
 
       private
@@ -60,17 +64,17 @@ module FEEN
         @indexes.inject(:*)
       end
 
-      def unflatten(squares, *remaining_indexes)
-        return row(*squares) if remaining_indexes.length == 1
+      def unflatten(squares, remaining_indexes)
+        return row(squares) if remaining_indexes.length == 1
 
         squares
           .each_slice(squares.length / remaining_indexes.fetch(0))
           .to_a
-          .map { |sub_squares| unflatten(sub_squares, *remaining_indexes[1..]) }
+          .map { |sub_squares| unflatten(sub_squares, remaining_indexes[1..]) }
           .join("/" * remaining_indexes.length.pred)
       end
 
-      def row(*squares)
+      def row(squares)
         squares
           .map { |square| square.nil? ? 1 : square }
           .join(",")

data/lib/feen/dumper/pieces_in_hand.rb

@@ -18,12 +18,12 @@ module FEEN
       #
       # @return [String] A string representing the pieces in hand of both
       #   players.
-      def self.dump(*pieces_in_hand_grouped_by_sides)
-        pieces_in_hand_grouped_by_sides.map { |pieces| new(*pieces).to_s }.join("/")
+      def self.dump(pieces_in_hand_grouped_by_sides)
+        pieces_in_hand_grouped_by_sides.map { |pieces| new(pieces).to_s }.join("/")
       end
 
       # @param pieces [Array] A list of pieces in hand.
-      def initialize(*pieces)
+      def initialize(pieces)
         @pieces = pieces.sort
       end
 

data/lib/feen/parser/board.rb

@@ -21,11 +21,11 @@ module FEEN
     # @example Parse a Shogi problem board and return a hash
     #   Board.new("3,s,k,s,3/9/4,+P,4/9/7,+B,1/9/9/9/9").to_h
     #   # => {
-    #   #      "3": "s",
-    #   #      "4": "k" ,
-    #   #      "5": "s",
-    #   #      "22": "+P",
-    #   #      "43": "+B"
+    #   #       3 => "s",
+    #   #       4 => "k" ,
+    #   #       5 => "s",
+    #   #      22 => "+P",
+    #   #      43 => "+B"
     #   #    }
     class Board
       # @param board [String] The flatten board.
@@ -47,7 +47,7 @@ module FEEN
           .inject({}) do |h, (v, i)|
             next h if v.nil?
 
-            h.merge(i.to_s.to_sym => v)
+            h.merge(i => v)
           end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feen
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brutal