acpc_dealer_data 0.1.3 → 0.1.4

data/lib/acpc_dealer_data/poker_match_data.rb

@@ -142,8 +142,8 @@ class PokerMatchData
 
       @players.each_with_index do |player, seat|
         player.start_new_hand!(
-          @match_def.game_def.blinds[@seat],
-          @match_def.game_def.chip_stacks[@seat],
+          @match_def.game_def.blinds[seat],
+          @match_def.game_def.chip_stacks[seat],
           current_hand.data.first.state_messages[seat].users_hole_cards
         )
       end
@@ -165,8 +165,8 @@ class PokerMatchData
         last_match_state = current_hand.last_match_state(seat)
         match_state = current_hand.current_match_state(seat)
 
-        if current_hand.next_action && player.seat == current_hand.next_action[:seat]
-          player.take_action!(current_hand.next_action[:action])
+        if current_hand.last_action && player.seat == current_hand.last_action.seat
+          player.take_action!(current_hand.last_action.action)
         end
 
         if !match_state.first_state_of_first_round? && match_state.round > last_match_state.round
@@ -175,7 +175,7 @@ class PokerMatchData
 
         if current_hand.final_turn?
           player.take_winnings!(
-            current_hand.chip_distribution[seat] + @match_def.game_def.blinds[@seat]
+            current_hand.chip_distribution[seat] + @match_def.game_def.blinds[seat]
           )
         end
       end
@@ -186,6 +186,30 @@ class PokerMatchData
     self
   end
 
+  def player_acting_sequence
+    return nil unless @hand_number
+
+    sequence = [[]]
+    
+    return sequence if current_hand.turn_number < 1
+      
+    turns_taken = current_hand.data[0..current_hand.turn_number-1]
+    turns_taken.each_with_index do |turn, turn_index|
+      next unless turn.action_message
+      
+      sequence[turn.action_message.state.round] << turn.action_message.seat
+
+      if (
+        new_round?(sequence.length - 1 , turn_index) ||
+        players_all_in?(sequence.length - 1, turn_index)
+      )
+        sequence << []
+      end
+    end
+
+    sequence
+  end
+
   def current_hand
     if @hand_number then @data[@hand_number] else nil end
   end
@@ -233,4 +257,21 @@ class PokerMatchData
 
     self
   end
+
+  private
+
+  def players_all_in?(current_round, turn_index)
+    current_hand.data.length == turn_index + 2 &&
+    current_round < (@match_def.game_def.number_of_rounds - 1) && 
+    turn.action_message &&
+    (turns_taken[0..turn_index].count do |t| 
+      t.action_message.action.to_sym == :fold 
+    end) != @players.length - 1
+  end
+
+  def new_round?(current_round, turn_index)
+    current_hand.data.length > turn_index + 1 &&
+    current_hand.data[turn_index + 1].action_message &&
+    current_hand.data[turn_index + 1].action_message.state.round > current_round
+  end
 end

data/lib/acpc_dealer_data/version.rb

@@ -1,3 +1,3 @@
 module AcpcDealerData
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/poker_match_data_spec.rb

@@ -100,9 +100,13 @@ describe PokerMatchData do
 
           @hand_number = 0
           @patient.for_every_hand! do
+            @turn_number = 0
+
             @final_hand = @hand_number >= @hand_data_list.length - 1
             @patient.for_every_turn! do
               check_patient
+
+              @turn_number += 1
             end
 
             @hand_number += 1
@@ -126,9 +130,13 @@ describe PokerMatchData do
 
           @hand_number = 0
           @patient.for_every_hand! do
+            @turn_number = 0
+
             @final_hand = @hand_number >= @hand_data_list.length - 1
             @patient.for_every_turn! do
               check_patient
+
+              @turn_number += 1
             end
 
             @hand_number += 1
@@ -144,6 +152,7 @@ describe PokerMatchData do
     @patient.hand_number.must_equal @hand_number
     @patient.current_hand.must_equal @hand_data_list[@hand_number]
     @patient.final_hand?.must_equal @final_hand
+    @patient.player_acting_sequence.must_equal @player_acting_sequences[@hand_number] if @turn_number + 1 == @hand_data_list[@hand_number].data.length
   end
 
   def init_data(num_hands=nil)
@@ -177,6 +186,8 @@ describe PokerMatchData do
           hand_result
         )
       end
+
+      @player_acting_sequences = data_hash[:player_acting_sequences]
        
       yield data_hash[:action_messages], data_hash[:result_messages]
     end
@@ -267,7 +278,8 @@ describe PokerMatchData do
         hand_start_line_indices: [6, 35],
         match_def_line_index: 0,
         player_names: ['p1', 'p2'],
-        chip_distribution: [110, -110]
+        chip_distribution: [110, -110],
+        player_acting_sequences: [[[1, 0], [0, 1, 0], [0, 1], [0, 1]], [[0, 1, 0], [1, 0], [1, 0, 1], [1, 0]]]
       }
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_dealer_data
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acpc_dealer
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -128442043826121202
+      hash: -4118394275309926132
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -128442043826121202
+      hash: -4118394275309926132
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24