just_backgammon 0.1.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1ebb2844a2a6fef92a1ce1644cd4a16b984dbc0
-  data.tar.gz: 29d1a815550ca78b52da80cf48c3b7ab135e92f8
+SHA256:
+  metadata.gz: f9701bd389d703e4e3490389aca7cfa461ae8423ac1637cdab665b1c45ba8ac0
+  data.tar.gz: e8b8d3772b4e6d2f1f79985710786c775fcf7b0dd9925b7a8d993c4714b32b1e
 SHA512:
-  metadata.gz: 3d06f071fb46878e406ddfe2bb16707cba385282cfe730d99a8e935f21647bb86212fe14898d247bbf86cab26a6b1f203c5853f725931275db535b492d428721
-  data.tar.gz: e518b7e4825bb4e88656b301de9740bfa6137701ed3ff675b93d9add0cbf618072ee452e76e3a1ed45a7caefc68ec523a073a73624c4728b64ce63f7d414655d
+  metadata.gz: 6cbd24b890137042e410895ca3d7f5d1941dd307d8b64201c945bd7e16dfa194f205a6149ea5684db8740c864607913611b7858550f1a6e344b9926f8feda544
+  data.tar.gz: 858e12df9646c17baf8b09558c8db8a171ff32fc204a115fc2c38c52bd60b4203555cb2f6fbbef1c1fe8c17156c0289a0ac64ff20320328e54836716007d3d77

data/README.md

@@ -34,6 +34,12 @@ Moves can be made by passing in the player number, and an array of moves each co
   game_state.move(1, [{from: 1, to: 2}]])
 ```
 
+The last change with all its details are found in the `last_change` attribute
+
+```ruby
+  game_state.last_change
+```
+
 If something happens errors may be found in the errors attribute
 
 ```ruby

data/just_backgammon.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake", "~> 13.0.1"
+  spec.add_development_dependency "minitest", "~> 5.14.0"
 end

data/lib/just_backgammon/bar.rb

@@ -19,7 +19,7 @@ module JustBackgammon
     # ==== Example:
     #   # Instantiates a new Bar
     #   JustBackgammon::Bar.new({
-    #     pieces: [{owner: 1}, {owner: 1}]
+    #     pieces: [{player_number: 1}, {player_number: 1}]
     #   })
     def initialize(pieces:)
       @pieces = JustBackgammon::Piece.load(pieces)
@@ -44,7 +44,7 @@ module JustBackgammon
     #
     # @return [Array<Piece>]
     def pieces_owned_by_player(player_number)
-      pieces.select { |p| p.owner == player_number }
+      pieces.select { |p| p.player_number == player_number }
     end
 
     # Number of pieces owned by the specified player.
@@ -83,8 +83,8 @@ module JustBackgammon
     #   the specified player number.
     #
     # @return [Piece,NilClass]
-    def pop_for_player(player_number)
-      p = pieces.find { |p| p.owner == player_number }
+    def pop(player_number)
+      p = pieces.find { |p| p.player_number == player_number }
       pieces.delete(p)
     end
 
@@ -105,4 +105,4 @@ module JustBackgammon
       { pieces: pieces.map(&:as_json) }
     end
   end
-end
+end

data/lib/just_backgammon/common.rb

@@ -18,11 +18,11 @@ module JustBackgammon
     def load(argument)
       case argument
       when Hash
-        self.new(argument)
+        self.new(**argument)
       when Array
         case
         when argument.all? { |o| o.instance_of?(Hash) }
-          argument.map { |o| self.new(o) }
+          argument.map { |o| self.new(**o) }
         when argument.all? { |o| o.instance_of?(self) }
           argument
         else
@@ -35,4 +35,4 @@ module JustBackgammon
       end
     end
   end
-end
+end

data/lib/just_backgammon/dice_set.rb

@@ -51,7 +51,8 @@ module JustBackgammon
     def roll
       @dice.each(&:roll)
       if @dice.first == @dice.last
-        @dice.concat(@dice)
+        dup_dice = @dice.map { |d| Die.new(id: d.id + 2, number: d.number) }
+        @dice.concat(dup_dice)
       end
     end
 
@@ -72,4 +73,4 @@ module JustBackgammon
       dice.map(&:as_json)
     end
   end
-end
+end

data/lib/just_backgammon/die.rb

@@ -10,16 +10,23 @@ module JustBackgammon
 
     # A new instance of Die.
     #
+    # @param [Fixnum] id
+    #   The identifier of the die.
+    #
     # @param [Fixnum, NilClass] number
     #   The number of the die. Returns nil if not yet rolled.
     #
     # ==== Example:
     #   # Instantiates a new Die
-    #   JustBackgammon::Die.new(number: 1)
-    def initialize(number:)
+    #   JustBackgammon::Die.new(id: 1, number: 1)
+    def initialize(id: , number:)
+      @id = id
       @number = number
     end
 
+    # @return [Fixnum] the identifier of the die.
+    attr_reader :id
+
     # @return [Fixnum] the number of the die. Returns nil if not yet rolled
     attr_reader :number
 
@@ -48,7 +55,7 @@ module JustBackgammon
     #
     # @return [Hash]
     def as_json
-      { number: number }
+      { id: id, number: number }
     end
   end
-end
+end

data/lib/just_backgammon/game_state.rb

@@ -64,7 +64,7 @@ module JustBackgammon
     #       pieces: [],
     #     },
     #     points: [
-    #       { number: 1, pieces: [{owner: 1}, {owner: 1}] },
+    #       { number: 1, pieces: [{player_number: 1}, {player_number: 1}] },
     #       { number: 2, pieces: [] }
     #     ],
     #     off_board: {
@@ -79,51 +79,52 @@ module JustBackgammon
       @points = JustBackgammon::PointSet.load(points: points)
       @off_board = JustBackgammon::OffBoard.load(off_board)
       @errors = []
+      @last_change = {}
     end
 
     # Instantiates a new GameState object in the starting position
     #
     # @return [GameState]
     def self.default
-      new({
+      new(
         current_player_number: 1,
         current_phase: ROLL,
         dice: [
-          { number: nil },
-          { number: nil }
+          { id: 1, number: nil },
+          { id: 2, number: nil }
         ],
         bar: { pieces: [] },
         points: [
-          { number: 1, pieces: [{owner: 1}, {owner: 1}] },
+          { number: 1, pieces: [{id: 1, player_number: 1}, {id: 2, player_number: 1}] },
           { number: 2, pieces: [] },
           { number: 3, pieces: [] },
           { number: 4, pieces: [] },
           { number: 5, pieces: [] },
-          { number: 6, pieces: [{owner: 2}, {owner: 2}, {owner: 2}, {owner: 2}, {owner: 2}] },
+          { number: 6, pieces: [{id: 3, player_number: 2}, {id: 4, player_number: 2}, {id: 5, player_number: 2}, {id: 6, player_number: 2}, {id: 7, player_number: 2}] },
 
           { number: 7, pieces: [] },
-          { number: 8, pieces: [{owner: 2}, {owner: 2}, {owner: 2}] },
+          { number: 8, pieces: [{id: 8, player_number: 2}, {id: 9, player_number: 2}, {id: 10, player_number: 2}] },
           { number: 9, pieces: [] },
           { number: 10, pieces: [] },
           { number: 11, pieces: [] },
-          { number: 12, pieces: [{owner: 1}, {owner: 1}, {owner: 1}, {owner: 1}, {owner: 1}] },
+          { number: 12, pieces: [{id: 11, player_number: 1}, {id: 12, player_number: 1}, {id: 13, player_number: 1}, {id: 14, player_number: 1}, {id: 15, player_number: 1}] },
 
-          { number: 13, pieces: [{owner: 2}, {owner: 2}, {owner: 2}, {owner: 2}, {owner: 2}] },
+          { number: 13, pieces: [{id: 16, player_number: 2}, {id: 17, player_number: 2}, {id: 18, player_number: 2}, {id: 19, player_number: 2}, {id: 20, player_number: 2}] },
           { number: 14, pieces: [] },
           { number: 15, pieces: [] },
           { number: 16, pieces: [] },
-          { number: 17, pieces: [{owner: 1}, {owner: 1}, {owner: 1}] },
+          { number: 17, pieces: [{id: 21, player_number: 1}, {id: 22, player_number: 1}, {id: 23, player_number: 1}] },
           { number: 18, pieces: [] },
 
-          { number: 19, pieces: [{owner: 1}, {owner: 1}, {owner: 1}, {owner: 1}, {owner: 1}] },
+          { number: 19, pieces: [{id: 24, player_number: 1}, {id: 25, player_number: 1}, {id: 26, player_number: 1}, {id: 27, player_number: 1}, {id: 28, player_number: 1}] },
           { number: 20, pieces: [] },
           { number: 21, pieces: [] },
           { number: 22, pieces: [] },
           { number: 23, pieces: [] },
-          { number: 24, pieces: [{owner: 2}, {owner: 2}] },
+          { number: 24, pieces: [{id: 29, player_number: 2}, {id: 30, player_number: 2}] },
         ],
         off_board: { pieces: [] }
-      })
+      )
     end
 
     # @return [Fixnum] who's turn it is
@@ -147,6 +148,9 @@ module JustBackgammon
     # @return [Array<Error>] errors if any.
     attr_reader :errors
 
+    # @return [Hash] the last change made.
+    attr_reader :last_change
+
     # Rolls the dice
     #
     # Two dice are rolled and returns true on success.
@@ -172,6 +176,7 @@ module JustBackgammon
       else
         @dice.roll
         step
+        @last_change = { type: 'roll', data: { player_number: player_number, dice: @dice.as_json } }
       end
 
       @errors.none?
@@ -204,6 +209,7 @@ module JustBackgammon
       elsif move_valid?(move_list)
         perform_move(move_list)
         step
+        @last_change = { type: 'move', data: { player_number: player_number, list: list }}
       end
 
       @errors.none?
@@ -261,18 +267,12 @@ module JustBackgammon
 
     def perform_move(list)  # :nodoc:
       list.each do |move|
-        from = find_point(move.from.number)
-        to = find_point(move.to.number)
+        from = move.from
+        to = move.to
 
-        if to.is_a?(JustBackgammon::Point) && to.owned_by_opponent?(current_player_number) && to.blot?
-          @bar.push(to.pop)
-        end
+        @bar.push(to.pop) if to.hittable?(current_player_number)
 
-        popped = if from.is_a?(JustBackgammon::Bar)
-          from.pop_for_player(current_player_number)
-        else
-          from.pop
-        end
+        popped = from.pop(current_player_number)
 
         to.push(popped)
       end
@@ -311,9 +311,9 @@ module JustBackgammon
 
     def sanitize_list(move_list)  # :nodoc:
       moves = move_list.map do |move|
-        JustBackgammon::Move.new({ from: find_point(move[:from]),  to: find_point(move[:to]) })
+        JustBackgammon::Move.new(from: find_point(move[:from]),  to: find_point(move[:to]))
       end
       JustBackgammon::MoveList.new(moves: moves)
     end
   end
-end
+end

data/lib/just_backgammon/off_board.rb

@@ -1,4 +1,3 @@
-require 'just_backgammon/off_board'
 require 'just_backgammon/piece'
 
 module JustBackgammon
@@ -12,18 +11,18 @@ module JustBackgammon
     # A new instance of OffBoard.
     #
     # @param [Array<Hash>] pieces
-    #   All the pieces off board, each piece has an owner.
+    #   All the pieces off board, each piece has an player_number.
     #
     # ==== Example:
     #   # Instantiates a new OffBoard
     #   JustBackgammon::OffBoard.new({
-    #     pieces: [{owner: 1}, {owner: 1}]
+    #     pieces: [{player_number: 1}, {player_number: 1}]
     #   })
     def initialize(pieces:)
       @pieces = Piece.load(pieces)
     end
 
-    # @return [Array<Piece>] all the pieces on the bar, each piece has an owner
+    # @return [Array<Piece>] all the pieces on the bar, each piece has an player_number
     attr_reader :pieces
 
     # The identifier of the bar, returns the string 'bar'.
@@ -40,7 +39,7 @@ module JustBackgammon
     #
     # @return [Array<Piece>]
     def pieces_owned_by_player(player_number)
-      pieces.select { |p| p.owner == player_number }
+      pieces.select { |p| p.player_number == player_number }
     end
 
     # Number of pieces owned by the specified player.
@@ -63,6 +62,10 @@ module JustBackgammon
       @pieces.push(piece)
     end
 
+    def hittable?(_=nil)
+      false
+    end
+
     # A hashed serialized representation of off board.
     #
     # @return [Hash]
@@ -70,4 +73,4 @@ module JustBackgammon
       { pieces: pieces.map(&:as_json) }
     end
   end
-end
+end

data/lib/just_backgammon/piece.rb

@@ -10,24 +10,31 @@ module JustBackgammon
 
     # A new instance of Piece.
     #
-    # @param [Fixnum] owner
+    # @param [Fixnum] id
+    #   The identifier of the piece.
+    #
+    # @param [Fixnum] player_number
     #   The owner of the piece.
     #
     # ==== Example:
     #   # Instantiates a new Piece
-    #   JustBackgammon::Piece.new(1)
-    def initialize(owner:)
-      @owner = owner
+    #   JustBackgammon::Piece.new(id: 1, player_number: 1)
+    def initialize(id: , player_number:)
+      @id = id
+      @player_number = player_number
     end
 
+    # @return [Fixnum] the identifier of the piece.
+    attr_reader :id
+
     # @return [Fixnum] the owner of the piece
-    attr_reader :owner
+    attr_reader :player_number
 
     # A hashed serialized representation of the piece.
     #
     # @return [Hash]
     def as_json
-      { owner: owner }
+      { id: id, player_number: player_number }
     end
   end
-end
+end

data/lib/just_backgammon/point.rb

@@ -22,7 +22,7 @@ module JustBackgammon
     # ==== Example:
     #   # Instantiates a new Point
     #   JustBackgammon::Point.new({
-    #     pieces: [{owner: 1}, {owner: 1}],
+    #     pieces: [{player_number: 1}, {player_number: 1}],
     #     number: 1
     #   })
     def initialize(pieces: , number:)
@@ -42,7 +42,7 @@ module JustBackgammon
     # Removes a piece and returns it.
     #
     # @return [Piece,NilClass]
-    def pop
+    def pop(_=nil)
       @pieces.pop
     end
 
@@ -57,14 +57,14 @@ module JustBackgammon
     #
     # @return [Boolean]
     def owned_by_player?(player_number)
-      pieces.any? { |p| p.owner == player_number }
+      pieces.any? { |p| p.player_number == player_number }
     end
 
     # Checks if point has pieces owned by the opponent of the specified player.
     #
     # @return [Boolean]
     def owned_by_opponent?(player_number)
-      pieces.any? { |p| p.owner != player_number }
+      pieces.any? { |p| p.player_number != player_number }
     end
 
     # Checks if point has more than one piece.
@@ -95,6 +95,10 @@ module JustBackgammon
       end
     end
 
+    def hittable?(player_number)
+      owned_by_opponent?(player_number) && blot?
+    end
+
     # A hashed serialized representation of the bar.
     #
     # @return [Hash]
@@ -102,4 +106,4 @@ module JustBackgammon
       { number: number, pieces: pieces.map(&:as_json) }
     end
   end
-end
+end

data/lib/just_backgammon/version.rb

@@ -1,4 +1,4 @@
 module JustBackgammon
   # :nodoc:
-  VERSION = "0.1.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: just_backgammon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.14.0
 description: Provides a representation of a backgammon game complete with rules enforcement
   and serialisation.
 email:
@@ -108,15 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A backgammon engine written in ruby