qi 10.0.0.beta4 → 10.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba69668b35781db7bbad0806b6940d99924fa3693355f01538b14bb8ebf159e7
-  data.tar.gz: 8447f2df3687f661762d1a99adffc31640d693f52a4012adf2f89825b2614239
+  metadata.gz: 73eb059b5776d83c165ffe3a37592221e2c28a449cc271b74be2644c9e8e1ed3
+  data.tar.gz: 37f4b7fe311e4ed0ce178031b17dd45e19281a9778b16785a0e829580c52d93b
 SHA512:
-  metadata.gz: 00aa0f50dd054bc1c15a0de068b4c7e2e3e18d2fc63da9db8c781f72058efc472409fe474545a6b088cb9a5b62ad87120baebbb3ad24e3cada79d6a3726f02c6
-  data.tar.gz: d6909071d69cd7308e2655a5331b1d522e424cf05b002a73da5a54e4c7f570533d44c7db23111f4b609d876bf415b742127e0613b38685a49ccc465638c57427
+  metadata.gz: c9feb0ac434f46f4b1d0c6c201ae0d64c084bc4b5b76b82eff8002eb1109580f018d2df65906a0c098129a28d1a2da06744252bcbb04ef1934b926c50ec4cd89
+  data.tar.gz: 89cbfe6706285b7f482161c2b7188afcc6b94c69aa002bb9f42218b7d246c2066876dc73506a83fcd63ea84430302c4f92feda6f4685749ef9200dba9f8ad2cf

data/README.md

@@ -13,7 +13,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "qi", ">= 10.0.0.beta3"
+gem "qi", ">= 10.0.0.beta5"
 ```
 
 And then execute:
@@ -33,13 +33,68 @@ gem install qi --pre
 ```ruby
 require "qi"
 
-captures  = %w[S r r b g g g g s n n n n p p p p p p p p p p p p p p p p p]
-squares   = { "3": "s", "4": "k", "5": "s", "22": "+P", "43": "+B" }
-
-captures, squares = Qi(*captures, **squares).call("43": nil, "13": "+B")
-
-captures  # => ["S", "r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"]
-squares   # => {:"3"=>"s", :"4"=>"k", :"5"=>"s", :"22"=>"+P", :"13"=>"+B"}
+is_north_turn   = false
+north_captures  = %w[r r b g g g g s n n n n p p p p p p p p p p p p p p p p p]
+south_captures  = %w[S]
+squares         = { 3 => "s", 4 => "k", 5 => "s", 22 => "+P", 43 => "+B" }
+
+qi0 = Qi.new(is_north_turn, north_captures, south_captures, squares)
+
+qi0.north_captures  # => ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"]
+qi0.south_captures  # => ["S"]
+qi0.squares         # => {3=>"s", 4=>"k", 5=>"s", 22=>"+P", 43=>"+B"}
+qi0.north_turn?     # => false
+qi0.south_turn?     # => true
+qi0.inspect         # => "<Qi south-turn S,b,g,g,g,g,n,n,n,n,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,r,r,s 3:s,4:k,5:s,22:+P,43:+B>"
+
+qi0.to_a
+# [false,
+#  ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"],
+#  ["S"],
+#  {3=>"s", 4=>"k", 5=>"s", 22=>"+P", 43=>"+B"}]
+
+qi0.display(81, 9)
+# [["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"],
+#  [[". ", ". ", ". ", "s ", "k ", "s ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", "+P", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", "+B", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "]],
+#  ["S"],
+#  "Turn to south"]
+
+qi1 = qi0.commit({ 43 => nil, 13 => "+B" })
+
+qi1.north_captures  # => ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"]
+qi1.south_captures  # => ["S"]
+qi1.squares         # => {3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}
+qi1.north_turn?     # => true
+qi1.south_turn?     # => false
+qi1.inspect         # => "<Qi north-turn S,b,g,g,g,g,n,n,n,n,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,r,r,s 3:s,4:k,5:s,22:+P,13:+B>"
+
+qi1.to_a
+# [true,
+#  ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"],
+#  ["S"],
+#  {3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}]
+
+qi1.display(81, 9)
+# [["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"],
+#  [[". ", ". ", ". ", "s ", "k ", "s ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", "+B", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", "+P", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "],
+#   [". ", ". ", ". ", ". ", ". ", ". ", ". ", ". ", ". "]],
+#  ["S"],
+#  "Turn to north"]
 ```
 
 ## License

data/lib/qi.rb

@@ -1,7 +1,126 @@
 # frozen_string_literal: true
 
-require_relative "kernel"
+# A class that represents the state of a game.
+class Qi
+  # @!attribute [r] north_captures
+  #   @return [Array] an array of pieces captured by the north player
+  # @!attribute [r] south_captures
+  #   @return [Array] an array of pieces captured by the south player
+  # @!attribute [r] squares
+  #   @return [Hash] a hash of pieces on the board
+  attr_reader :north_captures, :south_captures, :squares
 
-# The Qi abstraction.
-module Qi
+  # Initializes a new Qi object with the given parameters.
+  # @param is_north_turn [Boolean] a boolean value indicating whose turn it is
+  # @param north_captures [Array] an array of pieces captured by the north player
+  # @param south_captures [Array] an array of pieces captured by the south player
+  # @param squares [Hash] a hash of pieces on the board
+  def initialize(is_north_turn, north_captures, south_captures, squares)
+    # Assign the parameters to instance variables.
+    @is_north_turn  = is_north_turn
+    @north_captures = north_captures.sort
+    @south_captures = south_captures.sort
+    @squares        = squares.compact
+  end
+
+  # Returns a new Qi object that represents the state after applying the given changes.
+  # @param diffs [Hash] a hash of changes to apply to the squares hash
+  # @param in_hand [Object, nil] the piece that is in hand or nil if none
+  # @param is_drop [Boolean] a boolean value indicating whether the in hand piece is dropped or not
+  # @return [Qi] a new Qi object with modified attributes
+  def commit(diffs = {}, in_hand = nil, is_drop = false)
+    modified_squares = squares.merge(diffs)
+
+    if in_hand.nil?
+      self.class.new(south_turn?, north_captures, south_captures, modified_squares)
+    elsif north_turn?
+      modified_captures = if is_drop
+                            remove_from_captures(in_hand, *north_captures)
+                          else
+                            north_captures + [in_hand]
+                          end
+
+      self.class.new(false, modified_captures, south_captures, modified_squares)
+    else
+      modified_captures = if is_drop
+                            remove_from_captures(in_hand, *south_captures)
+                          else
+                            south_captures + [in_hand]
+                          end
+
+      self.class.new(true, north_captures, modified_captures, modified_squares)
+    end
+  end
+
+  # Checks if it is the north turn or not.
+  # @return [Boolean] true if it is the north turn and false otherwise
+  def north_turn?
+    @is_north_turn
+  end
+
+  # Checks if it is not the north turn or not.
+  # @return [Boolean] true if it is not the north turn and false otherwise
+  def south_turn?
+    !north_turn?
+  end
+
+  # Returns an array representation of the Qi object's attributes.
+  # @return [Array] an array containing four elements:
+  #   - a boolean value indicating whose turn it is
+  #   - an array of pieces captured by the north player
+  #   - an array of pieces captured by the south player
+  #   - a hash of squares on the board
+  def to_a
+    [
+      north_turn?,
+      north_captures,
+      south_captures,
+      squares
+    ]
+  end
+
+  # Returns an array representation of the Qi object's attributes for display purposes.
+  # @param size [Integer] the number of squares on the board
+  # @param cols [Integer] the number of columns on the board
+  # @return [Array] an array containing four elements:
+  #   - an array of pieces captured by the north player
+  #   - a nested array of strings representing the squares on the board
+  #   - an array of pieces captured by the south player
+  #   - a string indicating whose turn it is
+  def display(size, cols)
+    square_size = squares.values.max_by(&:length).length
+    board = (0...size).to_a.map { |i| squares.fetch(i, ".") }.map { |square| square.center(square_size) }.each_slice(cols).to_a
+    turn = (north_turn? ? "Turn to north" : "Turn to south")
+
+    [
+      north_captures,
+      board,
+      south_captures,
+      turn
+    ]
+  end
+
+  # Returns a string representation of the Qi object's attributes.
+  # @return [String] a string containing the turn, the captures and the squares in a formatted way.
+  def inspect
+    serialized_turn     = (north_turn? ? "north-turn" : "south-turn")
+    serialized_captures = captures.join(",")
+    serialized_squares  = squares.keys.map { |i| "#{i}:#{squares.fetch(i)}" }.join(",")
+
+    "<Qi #{serialized_turn} #{serialized_captures} #{serialized_squares}>"
+  end
+
+  private
+
+  def captures
+    south_captures + north_captures
+  end
+
+  def remove_from_captures(captured_piece, *captured_pieces)
+    capture_id = captured_pieces.rindex(captured_piece)
+    raise ::IndexError, "#{captured_piece} not found!" if capture_id.nil?
+
+    captured_pieces.delete_at(capture_id)
+    captured_pieces
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qi
 version: !ruby/object:Gem::Version
-  version: 10.0.0.beta4
+  version: 10.0.0.beta5
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies: []
 description: An abstraction that could help to update positions for games like Shogi.
 email: contact@cyril.email
@@ -18,9 +18,7 @@ extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
-- lib/kernel.rb
 - lib/qi.rb
-- lib/qi/action.rb
 homepage: https://github.com/sashite/qi.rb
 licenses:
 - MIT

data/lib/kernel.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-# shareable_constant_value: none
-
-# warn_indent: true
-
-require_relative File.join("qi", "action")
-
-# The Kernel module.
-module Kernel
-  # Abstraction to build positions.
-  #
-  # @return [Array] An action to change the position.
-  #
-  # @api public
-  def Qi(*captures, **squares)
-    ::Qi::Action.new(*captures, **squares)
-  end
-end

data/lib/qi/action.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Qi
-  # The Action abstraction.
-  class Action
-    CAPTURE_CHAR = "&"
-    DROP_CHAR    = "*"
-
-    # Action initializer.
-    def initialize(*captures, **squares)
-      @captures = captures
-      @squares  = squares
-    end
-
-    # Commit an action to the position.
-    #
-    # @return [Array] An action to change the position.
-    def call(**diffs)
-      captures = @captures + Array(diffs.delete(CAPTURE_CHAR))
-      drop     = diffs.delete(DROP_CHAR)
-
-      unless drop.nil?
-        index = captures.rindex(drop)
-        raise ::IndexError, "Piece #{drop.inspect} not captured!" if index.nil?
-
-        captures.delete_at(index)
-      end
-
-      squares = @squares.merge(diffs).compact
-
-      [captures.sort, squares]
-    end
-  end
-end