portable_move_notation 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea18bccd3175b8aa44c30320449202c692edd0e62f5024b0f1a35a912124f52
-  data.tar.gz: 0d57d166480c1c823b8ef6a6d6d4333947c467eebe3fc8f3386e72a217faaf19
+  metadata.gz: 73a731b3522fb1d2baf81b537a87f984f58606fcdbd248f2f83de88a4b060296
+  data.tar.gz: b8d8312a438c55ec0420a473f99ba1a91030f755bc571c80cfd7ecee7b8c2d88
 SHA512:
-  metadata.gz: cfd09a1595d388851a9e9e286f83abf130005c2a883938a369bee3111fce52631e8b22b79f7f21d3cb9415dc3e09a9b7e9ea8c36724a7eb28072eb76b9af0110
-  data.tar.gz: 6f2be96f2952714b6977d6c2e811a67ef0c4d07fa4b324b5c98b754d8e8572961f74ce6a2c2b27336b57fb7a3145daf54b078d798d737845bacbcc039bc458ee
+  metadata.gz: 3e476824bb39f33c3531fce025ce31cb301a12a8b08a1b2cdfde8c7513617a2df74fe22f9e98d09d66257334865752218fdf3888cd62bbf4bde3216c03d99a07
+  data.tar.gz: b65d9ca2de5d5508d3bafafe1faa1166bde086e5237692a6b2e292d55f8523977f6eb968eb65f9c95df76287a7e8e1e4c707d6cab8fab92d5b18ecffb752677b

data/README.md

@@ -25,56 +25,48 @@ Working with PMN can be very simple, for example:
 ```ruby
 require 'portable_move_notation'
 
-# Parse a PMN string
-
-PortableMoveNotation.parse('52,36,C:P.12,28,c:p.53,37,C:P') # => [[52, 36, 'C:P', nil], [12, 28, 'c:p', nil], [53, 37, 'C:P', nil]]
-
-# Emit some PMN
+# Emit a PMN string
 
 some_moves = [
-  [52, 36, 'C:P', nil],
-  [12, 28, 'c:p', nil],
-  [53, 37, 'C:P', nil]
+  [52, 36, '♙', nil],
+  [12, 28, '♟', nil],
+  [53, 37, '♙', nil]
 ]
 
-PortableMoveNotation.dump(*some_moves) # => '52,36,C:P.12,28,c:p.53,37,C:P'
-```
-
-### Other examples
+PortableMoveNotation.dump(*some_moves) # => "52,36,♙.12,28,♟.53,37,♙"
 
-#### Castling on kingside
+# Parse a PMN string
 
-```ruby
-PortableMoveNotation.parse('60,62,C:-K;63,61,C:R') # => [[60, 62, 'C:-K', nil, 63, 61, 'C:R', nil]]
-PortableMoveNotation.dump(*[[[60, 62, 'C:-K', nil], [63, 61, 'C:R', nil]]]) # => '60,62,C:-K;63,61,C:R'
+PortableMoveNotation.parse('52,36,♙.12,28,♟.53,37,♙') # => [[52, 36, "♙", nil], [12, 28, "♟", nil], [53, 37, "♙", nil]]
 ```
 
-#### Promoting a chess pawn into a knight
+## Examples
 
 ```ruby
-PortableMoveNotation.parse('12,4,C:P,C:N') # => [[12, 4, 'C:P', 'C:N']]
-PortableMoveNotation.dump(*[[[12, 4, 'C:P', 'C:N']]]) # => '12,4,C:P,C:N'
-```
+# Black castles on king-side
 
-#### Promoting a shogi pawn
+PortableMoveNotation.dump([60, 62, '♔', nil, 63, 61, '♖', nil]) # => "60,62,♔;63,61,♖"
+PortableMoveNotation.parse('60,62,♔;63,61,♖') # => [[60, 62, "♔", nil, 63, 61, "♖", nil]]
 
-```ruby
-PortableMoveNotation.parse('33,24,S:P,S:+P') # => [[33, 24, 'S:P', 'S:+P']]
-PortableMoveNotation.dump(*[[[33, 24, 'S:P', 'S:+P']]]) # => '33,24,S:P,S:+P'
-```
+# Promoting a chess pawn into a knight
 
-#### Dropping a shogi pawn
+PortableMoveNotation.dump([12, 4, '♘', nil]) # => "12,4,♘"
+PortableMoveNotation.parse('12,4,♘') # => [[12, 4, "♘", nil]]
 
-```ruby
-PortableMoveNotation.parse('*,42,S:P') # => [[nil, 42, 'S:P', nil]]
-PortableMoveNotation.dump(*[[[nil, 42, 'S:P', nil]]]) # => '*,42,S:P'
-```
+# Capturing a rook and promoting a shogi pawn
 
-#### Capturing a white chess pawn en passant
+PortableMoveNotation.dump([33, 24, '+P', 'R']) # => "33,24,+P,R"
+PortableMoveNotation.parse('33,24,+P,R') # => [[33, 24, "+P", "R"]]
 
-```ruby
-PortableMoveNotation.parse('48,32,C:P.33,32,c:p;32,40,c:p') # => [[48, 32, 'C:P', nil], [33, 32, 'c:p', nil, 32, 40, 'c:p', nil]]
-PortableMoveNotation.dump(*[[[48, 32, 'C:P', nil]], [[33, 32, 'c:p', nil], [32, 40, 'c:p', nil]]]) # => '48,32,C:P.33,32,c:p;32,40,c:p'
+# Dropping a shogi pawn
+
+PortableMoveNotation.dump([nil, 42, 'P', nil]) # => "*,42,P"
+PortableMoveNotation.parse('*,42,P') # => [[nil, 42, "P", nil]]
+
+# Capturing a white chess pawn en passant
+
+PortableMoveNotation.dump([48, 32, '♙', nil], [33, 32, '♟', nil, 32, 40, '♟', nil]) # => "48,32,♙.33,32,♟;32,40,♟"
+PortableMoveNotation.parse('48,32,♙.33,32,♟;32,40,♟') # => [[48, 32, "♙", nil], [33, 32, "♟", nil, 32, 40, "♟", nil]]
 ```
 
 ## License

data/lib/portable_move_notation/dumper.rb

@@ -3,12 +3,12 @@
 module PortableMoveNotation
   class Dumper
     def self.call(*unserialized_moves)
-      unserialized_moves.map do |move|
-        actions = move.each_slice(4)
-        Action::Dumper.call(*actions)
+      unserialized_moves.map do |unserialized_move|
+        unserialized_actions = unserialized_move.each_slice(4)
+        ::Sashite::PAN::Dumper.call(*unserialized_actions)
       end.join('.')
     end
   end
 end
 
-require_relative 'action/dumper'
+require 'sashite/pan/dumper'

data/lib/portable_move_notation/parser.rb

@@ -3,11 +3,11 @@
 module PortableMoveNotation
   class Parser
     def self.call(serialized_moves_string)
-      serialized_moves_string.split('.').map do |serialized_actions|
-        Action::Parser.call(serialized_actions)
+      serialized_moves_string.split('.').map do |serialized_actions_string|
+        ::Sashite::PAN::Parser.call(serialized_actions_string).flatten(1)
       end
     end
   end
 end
 
-require_relative 'action/parser'
+require 'sashite/pan/parser'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: portable_move_notation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sashite-pan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -132,8 +146,6 @@ files:
 - LICENSE.md
 - README.md
 - lib/portable_move_notation.rb
-- lib/portable_move_notation/action/dumper.rb
-- lib/portable_move_notation/action/parser.rb
 - lib/portable_move_notation/dumper.rb
 - lib/portable_move_notation/parser.rb
 homepage: https://developer.sashite.com/specs/portable-move-notation
@@ -143,7 +155,6 @@ metadata:
   bug_tracker_uri: https://github.com/sashite/portable_move_notation.rb/issues
   documentation_uri: https://rubydoc.info/gems/portable_move_notation/index
   source_code_uri: https://github.com/sashite/portable_move_notation.rb
-  wiki_uri: https://github.com/sashite/portable_move_notation.rb/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/portable_move_notation/action/dumper.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module PortableMoveNotation
-  module Action
-    class Dumper
-      def self.call(*unserialized_actions)
-        unserialized_actions.map { |params| new(*params).call }.join(';')
-      end
-
-      attr_reader :src_square, :dst_square, :piece_name, :piece_hand
-
-      def initialize(src_square, dst_square, piece_name, piece_hand)
-        unless src_square.nil?
-          raise src_square.inspect unless src_square.is_a?(Integer)
-        end
-
-        raise dst_square.inspect unless dst_square.is_a?(Integer)
-        raise piece_name.inspect unless piece_name.is_a?(String)
-
-        unless piece_hand.nil?
-          raise piece_hand.inspect unless piece_hand.is_a?(String)
-        end
-
-        @src_square = (src_square.nil? ? '*' : src_square)
-        @dst_square = dst_square
-        @piece_name = piece_name
-        @piece_hand = piece_hand
-      end
-
-      def call
-        action_items.join(',')
-      end
-
-      private
-
-      def action_items
-        return [src_square, dst_square, piece_name] if piece_hand.nil?
-
-        [src_square, dst_square, piece_name, piece_hand]
-      end
-    end
-  end
-end

data/lib/portable_move_notation/action/parser.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module PortableMoveNotation
-  module Action
-    class Parser
-      def self.call(serialized_actions)
-        serialized_actions.split(';').flat_map do |serialized_action|
-          new(serialized_action).call
-        end
-      end
-
-      attr_reader :serialized_action
-
-      def initialize(serialized_action)
-        @serialized_action = serialized_action
-      end
-
-      def call
-        action_args = serialized_action.split(',')
-
-        src_square = action_args.fetch(0)
-        src_square = src_square.eql?('*') ? nil : src_square.to_i
-        dst_square = action_args.fetch(1).to_i
-        piece_name = action_args.fetch(2)
-        piece_hand = action_args.fetch(3, nil)
-
-        [src_square, dst_square, piece_name, piece_hand]
-      end
-    end
-  end
-end