pokerstats 2.0.14 → 2.0.16

data/VERSION

@@ -1 +1 @@
-2.0.14
+2.0.16

data/lib/pokerstats/hand_classification.rb

@@ -1,22 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + "/hand_constants")
 module Pokerstats  
-  def class_index_from_hand_string(hand_string)
+    def class_index_from_hand_string(hand_string)
       return class_index_from_hand_string!(hand_string)
-  rescue ArgumentError
+    rescue ArgumentError
       nil
-  end
-  
-  def class_index_from_hand_string!(hand_string)
+    end
+
+    def class_index_from_hand_string!(hand_string)
     class_index_from_class_string!(class_string_from_hand_string!(hand_string))
-  end
-  
-  def class_string_from_hand_string(hand_string)
+    end
+
+    def class_string_from_hand_string(hand_string)
       class_string_from_hand_string!(hand_string)
-  rescue
+    rescue
       nil
-  end
-  
-  def class_string_from_hand_string!(hand_string)
+    end
+
+    def class_string_from_hand_string!(hand_string)
     raise ArgumentError, "hand_string '#{hand_string}' must be a String" unless hand_string.kind_of?(String)
     hand_string = hand_string.gsub(/ /,'')
     hand_string = hand_string.upcase
@@ -39,15 +39,15 @@ module Pokerstats
       end
       result
     end
-  end
-  
-  def class_index_from_class_string(class_string)
+    end
+
+    def class_index_from_class_string(class_string)
       class_index_from_class_string!(class_string)
-  rescue
+    rescue
       nil
-  end
-  
-  def class_index_from_class_string!(class_string)
+    end
+
+    def class_index_from_class_string!(class_string)
     raise ArgumentError, "class_string #{class_string.inspect} must be a String" unless class_string.kind_of?(String)
     class_string.upcase!
     first = Pokerstats::HandConstants::CARDS.index(class_string[0..0])
@@ -61,16 +61,16 @@ module Pokerstats
       13*second+first      
     else raise ArgumentError, "class_string is malformed"
     end
-  end
-  
-  def class_string_from_class_index(class_index)
+    end
+
+    def class_string_from_class_index(class_index)
       class_string_from_class_index!(class_index)
-  rescue ArgumentError
+    rescue ArgumentError
       nil
-  end
-  
-  def class_string_from_class_index!(class_index)
-    raise ArgumentError, "class_index must be an integer" unless class_index.kind_of? Integer
+    end
+
+    def class_string_from_class_index!(class_index)
+    raise ArgumentError, "class_index (#{class_index.inspect}) must be an integer between 0 and 168" unless class_index.kind_of? Integer and class_index.between?(0,168)
     row, col = row_from_class_index(class_index), col_from_class_index(class_index)
     case row <=> col
     when 1
@@ -80,17 +80,21 @@ module Pokerstats
     when -1
       Pokerstats::HandConstants::CARDS[row..row] + Pokerstats::HandConstants::CARDS[col..col] + "s"
     end
-  end
-  
-  def row_from_class_index(classIndex)
+    end
+
+    def row_from_class_index(classIndex)
     classIndex / 13
-  end
-  
-  def col_from_class_index(classIndex)
+    end
+
+    def col_from_class_index(classIndex)
     classIndex % 13
-  end
-  
-  def class_index_from_row_and_col(row, col)
-    row*13 + col
-  end
+    end
+
+    def class_index_from_row_and_col(row, col)
+        row*13 + col
+    end
+
+    class HandClass
+        extend Pokerstats
+    end
 end

data/lib/pokerstats/hand_history.rb

@@ -15,6 +15,7 @@ module Pokerstats
     end
     
     def game
+      return nil if lines.empty?
       @parser_class.game lines.first
     end
   

data/lib/pokerstats/hand_statistics.rb

@@ -241,6 +241,6 @@ module Pokerstats
   Dir[File.dirname(__FILE__) + "/plugins/*_statistics.rb"].each {|filename| require File.expand_path(filename)}
   HandStatistics.delegate_plugin_public_methods_except HandStatisticsAPI.public_methods
 end
-# Load Plugins and Delegate non-api public methods to plugins
+# Load Plugins and Delegate non-api public methods to plugins# 
 # puts Pokerstats::HandStatistics.hand_statistics_migration_data
 # puts Pokerstats::HandStatistics.player_statistics_migration_data

data/lib/pokerstats/plugins/cash_statistics.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + "/../hand_classification")
 module Pokerstats
   class CashStatistics < HandStatistics::Plugin
     def initialize handstatistics
@@ -107,7 +108,7 @@ module Pokerstats
     end
     
     def card_category_index(player)
-      Pokerstats::class_index_from_hand_string(cards(player))
+      Pokerstats::HandClass.class_index_from_hand_string(cards(player))
     end
   
     def self.report_specification

data/lib/pokerstats/pokerstars_hand_history_parser.rb

@@ -66,6 +66,7 @@ module Pokerstats
     
     def self.game(lines)
       lines.lstrip!
+      return nil if lines.empty?
       case lines[/[^\n]+/].chomp
       when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (\$[0-9+$]+) ([^\-]*) - Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
         "PS#{$1}"
@@ -113,7 +114,19 @@ module Pokerstats
             :sb=> $6.to_d, :bb=> $7.to_d, :ante => "0.0".to_d, 
             :played_at=> PokerstarsTimeStringConverter.new($8).as_utc_datetime,
             :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
-            :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($3)            
+            :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($3)
+        # when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (#{CASH})\+(#{CASH}) USD Hold'em No Limit - Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
+        #     @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3}+#{$4} Hold'em No Limit", :tournament=> $2, 
+        #         :sb=> $6.to_d, :bb=> $7.to_d, :ante => "0.0".to_d, 
+        #         :played_at=> PokerstarsTimeStringConverter.new($8).as_utc_datetime,
+        #         :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
+        #         :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($3)            
+        when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (Freeroll|(#{CASH})\+(#{CASH}) *(USD)?) +Hold'em No Limit - Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
+            @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3} Hold'em No Limit", :tournament=> $2, 
+                :sb=> $8.to_d, :bb=> $9.to_d, :ante => "0.0".to_d, 
+                :played_at=> PokerstarsTimeStringConverter.new($10).as_utc_datetime,
+                :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
+                :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($4)            
       when /PokerStars Game #([0-9]+): +([^(]*)Hold'em No Limit \((#{CASH})\/(#{CASH})\) - (.*)$/
         @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}Hold'em No Limit (#{$3}/#{$4})", :tournament=> nil, 
             :sb=> cash_to_d($3), :bb=> cash_to_d($4), :ante => "0.0".to_d, 
@@ -173,7 +186,7 @@ module Pokerstats
         @stats.register_action($1, 'raises', :result => :pay_to, :amount => cash_to_d($3))
       when /(.*) collected (.*) from ((side )|(main ))?pot/
         @stats.register_action($1, "wins", :result => :win, :amount => cash_to_d($2))
-      when /(.*) mucks hand/
+      when /(.*): mucks hand/
         @stats.register_action($1, 'mucks', :result => :neutral)
       when /Seat [0-9]+: (.*) (\((small blind)|(big blind)|(button)\) )?showed \[([^\]]+)\] and ((won) \(#{CASH}\)|(lost)) with (.*)/
       when /Seat [0-9]+: (.*) mucked \[([^\]]+)\]/
@@ -185,6 +198,7 @@ module Pokerstats
     private
   
     def cash_to_d(string)
+      return "0".to_d if string.nil? || string.empty?
       string.gsub!(/[$, ]/,"")
       string.to_d
     end

data/pokerstats.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pokerstats}
-  s.version = "2.0.14"
+  s.version = "2.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew C. Greenberg"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2009-11-20}
   s.default_executable = %q{checkps}
   s.description = %q{a library for extracting, computing and reporting statistics of poker hands parsed from hand history files}
   s.email = %q{wizardwerdna@gmail.com}
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
      "spec/file_many_hands.txt",
      "spec/file_one_hand.txt",
      "spec/hand_classification_spec.rb",
+     "spec/hand_history_spec.rb",
      "spec/hand_statistics_spec.rb",
      "spec/hand_statistics_spec_helper.rb",
      "spec/player_statistics_spec.rb",
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
   s.summary = %q{poker hand history statistics library}
   s.test_files = [
     "spec/hand_classification_spec.rb",
+     "spec/hand_history_spec.rb",
      "spec/hand_statistics_spec.rb",
      "spec/hand_statistics_spec_helper.rb",
      "spec/player_statistics_spec.rb",

data/spec/hand_classification_spec.rb

@@ -1,136 +1,135 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/hand_classification')
 
-include Pokerstats
 describe "class_index_from_hand_string" do
   it "should recognize pairs" do
-    Pokerstats::class_index_from_hand_string("AS AH").should == 0
-    Pokerstats::class_index_from_hand_string("kd kc").should == 14
-    Pokerstats::class_index_from_hand_string("2H 2D").should == 168
-    Pokerstats::class_index_from_hand_string("KdkC").should == 14
-    Pokerstats::class_index_from_hand_string(" Kd kC").should == 14
-    Pokerstats::class_index_from_hand_string(" Kd  kC ").should == 14
+    Pokerstats::HandClass.class_index_from_hand_string("AS AH").should == 0
+    Pokerstats::HandClass.class_index_from_hand_string("kd kc").should == 14
+    Pokerstats::HandClass.class_index_from_hand_string("2H 2D").should == 168
+    Pokerstats::HandClass.class_index_from_hand_string("KdkC").should == 14
+    Pokerstats::HandClass.class_index_from_hand_string(" Kd kC").should == 14
+    Pokerstats::HandClass.class_index_from_hand_string(" Kd  kC ").should == 14
   end
   it "should recognize suited hands" do
-    Pokerstats::class_index_from_hand_string("AS KS").should == 1
-    Pokerstats::class_index_from_hand_string("AS 2S").should == 12
-    Pokerstats::class_index_from_hand_string("3S 2S").should == 155
-    Pokerstats::class_index_from_hand_string("AS 2s").should == 12
-    Pokerstats::class_index_from_hand_string("aS 2S").should == 12
-    Pokerstats::class_index_from_hand_string("As 2s").should == 12
+    Pokerstats::HandClass.class_index_from_hand_string("AS KS").should == 1
+    Pokerstats::HandClass.class_index_from_hand_string("AS 2S").should == 12
+    Pokerstats::HandClass.class_index_from_hand_string("3S 2S").should == 155
+    Pokerstats::HandClass.class_index_from_hand_string("AS 2s").should == 12
+    Pokerstats::HandClass.class_index_from_hand_string("aS 2S").should == 12
+    Pokerstats::HandClass.class_index_from_hand_string("As 2s").should == 12
   end
   it "should recognize unsuited hands" do
-    Pokerstats::class_index_from_hand_string("AS Kh").should == 13
-    Pokerstats::class_index_from_hand_string("Ad 2c").should == 156
-    Pokerstats::class_index_from_hand_string("3c 2S").should == 167
-    Pokerstats::class_index_from_hand_string("AS 2h").should == 156
-    Pokerstats::class_index_from_hand_string("aS 2d").should == 156
-    Pokerstats::class_index_from_hand_string("As 2c").should == 156
+    Pokerstats::HandClass.class_index_from_hand_string("AS Kh").should == 13
+    Pokerstats::HandClass.class_index_from_hand_string("Ad 2c").should == 156
+    Pokerstats::HandClass.class_index_from_hand_string("3c 2S").should == 167
+    Pokerstats::HandClass.class_index_from_hand_string("AS 2h").should == 156
+    Pokerstats::HandClass.class_index_from_hand_string("aS 2d").should == 156
+    Pokerstats::HandClass.class_index_from_hand_string("As 2c").should == 156
   end
   it "should not recognize malformed hands" do
-    Pokerstats::class_index_from_hand_string("AS AS").should be_nil
-    Pokerstats::class_index_from_hand_string("XS AH").should be_nil
-    Pokerstats::class_index_from_hand_string("AS XH").should be_nil
-    Pokerstats::class_index_from_hand_string("AX AS").should be_nil
-    Pokerstats::class_index_from_hand_string("AX AX").should be_nil
-    lambda{Pokerstats::class_index_from_hand_string!("AS AS")}.should raise_error(ArgumentError)
-    lambda{Pokerstats::class_index_from_hand_string!("XS AH")}.should raise_error(ArgumentError)
-    lambda{Pokerstats::class_index_from_hand_string!("AS XH")}.should raise_error(ArgumentError)
-    lambda{Pokerstats::class_index_from_hand_string!("AX AS")}.should raise_error(ArgumentError)
-    lambda{Pokerstats::class_index_from_hand_string!("AX AX")}.should raise_error(ArgumentError)
+    Pokerstats::HandClass.class_index_from_hand_string("AS AS").should be_nil
+    Pokerstats::HandClass.class_index_from_hand_string("XS AH").should be_nil
+    Pokerstats::HandClass.class_index_from_hand_string("AS XH").should be_nil
+    Pokerstats::HandClass.class_index_from_hand_string("AX AS").should be_nil
+    Pokerstats::HandClass.class_index_from_hand_string("AX AX").should be_nil
+    lambda{Pokerstats::HandClass.class_index_from_hand_string!("AS AS")}.should raise_error(ArgumentError)
+    lambda{Pokerstats::HandClass.class_index_from_hand_string!("XS AH")}.should raise_error(ArgumentError)
+    lambda{Pokerstats::HandClass.class_index_from_hand_string!("AS XH")}.should raise_error(ArgumentError)
+    lambda{Pokerstats::HandClass.class_index_from_hand_string!("AX AS")}.should raise_error(ArgumentError)
+    lambda{Pokerstats::HandClass.class_index_from_hand_string!("AX AX")}.should raise_error(ArgumentError)
   end
 end
 describe "class_index_from_class_string" do
   it "should recognize pairs" do
-    Pokerstats::class_index_from_class_string("AA").should == 0
-    Pokerstats::class_index_from_class_string("KK").should == 14
-    Pokerstats::class_index_from_class_string("22").should == 168
-    Pokerstats::class_index_from_class_string("KKp").should == 14
-    Pokerstats::class_index_from_class_string("KKP").should == 14
+    Pokerstats::HandClass.class_index_from_class_string("AA").should == 0
+    Pokerstats::HandClass.class_index_from_class_string("KK").should == 14
+    Pokerstats::HandClass.class_index_from_class_string("22").should == 168
+    Pokerstats::HandClass.class_index_from_class_string("KKp").should == 14
+    Pokerstats::HandClass.class_index_from_class_string("KKP").should == 14
   end
   it "should recognize suited hands" do
-    Pokerstats::class_index_from_class_string("AKs").should == 1
-    Pokerstats::class_index_from_class_string("A2s").should == 12
-    Pokerstats::class_index_from_class_string("32s").should == 155
-    Pokerstats::class_index_from_class_string("A2S").should == 12
-    Pokerstats::class_index_from_class_string("2As").should == 12
+    Pokerstats::HandClass.class_index_from_class_string("AKs").should == 1
+    Pokerstats::HandClass.class_index_from_class_string("A2s").should == 12
+    Pokerstats::HandClass.class_index_from_class_string("32s").should == 155
+    Pokerstats::HandClass.class_index_from_class_string("A2S").should == 12
+    Pokerstats::HandClass.class_index_from_class_string("2As").should == 12
   end
   it "should recognize unsuited hands" do
-    Pokerstats::class_index_from_class_string("AKo").should == 13
-    Pokerstats::class_index_from_class_string("A2o").should == 156
-    Pokerstats::class_index_from_class_string("32o").should == 167
-    Pokerstats::class_index_from_class_string("A2O").should == 156
-    Pokerstats::class_index_from_class_string("A2").should == 156
-    Pokerstats::class_index_from_class_string("2AO").should == 156
+    Pokerstats::HandClass.class_index_from_class_string("AKo").should == 13
+    Pokerstats::HandClass.class_index_from_class_string("A2o").should == 156
+    Pokerstats::HandClass.class_index_from_class_string("32o").should == 167
+    Pokerstats::HandClass.class_index_from_class_string("A2O").should == 156
+    Pokerstats::HandClass.class_index_from_class_string("A2").should == 156
+    Pokerstats::HandClass.class_index_from_class_string("2AO").should == 156
   end
 end
 describe "class_string_from_class_index" do
   it "should recognize pairs" do
-    Pokerstats::class_string_from_class_index(0).should == "AA"
-    Pokerstats::class_string_from_class_index(14).should == "KK"
-    Pokerstats::class_string_from_class_index(168).should == "22"
+    Pokerstats::HandClass.class_string_from_class_index(0).should == "AA"
+    Pokerstats::HandClass.class_string_from_class_index(14).should == "KK"
+    Pokerstats::HandClass.class_string_from_class_index(168).should == "22"
   end
   it "should recognize suited hands" do
-    Pokerstats::class_string_from_class_index(1).should == "AKs"
-    Pokerstats::class_string_from_class_index(12).should == "A2s"
-    Pokerstats::class_string_from_class_index(155).should == "32s"
+    Pokerstats::HandClass.class_string_from_class_index(1).should == "AKs"
+    Pokerstats::HandClass.class_string_from_class_index(12).should == "A2s"
+    Pokerstats::HandClass.class_string_from_class_index(155).should == "32s"
   end
   it "should recognize unsuited hands" do
-    Pokerstats::class_string_from_class_index(13).should == "AKo"
-    Pokerstats::class_string_from_class_index(156).should == "A2o"
-    Pokerstats::class_string_from_class_index(167).should == "32o"
+    Pokerstats::HandClass.class_string_from_class_index(13).should == "AKo"
+    Pokerstats::HandClass.class_string_from_class_index(156).should == "A2o"
+    Pokerstats::HandClass.class_string_from_class_index(167).should == "32o"
   end
 end
 describe "row_from_class_index" do
   it "should recognize first row indices" do
-    Pokerstats::row_from_class_index(0).should == 0
-    Pokerstats::row_from_class_index(7).should == 0
-    Pokerstats::row_from_class_index(12).should == 0
+    Pokerstats::HandClass.row_from_class_index(0).should == 0
+    Pokerstats::HandClass.row_from_class_index(7).should == 0
+    Pokerstats::HandClass.row_from_class_index(12).should == 0
   end
   it "should recognize middle row indices" do
-    Pokerstats::row_from_class_index(78).should == 6
-    Pokerstats::row_from_class_index(88).should == 6
-    Pokerstats::row_from_class_index(90).should == 6
+    Pokerstats::HandClass.row_from_class_index(78).should == 6
+    Pokerstats::HandClass.row_from_class_index(88).should == 6
+    Pokerstats::HandClass.row_from_class_index(90).should == 6
   end
   it "should recognize last row indices" do
-    Pokerstats::row_from_class_index(156).should == 12
-    Pokerstats::row_from_class_index(165).should == 12
-    Pokerstats::row_from_class_index(168).should == 12
+    Pokerstats::HandClass.row_from_class_index(156).should == 12
+    Pokerstats::HandClass.row_from_class_index(165).should == 12
+    Pokerstats::HandClass.row_from_class_index(168).should == 12
   end
 end
 describe "col_from_class_index" do
   it "should recognize first col indices" do
-    Pokerstats::col_from_class_index(0).should == 0
-    Pokerstats::col_from_class_index(78).should == 0
-    Pokerstats::col_from_class_index(156).should == 0
+    Pokerstats::HandClass.col_from_class_index(0).should == 0
+    Pokerstats::HandClass.col_from_class_index(78).should == 0
+    Pokerstats::HandClass.col_from_class_index(156).should == 0
 
   end
   it "should recognize middle col indices" do
-    Pokerstats::col_from_class_index(7).should == 7
-    Pokerstats::col_from_class_index(85).should == 7
-    Pokerstats::col_from_class_index(163).should == 7
+    Pokerstats::HandClass.col_from_class_index(7).should == 7
+    Pokerstats::HandClass.col_from_class_index(85).should == 7
+    Pokerstats::HandClass.col_from_class_index(163).should == 7
 
   end
   it "should recognize last col indices" do
-    Pokerstats::col_from_class_index(12).should == 12
-    Pokerstats::col_from_class_index(90).should == 12
-    Pokerstats::col_from_class_index(168).should == 12
+    Pokerstats::HandClass.col_from_class_index(12).should == 12
+    Pokerstats::HandClass.col_from_class_index(90).should == 12
+    Pokerstats::HandClass.col_from_class_index(168).should == 12
   end
 end
 describe "class_index_from_row_and_col" do
   it "should recognize top row" do
-    Pokerstats::class_index_from_row_and_col(0,0) == 0
-    Pokerstats::class_index_from_row_and_col(0,7) == 7
-    Pokerstats::class_index_from_row_and_col(0,12) == 12
+    Pokerstats::HandClass.class_index_from_row_and_col(0,0) == 0
+    Pokerstats::HandClass.class_index_from_row_and_col(0,7) == 7
+    Pokerstats::HandClass.class_index_from_row_and_col(0,12) == 12
   end
   it "should recognize middle row pairs" do
-    Pokerstats::class_index_from_row_and_col(7,0) == 84
-    Pokerstats::class_index_from_row_and_col(7,7) == 91
-    Pokerstats::class_index_from_row_and_col(7,12) == 96
+    Pokerstats::HandClass.class_index_from_row_and_col(7,0) == 84
+    Pokerstats::HandClass.class_index_from_row_and_col(7,7) == 91
+    Pokerstats::HandClass.class_index_from_row_and_col(7,12) == 96
   end
   it "should recognize last row pairs" do
-    Pokerstats::class_index_from_row_and_col(12,0) == 156
-    Pokerstats::class_index_from_row_and_col(12,7) == 163
-    Pokerstats::class_index_from_row_and_col(12,12) == 168
+    Pokerstats::HandClass.class_index_from_row_and_col(12,0) == 156
+    Pokerstats::HandClass.class_index_from_row_and_col(12,7) == 163
+    Pokerstats::HandClass.class_index_from_row_and_col(12,12) == 168
   end
 end

data/spec/hand_history_spec.rb

@@ -0,0 +1,86 @@
+require 'rubygems'
+require 'activesupport'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/hand_history')
+
+describe Pokerstats::HandHistory do
+    context "when created on an empty string" do
+        before(:each) do
+            @hand_history = Pokerstats::HandHistory.new([], "", 0)
+        end
+        
+        it {@hand_history.should be_kind_of(Pokerstats::HandHistory)}
+        it {@hand_history.should_not be_parsed}
+        it "should not find a game" do
+            @hand_history.game.should be_nil
+        end
+    end
+    
+    context "when created on a hand record" do
+        before(:each) do
+            lines = <<-HAND_HISTORY
+PokerStars Game #24759011305: Tournament #139359808, $10+$1 Hold'em No Limit - Level I (10/20) - 2009/02/09 14:02:39 ET
+Table '139359808 122' 9-max Seat #5 is the button
+Seat 2: wizardwerdna (3000 in chips) 
+Seat 3: EEYORE_Q6 (3000 in chips) 
+Seat 4: bimbi76 (3020 in chips) 
+Seat 5: izibi (2970 in chips) 
+Seat 6: Spidar (2980 in chips) is sitting out
+Seat 7: Little Dee (2900 in chips) 
+Seat 8: Gwünni (3000 in chips) 
+Seat 9: MartinBOF84 (3130 in chips) 
+Spidar: posts small blind 10
+Little Dee: posts big blind 20
+*** HOLE CARDS ***
+Dealt to wizardwerdna [Qc 4d]
+Gwünni: folds 
+MartinBOF84: folds 
+wizardwerdna: folds 
+EEYORE_Q6: calls 20
+bimbi76: folds 
+izibi: calls 20
+Spidar: folds 
+Little Dee: checks ""
+*** FLOP *** [Ac Qs Ks]
+Little Dee: checks 
+EEYORE_Q6: bets 20
+izibi: raises 60 to 80
+Little Dee: folds 
+EEYORE_Q6: calls 60
+*** TURN *** [Ac Qs Ks] [Js]
+EEYORE_Q6: checks 
+izibi: checks 
+*** RIVER *** [Ac Qs Ks Js] [8d]
+EEYORE_Q6: bets 60
+izibi: calls 60
+*** SHOW DOWN ***
+EEYORE_Q6: shows [2s Ah] (a pair of Aces)
+izibi: shows [Ad 6d] (a pair of Aces)
+EEYORE_Q6 collected 175 from pot
+izibi collected 175 from pot
+*** SUMMARY ***
+Total pot 350 | Rake 0 
+Board [Ac Qs Ks Js 8d]
+Seat 2: wizardwerdna folded before Flop (didn't bet)
+Seat 3: EEYORE_Q6 showed [2s Ah] and won (175) with a pair of Aces
+Seat 4: bimbi76 folded before Flop (didn't bet)
+Seat 5: izibi (button) showed [Ad 6d] and won (175) with a pair of Aces
+Seat 6: Spidar (small blind) folded before Flop
+Seat 7: Little Dee (big blind) folded on the Flop
+Seat 8: Gwünni folded before Flop (didn't bet)
+Seat 9: MartinBOF84 folded before Flop (didn't bet)
+            HAND_HISTORY
+            @hand_history = Pokerstats::HandHistory.new(lines.split("\n"),"",0)
+        end
+        it "should have a game" do
+            @hand_history.game.should == "PS24759011305"
+        end
+        it "should have a parse" do
+            @hand_history.parse
+            @hand_history.should be_parsed
+        end
+        it "should have a report" do
+            lambda{@hand_history.reports}.should_not raise_error
+        end
+    end
+end

data/spec/hand_statistics_spec.rb

@@ -1531,7 +1531,6 @@ describe HandStatistics do
                 register_check @sb
                 register_check @bb
                 register_bet @button, 2
-                puts "last_aggr_player = #{@stats.last_aggr_player.inspect}"
                 ["sb", "bb", "button"].each do |player|
                     @stats.cbet_flop(player).should be_nil
                     @stats.call_cbet_flop(player).should be_nil

data/spec/pokerstars_hand_history_parser_spec.rb

@@ -54,6 +54,12 @@ describe PokerstarsHandHistoryParser, "recognizes valid hand history" do
     first_line = "PokerStars Game #21650436825: Tournament #117620218, $10+$1 Hold'em No Limit - Level I (10/20) - 2008/10/31 17:25:42 ET"
     PokerstarsHandHistoryParser.game(first_line).should == "PS21650436825"
   end
+
+  it "should recognize a valid tournament hand history" do
+    first_line = "PokerStars Game #33566683789: Tournament #199550385, $10+$1 USD Hold'em No Limit - Level XVIII (2000/4000) - 2009/10/02 22:00:29 ET"
+    PokerstarsHandHistoryParser.game(first_line).should == "PS33566683789"
+  end
+  
   it "should recognize a valid cash game hand history" do
     first_line = "PokerStars Game #21650146783:  Hold'em No Limit ($0.25/$0.50) - 2008/10/31 17:14:44 ET"
     PokerstarsHandHistoryParser.game(first_line).should == "PS21650146783"
@@ -89,6 +95,48 @@ describe PokerstarsHandHistoryParser, "when parsing structural matter" do
     )
     @parser.parse("PokerStars Game #21650436825: Tournament #117620218, $10+$1 Hold'em No Limit - Level I (10/20) - 2008/10/31 17:25:42 ET")
   end
+    
+  it "should recognize a valid tournament hand history" do
+    @stats.should_receive(:update_hand).with(
+        :name => "PS33566683789",
+        :description => "199550385, $10+$1 USD Hold'em No Limit", 
+        :ante => "0.0".to_d,
+        :table_name => "",
+        :max_players => 0,
+        :number_players => 0,
+        :sb => "2000".to_d,
+        :bb => "4000".to_d,
+        :played_at => DateTime.parse("2009/10/03 02:00:29 UDT"),
+        :tournament => "199550385",
+        :street => :prelude,
+        :board => "",
+        :game_type => "Hold'em",
+        :stakes_type => "10".to_d,
+        :limit_type => "No Limit"
+    )
+    @parser.parse("PokerStars Game #33566683789: Tournament #199550385, $10+$1 USD Hold'em No Limit - Level XVIII (2000/4000) - 2009/10/02 22:00:29 ET")
+  end
+  
+  it "should recognize a freeroll tournament hand history" do
+    @stats.should_receive(:update_hand).with(
+        :name => "PS24703545200",
+        :description => "137653257, Freeroll Hold'em No Limit",
+        :ante => "0.0".to_d,
+        :table_name => "",
+        :max_players => 0,
+        :number_players => 0,
+        :sb => "10".to_d,
+        :bb => "20".to_d,
+        :played_at => DateTime.parse("Sun, 08 Feb 2009 00:24:12 +0000"),
+        :tournament => "137653257",
+        :street => :prelude,
+        :board => "",
+        :game_type => "Hold'em",
+        :stakes_type => "0".to_d,
+        :limit_type => "No Limit"
+    )
+    @parser.parse("PokerStars Game #24703545200: Tournament #137653257, Freeroll  Hold'em No Limit - Level I (10/20) - 2009/02/07 19:24:12 ET")
+  end
   
   it "should recognize a tournament header" do
     PokerstarsHandHistoryParser.should have_valid_header("PokerStars Game #21650436825: Tournament #117620218, $10+$1 Hold'em No Limit - Level I (10/20) - 2008/10/31 17:25:42 ET\nsnuggles\n")
@@ -259,6 +307,6 @@ describe PokerstarsHandHistoryParser, "when parsing poker actions" do
   end
   it "should properly parse and register a muck" do
     @stats.should_receive(:register_action).with("billy", "mucks", :result => :neutral)
-    @parser.parse("billy mucks hand")
+    @parser.parse("billy: mucks hand")
   end
 end

data/spec/spec_helper.rb

@@ -7,3 +7,22 @@ require 'spec/autorun'
 Spec::Runner.configure do |config|
   
 end
+
+Spec::Matchers.define :be_hash_similar_with do |expected|
+  match do |actual|
+      @errors = []
+      for key in (expected.keys + actual.keys).uniq
+          @errors << {:expected => expected[key], :actual => actual[key], :key => key} unless expected[key] == actual[key]
+      end
+      @errors.empty?
+  end
+  failure_message_for_should do |hash|
+    @errors.collect{|each| "expected #{each[:key].inspect} to be #{each[:expected].inspect}, but got #{each[:actual].inspect}"}.join(";\n")
+  end
+  failure_message_for_should_not do |hash|
+    "the two elements are hash_similar"
+  end
+  description do
+    "have the same values for corresponding keys"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pokerstats
 version: !ruby/object:Gem::Version 
-  version: 2.0.14
+  version: 2.0.16
 platform: ruby
 authors: 
 - Andrew C. Greenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2009-11-20 00:00:00 -08:00
 default_executable: checkps
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - spec/file_many_hands.txt
 - spec/file_one_hand.txt
 - spec/hand_classification_spec.rb
+- spec/hand_history_spec.rb
 - spec/hand_statistics_spec.rb
 - spec/hand_statistics_spec_helper.rb
 - spec/player_statistics_spec.rb
@@ -124,6 +125,7 @@ specification_version: 3
 summary: poker hand history statistics library
 test_files: 
 - spec/hand_classification_spec.rb
+- spec/hand_history_spec.rb
 - spec/hand_statistics_spec.rb
 - spec/hand_statistics_spec_helper.rb
 - spec/player_statistics_spec.rb