acpc_poker_types 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43b20038af9069a45fed735f016b7c3082a882d
-  data.tar.gz: dbd1b22c8d6c84ad06f8560728084a000b6a61d3
+  metadata.gz: 61dde71cbe5078bb8420f94dc3205f3c5068d207
+  data.tar.gz: 539221fc8a9eded8eb4f67e3665f1c249d5d20fe
 SHA512:
-  metadata.gz: 99611a882a44a52bdde8f0f3668cf90509735cb0cff5df8c35da7e4839e6b4b0b9a502c12e28ccef5e1f0c13706d65bbbf0e15062c812706888b62ad98ece0a3
-  data.tar.gz: 3ecdf8af9868049c0b28eb332386172ff450d1ab5bce47e5a29086b99b33f156cee5359c09b1684b72e8e0ccd5859c62aa803f6f918693b7eb9eafed0e2ac3ce
+  metadata.gz: edcd59b6a50857689d793352d1ac4ce92d0940527e051ca1bb2d96cde5341f56e63a1a1390e1c264e56044fb9d514783e6a262a7df6067abbb466271b140411e
+  data.tar.gz: 3d645d72f22c5fdd38df91f9ae8c99b39c4b4584e99f02d9a21fd6c5dd0021ff268421f83ff6c4105df354be332f14d59b6053b55ad99f861ae3926919a8a83b

data/lib/acpc_poker_types/match_state.rb

@@ -162,8 +162,8 @@ class MatchState
   def community_cards
     @community_cards ||= -> do
       lcl_community_cards = BoardCards.new(
-        all_sets_of_community_cards(@community_cards_string).map do |cards_in_round|
-          Card.cards(cards_in_round)
+        all_sets_of_community_cards(@community_cards_string).map do |cards_per_round|
+          Card.cards(cards_per_round)
         end
       )
       if lcl_community_cards.round < @community_cards_string.count(COMMUNITY_CARD_SEPARATOR)
@@ -262,39 +262,11 @@ class MatchState
   def every_action(game_def)
     @players = players_at_hand_start game_def.chip_stacks, game_def.blinds
 
-    last_round = -1
     @next_to_act = game_def.first_player_positions.first
     @player_acting_sequence = []
     @min_wager_by = game_def.min_wagers.first
-    every_action_token do |action, round|
-      if round != last_round
-        @min_wager_by = game_def.min_wagers[round]
-        @next_to_act = @players.position_of_first_active_player(
-          game_def.first_player_positions[round]
-        )
-        @player_acting_sequence << []
-        last_round = round
-      end
-
-      @player_acting_sequence.last << @next_to_act
-      acting_player_position = @player_acting_sequence.last.last
-
-      @next_to_act = @players.next_to_act(@next_to_act)
 
-      cost = @players.action_cost(
-        acting_player_position,
-        action,
-        game_def.min_wagers[round]
-      )
-
-      action = PokerAction.new(action.to_s, cost: cost) if cost > 0
-
-      adjust_min_wager!(action, acting_player_position)
-
-      @players[acting_player_position].append_action!(action, round)
-
-      yield action, round, acting_player_position, @players if block_given?
-    end
+    walk_over_betting_sequence!(game_def)
 
     distribute_chips!(game_def) if hand_ended?(game_def)
 
@@ -347,6 +319,47 @@ class MatchState
 
   private
 
+  def walk_over_betting_sequence!(game_def)
+    last_round = -1
+    betting_sequence.each_with_index do |actions_per_round, current_round|
+      @min_wager_by = game_def.min_wagers[current_round]
+      @next_to_act = @players.position_of_first_active_player(
+        game_def.first_player_positions[current_round]
+      )
+      @player_acting_sequence << []
+      last_round = current_round
+
+      walk_over_actions!(actions_per_round, game_def, last_round, current_round)
+    end
+
+    self
+  end
+
+  def walk_over_actions!(actions_per_round, game_def, last_round, current_round)
+    actions_per_round.each do |action|
+      @player_acting_sequence.last << @next_to_act
+      acting_player_position = @player_acting_sequence.last.last
+
+      @next_to_act = @players.next_to_act(@next_to_act)
+
+      cost = @players.action_cost(
+        acting_player_position,
+        action,
+        game_def.min_wagers[current_round]
+      )
+
+      action = PokerAction.new(action.to_s, cost: cost) if cost > 0
+
+      adjust_min_wager!(action, acting_player_position)
+
+      @players[acting_player_position].append_action!(action, current_round)
+
+      yield action, current_round, acting_player_position if block_given?
+    end
+
+    self
+  end
+
   # Distribute chips to all winning players
   def distribute_chips!(game_def)
     return self if pot(game_def) <= 0
@@ -373,14 +386,6 @@ class MatchState
     self
   end
 
-  def every_action_token
-    betting_sequence.each_with_index do |actions_per_round, round|
-      actions_per_round.each do |action|
-        yield action, round if block_given?
-      end
-    end
-  end
-
   def all_string_hands(string_of_card_sets)
     all_sets_of_cards(string_of_card_sets, HAND_SEPARATOR)
   end

data/lib/acpc_poker_types/player_group.rb

@@ -22,7 +22,7 @@ class PlayerGroup < DelegateClass(Array)
   end
 
   def position_of_first_active_player(acting_player_position=0)
-    raise NoPlayerCouldHaveActed if all? { |player| player.inactive? }
+    return nil if all? { |player| player.inactive? }
 
     # This must eventually exit because of the above assertion
     while @players[acting_player_position].inactive?

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '6.2.1'
+  VERSION = '6.2.2'
 end

data/spec/match_state_spec.rb

@@ -816,6 +816,26 @@ describe MatchState do
       end
     end
   end
+  describe '#next_to_act' do
+    it 'works at the start of new rounds' do
+      wager_size = 10
+      x_game_def = GameDefinition.new(
+        first_player_positions: [1, 0, 0],
+        chip_stacks: [100, 200],
+        blinds: [0, 10],
+        raise_sizes: [wager_size]*3,
+        number_of_ranks: 3
+      )
+
+      (0..x_game_def.number_of_players-1).each do |position|
+        x_next_to_act = [0, 0]
+        patient = MatchState.new("#{MatchState::LABEL}:#{position}:0:cc/:5d5c|/8dAs8s")
+        patient.every_action(x_game_def) do
+          patient.next_to_act(x_game_def).must_equal x_next_to_act.shift
+        end
+      end
+    end
+  end
 end
 
 def for_every_card

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Dustin Morrill