pgn 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b151e9dfbad65addcdbcc73985f280a1b7b42a55
-  data.tar.gz: 1aecd46315e114eec514ff627c442dd559bf5237
+  metadata.gz: 67674551215924868ef976e50328c035e718d064
+  data.tar.gz: 83baeece613b7cee8ccbdbdf648383bd03c94f55
 SHA512:
-  metadata.gz: 4bb8e0a0e1ca54fb4fb4644e96a68ef3162a16c3dfc6e602993fe6e195dd1fcbe9b31e42239a61f608ca15698ff126a51ea5f0f202433e83aa52e2b5cd92e8d5
-  data.tar.gz: 6f070630bebabc25cd9261819cd2beb0d3d7a0309dcba56244f6712fcd339fab0db154c1ae785b3d33ca1e3f1888576d0b4143d7ddd8d1fe52f7941dd585ee84
+  metadata.gz: 2dc3ad633890315dd863a7bf0892232761ebfb267f9769c4bec561bfe80d5125e0edabc631fd912e926d7039395c7920cbb9a2bf7c966adb24201fec6c7ab467
+  data.tar.gz: a85bad51cefc2a9d90cd19ac78db6e96ab97c7646c14c74c3daef10dc55c871c17ab516bea12b6a7e77b41d2a9d9879cf3ab852763e2df374292577bdc0b3f53

data/TODO.md

@@ -1,4 +1,12 @@
 # TODOs
 
-- `Game#to_pgn`
+## Parsing
+
+- Accept a more flexible input format
+- Support recursive variations
+- Support numeric annotation glyphs
+
+## Misc
+
+- Support converting a game to pgn format
 - Speed up parsing

data/lib/pgn/board.rb

@@ -13,14 +13,14 @@ module PGN
     # The starting, internal representation of a chess board
     #
     START = [
-      ["R", "P", "_", "_", "_", "_", "p", "r"],
-      ["N", "P", "_", "_", "_", "_", "p", "n"],
-      ["B", "P", "_", "_", "_", "_", "p", "b"],
-      ["Q", "P", "_", "_", "_", "_", "p", "q"],
-      ["K", "P", "_", "_", "_", "_", "p", "k"],
-      ["B", "P", "_", "_", "_", "_", "p", "b"],
-      ["N", "P", "_", "_", "_", "_", "p", "n"],
-      ["R", "P", "_", "_", "_", "_", "p", "r"],
+      ["R", "P", nil, nil, nil, nil, "p", "r"],
+      ["N", "P", nil, nil, nil, nil, "p", "n"],
+      ["B", "P", nil, nil, nil, nil, "p", "b"],
+      ["Q", "P", nil, nil, nil, nil, "p", "q"],
+      ["K", "P", nil, nil, nil, nil, "p", "k"],
+      ["B", "P", nil, nil, nil, nil, "p", "b"],
+      ["N", "P", nil, nil, nil, nil, "p", "n"],
+      ["R", "P", nil, nil, nil, nil, "p", "r"],
     ]
 
     FILE_TO_INDEX = {
@@ -62,7 +62,7 @@ module PGN
       'B' => "\u{2657}",
       'N' => "\u{2658}",
       'P' => "\u{2659}",
-      '_' => '_',
+      nil => '_',
     }
 
     attr_accessor :squares
@@ -77,14 +77,14 @@ module PGN
     # @example
     #   PGN::Board.new(
     #     [
-    #       ["R", "P", "_", "_", "_", "_", "p", "r"],
-    #       ["N", "P", "_", "_", "_", "_", "p", "n"],
-    #       ["B", "P", "_", "_", "_", "_", "p", "b"],
-    #       ["Q", "P", "_", "_", "_", "_", "p", "q"],
-    #       ["K", "P", "_", "_", "_", "_", "p", "k"],
-    #       ["B", "P", "_", "_", "_", "_", "p", "b"],
-    #       ["N", "P", "_", "_", "_", "_", "p", "n"],
-    #       ["R", "P", "_", "_", "_", "_", "p", "r"],
+    #       ["R", "P", nil, nil, nil, nil, "p", "r"],
+    #       ["N", "P", nil, nil, nil, nil, "p", "n"],
+    #       ["B", "P", nil, nil, nil, nil, "p", "b"],
+    #       ["Q", "P", nil, nil, nil, nil, "p", "q"],
+    #       ["K", "P", nil, nil, nil, nil, "p", "k"],
+    #       ["B", "P", nil, nil, nil, nil, "p", "b"],
+    #       ["N", "P", nil, nil, nil, nil, "p", "n"],
+    #       ["R", "P", nil, nil, nil, nil, "p", "r"],
     #     ]
     #   )
     #
@@ -106,14 +106,12 @@ module PGN
     #   board.at("e4") #=> "P"
     #
     def at(*args)
-      str = case args.length
+      case args.length
       when 1
         self.at(*coordinates_for(args.first))
       when 2
         self.squares[args[0]][args[1]]
       end
-
-      str == "_" ? nil : str
     end
 
     # @param changes [Hash<String, <String, nil>>] changes to make to the board
@@ -136,7 +134,7 @@ module PGN
     #
     def update(square, piece)
       coords = coordinates_for(square)
-      self.squares[coords[0]][coords[1]] = piece || "_"
+      self.squares[coords[0]][coords[1]] = piece
       self
     end
 

data/lib/pgn/fen.rb

@@ -87,6 +87,7 @@ module PGN
       squares = board_fen.gsub(/\d/) {|match| "_" * match.to_i }
                          .split("/")
                          .map {|row| row.split('') }
+                         .map {|row| row.map {|e| e == "_" ? nil : e } }
                          .reverse
                          .transpose
       self.board = PGN::Board.new(squares)
@@ -101,6 +102,7 @@ module PGN
           .squares
           .transpose
           .reverse
+          .map {|row| row.map {|e| e.nil? ? "_" : e } }
           .map {|row| row.join }
           .join("/")
           .gsub(/_+/) {|match| match.length }

data/lib/pgn/move_calculator.rb

@@ -90,13 +90,12 @@ module PGN
     def initialize(board, move)
       self.board = board
       self.move  = move
+      self.origin = compute_origin
     end
 
     # @return [PGN::Board] the board after the move is made
     #
     def result_board
-      compute_origin
-
       new_board = self.board.dup
       new_board.change!(changes)
 
@@ -106,8 +105,6 @@ module PGN
     # @return [Array<String>] which castling moves are no longer available
     #
     def castling_restrictions
-      compute_origin
-
       restrict = case self.move.piece
       when "K" then "KQ"
       when "k" then "kq"
@@ -140,8 +137,6 @@ module PGN
     # @return [String, nil] the en passant square if applicable
     #
     def en_passant_square
-      compute_origin
-
       return nil if move.castle
 
       if self.move.pawn? && (self.origin[1].to_i - self.move.destination[1].to_i).abs == 2
@@ -154,8 +149,6 @@ module PGN
     private
 
     def changes
-      compute_origin
-
       changes = {}
       changes.merge!(CASTLING[self.move.castle]) if self.move.castle
       changes.merge!(
@@ -178,19 +171,17 @@ module PGN
     def compute_origin
       return nil if move.castle
 
-      @origin ||= begin
-        possibilities = case move.piece
-        when /[brq]/i then direction_origins
-        when /[kn]/i  then move_origins
-        when /p/i     then pawn_origins
-        end
-
-        if possibilities.length > 1
-          possibilities = disambiguate(possibilities)
-        end
+      possibilities = case move.piece
+      when /[brq]/i then direction_origins
+      when /[kn]/i  then move_origins
+      when /p/i     then pawn_origins
+      end
 
-        self.board.position_for(possibilities.first)
+      if possibilities.length > 1
+        possibilities = disambiguate(possibilities)
       end
+
+      self.board.position_for(possibilities.first)
     end
 
     # From the destination square, move in each direction stopping if we

data/lib/pgn/version.rb

@@ -1,3 +1,3 @@
 module PGN
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stacey Touset