pgn 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d868495f784cc03dedf3465023bffe390d7228f5
-  data.tar.gz: d12ab910e19cac3c20cb2ed965fd460eadc1b657
+  metadata.gz: a5c9a8ca0a6c732bd3ec99585b21929c1710976e
+  data.tar.gz: ff812fc594259ffa25370d3e35eed074c56a3c41
 SHA512:
-  metadata.gz: 790ce8940ab3aa672edb725073847d6c2154335afb9403d71acfdfa835a68658b6d2e2dced3d80f99291cafc361721482ae2f0982bd1221023bd9727b256a710
-  data.tar.gz: dac60e56ab33829619c706f2e4aab434b1fa4ef61833dd8ff1b1ed6e6547ab95557b72cb371d3462d9dc9cc78995ea73b91da1cb393dfb6717e6add315fcf7e1
+  metadata.gz: 05e7faa858c9ee725416c0c87021ac2b3440407b41de732ce6049f446ede8736e039c7f0a8658cba5dced9c6d27a07ad50e0c176e04afbede60cb959c2d267a9
+  data.tar.gz: c5d008c3d2d579dd39b3ab76889cf697252d12eac55f5cab69665dd04b2cbc03227de4487325a476a45b1fe9a435e1fb41ad775b456fd5e5b5297fafc4624cbe

data/lib/pgn/move_calculator.rb

@@ -170,7 +170,7 @@ module PGN
         changes[self.move.destination] = self.move.promotion
       end
 
-      changes.reject! {|key, _| key.nil? }
+      changes.reject! {|key, _| key.nil? or key.empty? }
 
       changes
     end

data/lib/pgn/parser.rb

@@ -5,46 +5,48 @@ module PGN
   # context free grammar.
   #
   class Parser < Whittle::Parser
-    rule(:wsp => /\s+/).skip!
+    rule(wsp: /\s+/).skip!
 
-    rule("[")
-    rule("]")
-    rule("(")
-    rule(")")
+    rule('[')
+    rule(']')
+    rule('(')
+    rule(')')
 
     start(:pgn_database)
 
     rule(:pgn_database) do |r|
       r[].as { [] }
-      r[:pgn_game, :pgn_database].as {|game, database| database << game }
+      r[:pgn_game, :pgn_database].as { |game, database| database << game }
     end
 
     rule(:pgn_game) do |r|
-      r[:tag_section, :movetext_section].as {|tags, moves| {tags: tags, result: moves.pop, moves: moves} }
+      r[:tag_section, :movetext_section].as do |tags, moves|
+        { tags: tags, result: moves.pop, moves: moves }
+      end
     end
 
     rule(:tag_section) do |r|
-      r[:tag_pair, :tag_section].as {|pair, section| section.merge(pair) }
+      r[:tag_pair, :tag_section].as { |pair, section| section.merge(pair) }
       r[:tag_pair]
     end
 
     rule(:tag_pair) do |r|
-      r["[", :tag_name, :tag_value, "]"].as {|_, a, b, _| {a => b} }
+      r['[', :tag_name, :tag_value, ']'].as { |_, a, b, _| { a => b } }
     end
 
     rule(:tag_value) do |r|
-      r[:string].as {|value| value[1...-1] }
+      r[:string].as { |value| value[1...-1] }
     end
 
     rule(:movetext_section) do |r|
-      r[:element_sequence, :game_termination].as {|a, b| a.reverse << b }
+      r[:element_sequence, :game_termination].as { |a, b| a.reverse << b }
     end
 
     rule(:element_sequence) do |r|
-      r[:element, :element_sequence].as {|element, sequence| element.nil? ? sequence : sequence << element }
+      r[:element, :element_sequence].as do |element, sequence|
+        element.nil? ? sequence : sequence << element
+      end
       r[].as { [] }
-      #r[:recursive_variation, :element_sequence]
-      #r[:recursive_variation]
     end
 
     rule(:element) do |r|
@@ -56,34 +58,36 @@ module PGN
       end
       r[:comment].as { nil }
     end
-    
+
     rule(:san_move_annotated) do |r|
       r[:san_move].as { |move| MoveText.new(move) }
-      r[:san_move, :comment].as { |move, comment| MoveText.new(move, nil, comment) }
-      r[:san_move, :numeric_annotation_glyph].as { |move, annotation| MoveText.new(move, annotation) }
-      r[:san_move, :numeric_annotation_glyph, :comment].as { |move, annotation, comment| MoveText.new(move, annotation, comment) }
+      r[:san_move, :comment].as do |move, comment|
+        MoveText.new(move, nil, comment)
+      end
+      r[:san_move, :numeric_annotation_glyph].as do |move, annotation|
+        MoveText.new(move, annotation)
+      end
+      r[:san_move, :numeric_annotation_glyph, :comment].as do |move, annotation, comment|
+        MoveText.new(move, annotation, comment)
+      end
+      r[:san_move, :comment, :numeric_annotation_glyph].as do |move, comment, annotation|
+        MoveText.new(move, annotation, comment)
+      end
     end
 
     rule(:variation_list) do |r|
-        r[:variation, :variation_list].as { |variation, sequence| sequence << variation }
-        r[:variation].as { |v| [v] }
+      r[:variation, :variation_list].as do |variation, sequence|
+        sequence << variation
+      end
+      r[:variation].as { |v| [v] }
     end
-    
+
     rule(:variation) do |r|
-      r["(", :element_sequence, ")"].as { |_, sequence, _| sequence }
+      r['(', :element_sequence, ')'].as { |_, sequence, _| sequence }
     end
 
-#     rule(:variation_sequence) do |r|
-#       r[:element, :variation_sequence]
-#       r[].as { [] }
-#     end
-
-    #rule(:recursive_variation) do |r|
-      #r["(", :element_sequence, ")"]
-    #end
-
     rule(
-      :string => %r{
+      string: /
         "                          # beginning of string
         (
           [[:print:]&&[^\\"]] |    # printing characters except quote and backslash
@@ -91,25 +95,28 @@ module PGN
           \\"                      # escaped quotation marks
         )*                         # zero or more of the above
         "                          # end of string
-      }x
+      /x
     )
 
     rule(
-      :comment => %r{
-        \{                         # beginning of comment
+      comment: /
         (
-          [[:print:]&&[^\\\}]] |   # printing characters except closing brace and backslash
-          \n                   |
-          \\\\                 |   # escaped backslashes
-          \\\}|\\\}            |   # escaped braces
-          \n                       # newlines
-        )*                         # zero or more of the above
-        \}                         # end of comment
-      }x
+          \{                           # beginning of comment
+          (
+            [[:print:]&&[^\\\{\}]] |   # printing characters except brace and backslash
+            \n                     |
+            \\\\                   |   # escaped backslashes
+            \\\{|\\\}              |   # escaped braces
+            \n                     |   # newlines
+            \g<1>                      # recursive
+          )*                           # zero or more of the above
+          \}                           # end of comment
+        )
+      /x
     )
 
     rule(
-      :game_termination => %r{
+      game_termination: %r{
         1-0       |    # white wins
         0-1       |    # black wins
         1\/2-1\/2 |    # draw
@@ -118,14 +125,15 @@ module PGN
     )
 
     rule(
-      :move_number_indication => %r{
+      move_number_indication: /
         [[:digit:]]+\.*    # one or more digits followed by zero or more periods
-      }x
+      /x
     )
 
     rule(
-      :san_move => %r{
+      san_move: %r{
         (
+          --                           |    # "don't care" move (used in variations)
           [O0](-[O0]){1,2}             |    # castling (O-O, O-O-O)
           [a-h][1-8]                   |    # pawn moves (e4, d7)
           [BKNQR][a-h1-8]?x?[a-h][1-8] |    # major piece moves w/ optional specifier
@@ -144,16 +152,16 @@ module PGN
     )
 
     rule(
-      :tag_name => %r{
+      tag_name: /
         [A-Za-z0-9_]+    # letters, digits and underscores only
-      }x
+      /x
     )
 
     rule(
-      :numeric_annotation_glyph => %r{
+      numeric_annotation_glyph: /
         \$\d+       | # dollar sign followed by an integer from 0 to 255
         [\?!][\?!]?   # support the most used annotations directly
-      }x
+      /x
     )
   end
 end

data/lib/pgn/version.rb

@@ -1,3 +1,3 @@
 module PGN
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/parser_spec.rb

@@ -1,84 +1,84 @@
 require 'spec_helper'
 
 describe PGN do
-  describe "parsing a file" do
-    it "should return a list of games" do
-      games = PGN.parse(File.read("./examples/immortal_game.pgn"))
+  describe '.parse' do
+    it 'should return a list of games' do
+      games = PGN.parse(File.read('./examples/immortal_game.pgn'))
       games.length.should == 1
       game = games.first
-      game.result.should == "1-0"
-      game.tags["White"].should == "Adolf Anderssen"
-      game.moves.last.should == "Be7#"
+      game.result.should == '1-0'
+      game.tags['White'].should == 'Adolf Anderssen'
+      game.moves.last.should == 'Be7#'
     end
-  end
 
-  context "alternate castling notation" do
-    describe "parsing a file" do
-      it "should return a list of games" do
-        games = PGN.parse(File.read("./spec/pgn_files/alternate_castling.pgn"))
-        game = games.first
-        game.tags["White"].should == "Somebody"
-        game.result.should == "*"
-        game.moves.last.should == "O-O-O"
-      end
+    it 'should handle alternate castling notation' do
+      games = PGN.parse(File.read('./spec/pgn_files/alternate_castling.pgn'))
+      game = games.first
+      game.tags['White'].should == 'Somebody'
+      game.result.should == '*'
+      game.moves.last.should == 'O-O-O'
     end
-  end
 
-  context "annotations" do
-    describe "parsing a file" do
-      it "should return a list of games" do
-        games = PGN.parse(File.read("./spec/pgn_files/annotations.pgn"))
-        games.each do |game|
-          game.tags["White"].should == "Fool"
-          game.result.should == "0-1"
-          game.moves.last.should == "Qh4#"
-        end
+    it 'should handle annotations' do
+      games = PGN.parse(File.read('./spec/pgn_files/annotations.pgn'))
+      games.each do |game|
+        game.tags['White'].should == 'Fool'
+        game.result.should == '0-1'
+        game.moves.last.should == 'Qh4#'
       end
     end
 
-    describe "parsing a file" do
-      it "should work with comments" do
-        games = PGN.parse(File.read("./spec/pgn_files/comments.pgn"))
-        game = games.first
-        game.tags["White"].should == "Scholar"
-        game.result.should == "1-0"
-        game.moves.last.should == "Qxf7#"
-      end
+    it 'should handle comments' do
+      games = PGN.parse(File.read('./spec/pgn_files/comments.pgn'))
+      game = games.first
+      game.tags['White'].should == 'Scholar'
+      game.result.should == '1-0'
+      game.moves.last.should == 'Qxf7#'
+    end
 
-      it "should work with multiline comments" do
-        games = PGN.parse(File.read("./spec/pgn_files/multiline_comments.pgn"))
-        game = games.first
-        game.tags["White"].should == "Scholar"
-        game.result.should == "1-0"
-        game.moves.last.should == "Qxf7#"
-      end
+    it 'should handle multiline comments' do
+      games = PGN.parse(File.read('./spec/pgn_files/multiline_comments.pgn'))
+      game = games.first
+      game.tags['White'].should == 'Scholar'
+      game.result.should == '1-0'
+      game.moves.last.should == 'Qxf7#'
     end
 
-    describe "parsing a file" do
-      it "should return a list of games" do
-        games = PGN.parse(File.read("./spec/pgn_files/variations.pgn"))
-        game = games.first
-        game.tags["Black"].should == "Petrov"
-        game.result.should == "*"
-        game.moves.last.should == "Nf6"
-      end
+    it 'should handle nested comments' do
+      games = PGN.parse(File.read('./spec/pgn_files/nested_comments.pgn'))
+      game = games.first
+      game.result.should == '*'
+      game.moves.last.should == 'Nf6'
     end
-    
-    describe "parsing a complex file" do
-      it "should return a list of games" do
-        games = PGN.parse(File.read("./spec/pgn_files/test.pgn"))
-        game = games.first
-        game.tags["Black"].should == "Gelfand, Boris"
-        game.result.should == "1-0"
-        game.moves[13].should == "Nfd7"
-        game.moves[34].should == "f3"
-        game.moves[35].annotation.should == "$6"
-        game.moves[35].comment.should == "{Gelfand\ndecide tomar medidas.}"
-        game.moves[35].variations.size.should == 1
-        variation = game.moves[35].variations[0]
-        variation.size.should == 2
-        variation[0].should == "Nxf3"
-      end
+
+    it 'should handle variations' do
+      games = PGN.parse(File.read('./spec/pgn_files/variations.pgn'))
+      game = games.first
+      game.tags['Black'].should == 'Petrov'
+      game.result.should == '*'
+      game.moves.last.should == 'Nf6'
+    end
+
+    it 'should handle empty variation moves' do
+      games = PGN.parse(File.read('./spec/pgn_files/empty_variation_move.pgn'))
+      game = games.first
+      game.result.should == '*'
+      game.moves.last.should == 'Ng5'
+    end
+
+    it 'should handle complex files' do
+      games = PGN.parse(File.read('./spec/pgn_files/test.pgn'))
+      game = games.first
+      game.tags['Black'].should == 'Gelfand, Boris'
+      game.result.should == '1-0'
+      game.moves[13].should == 'Nfd7'
+      game.moves[34].should == 'f3'
+      game.moves[35].annotation.should == '$6'
+      game.moves[35].comment.should == "{Gelfand\ndecide tomar medidas.}"
+      game.moves[35].variations.size.should == 1
+      variation = game.moves[35].variations[0]
+      variation.size.should == 2
+      variation[0].should == 'Nxf3'
     end
   end
 end

data/spec/pgn_files/empty_variation_move.pgn

@@ -0,0 +1,11 @@
+[White "Somebody"]
+[Black "Somebody Else"]
+
+1. d4 e6 2. c4 d5 3. Nc3 c6 4. Nf3 Nf6 5. Bg5 Nbd7 6. e3 Qa5 7. a3 (7. cxd5
+Nxd5 8. Rc1 {Analyzer's primary variation: 8... Bb4 9. Qd2 e5 10. e4 Nxc3 11.
+bxc3 Ba3 12. Rb1 h6 13. Be3 O-O 14. Bc4 exd4 15. cxd4 Qxd2+ 16. Nxd2 a5 17. O-O
+b5 18. Be2 Rd8 19. d5 cxd5 20. exd5 Nc5 21. Rxb5 Rxd5 {+0.30/21} }) 7... Ne4 8.
+Rc1 Nxg5 9. Nxg5 dxc4 10. Bxc4 Qxg5 11. O-O Nf6 12. Qf3 Qg4 13.  Qxg4 Nxg4 14.
+Ne4 Be7 15. b4 O-O 16. Rce1 Nf6 17. Ng5 ({Better is} 17. Nxf6+ gxf6 {-4.08/31}
+(17... Bxf6) (17... gxf6)) (17. Nxf6+) 17... h6 18. Nf3 Ne4 ({Treatening} 18...
+-- 19. Ra1 b5 {-4.05/31}) 19. Bd3 Ng5 *

data/spec/pgn_files/nested_comments.pgn

@@ -0,0 +1,4 @@
+[White "Somebody"]
+[Black "Somebody Else"]
+
+1. e4 e5 2. Nf3 {this {is a} nested {comment}} 2... Nf6 *

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Stacey Touset
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: whittle
@@ -97,7 +97,9 @@ files:
 - spec/pgn_files/alternate_castling.pgn
 - spec/pgn_files/annotations.pgn
 - spec/pgn_files/comments.pgn
+- spec/pgn_files/empty_variation_move.pgn
 - spec/pgn_files/multiline_comments.pgn
+- spec/pgn_files/nested_comments.pgn
 - spec/pgn_files/test.pgn
 - spec/pgn_files/variations.pgn
 - spec/position_spec.rb
@@ -133,7 +135,9 @@ test_files:
 - spec/pgn_files/alternate_castling.pgn
 - spec/pgn_files/annotations.pgn
 - spec/pgn_files/comments.pgn
+- spec/pgn_files/empty_variation_move.pgn
 - spec/pgn_files/multiline_comments.pgn
+- spec/pgn_files/nested_comments.pgn
 - spec/pgn_files/test.pgn
 - spec/pgn_files/variations.pgn
 - spec/position_spec.rb