wizardwerdna-pokerstats 1.0.15 → 1.0.16

data/VERSION

@@ -1 +1 @@
-1.0.15
+1.0.16

data/lib/pokerstats/hand_statistics.rb

@@ -26,7 +26,9 @@ module Pokerstats
   
     def hand_record
       raise "#{HAND_RECORD_INCOMPLETE_MESSAGE}: #{(HAND_INFORMATION_KEYS - @hand_information.keys).inspect}" unless (HAND_INFORMATION_KEYS - @hand_information.keys).empty?
-      @hand_information
+      HAND_INFORMATION_KEYS.inject({}) do |hash, key| 
+        hash.merge!(key => @hand_information[key])
+      end
     end
 
     def update_hand update

data/pokerstats.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pokerstats}
-  s.version = "1.0.15"
+  s.version = "1.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew C. Greenberg"]
@@ -53,7 +53,8 @@ Gem::Specification.new do |s|
      "spec/player_statistics_spec.rb",
      "spec/pokerstars_file_spec.rb",
      "spec/pokerstars_hand_history_parser.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/zpokerstars_hand_history_parser_integration.rb.txt"
   ]
   s.homepage = %q{http://github.com/wizardwerdna/pokerstats}
   s.rdoc_options = ["--charset=UTF-8"]

data/spec/hand_statistics_spec.rb

@@ -6,6 +6,23 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/hand_stati
 include Pokerstats
 require File.expand_path(File.dirname(__FILE__) + '/hand_statistics_spec_helper')
 
+
+Spec::Matchers.define :have_all_and_only_keys do |keylist|
+  match do |hash|
+    hashkeys = hash.keys
+    hashkeys.size == keylist.size && hash.keys.all?{|each_key| keylist.include? each_key}
+  end
+  failure_message_for_should do |hash|
+    "missing keys: #{(keylist - hash.keys).inspect}, extra keys: #{(hash.keys - keylist).inspect}"
+  end
+  failure_message_for_should_not do |hash|
+    "the keys (#{hash.keys.inspect}) are all the same"
+  end
+  description do
+    "have all and only the specified keys"
+  end
+end
+
 describe HandStatistics, "when created" do
   before(:each) do
     @stats = HandStatistics.new
@@ -14,30 +31,32 @@ describe HandStatistics, "when created" do
     @stats.should have(0).players
   end
   
-  it "should properly update hand record information" do
+  it "should properly chain updates of hand record information" do
     sample_hand.each{|key, value| @stats.update_hand(key => value)}
     @stats.hand_record.should == sample_hand
   end
   
-  it "should properly chain hand record information updates" do
-    sample_hand.each{|key, value| @stats.update_hand(key => value)}
-    @stats.update_hand(:test => :foo)
-    @stats.hand_record.should.should == sample_hand.update(:test => :foo)
-  end
-    
   it "should not complain when asked to generate hand record with all HAND_INFORMATION_KEYS filled out" do
-    lambda{@stats.update_hand(sample_hand).hand_record}.should_not raise_error(/#{HAND_RECORD_INCOMPLETE_MESSAGE}/)
+    @stats.update_hand(sample_hand)
+    lambda{@stats.hand_record}.should_not raise_error(/#{HAND_RECORD_INCOMPLETE_MESSAGE}/)
   end
-  
+    
   it "should complain when asked to generate hand record if no information is given" do
     lambda{@stats.hand_record}.should raise_error(/#{HAND_RECORD_INCOMPLETE_MESSAGE}/)
   end
   
   HandStatistics::HAND_INFORMATION_KEYS.each do |thing|
     it "should complain when asked to generate hand record without a #{thing.to_s}" do
-      lambda{@stats.update_hand(sample_hand.except(thing)).hand_record}.should raise_error(/#{HAND_RECORD_INCOMPLETE_MESSAGE}/)
+      @stats.update_hand(sample_hand.except(thing))
+      lambda{@stats.hand_record}.should raise_error(/#{HAND_RECORD_INCOMPLETE_MESSAGE}/)
     end
   end  
+  
+  it "should not produce hand records having extra keys" do
+    @stats.update_hand(sample_hand)
+    @stats.update_hand(:street => :river)
+    @stats.hand_record.should have_all_and_only_keys HAND_INFORMATION_KEYS
+  end  
 end
 
 describe HandStatistics, "when registering game activity" do

data/spec/zpokerstars_hand_history_parser_integration.rb.txt

@@ -0,0 +1,67 @@
+require 'rubygems'
+# require 'activesupport'
+# require 'bigdecimal'
+# require 'bigdecimal/util'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/hand_history')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/hand_statistics')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/pokerstars_file')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pokerstats/pokerstars_hand_history_parser')
+
+include Pokerstats
+include HandConstants
+
+# describe PokerstarsHandHistoryParser, "when parsing PokerstarsFile" do
+#   before :each do
+#     @psfile = PokerstarsFile.open(File.dirname(__FILE__) + '/file_many_hands.txt')
+#     @expanded_path = File.expand_path(File.dirname(__FILE__) + '/file_many_hands.txt')
+#   end
+# 
+#   it "should parse every line of every entry in the file" do
+#     @psfile.entries.each do |handrecord|
+#       lambda{handrecord.parse}.should_not raise_error
+#     end
+#   end
+# end
+# 
+describe PokerstarsHandHistoryParser, "when parsing all the PokerstarsFiles in Andy's directory" do
+  before :each do
+    @filenames = Dir["/Users/werdna/Library/Application Support/Pokerstars/HandHistory/**/*.txt"]
+  end
+
+  it "should parse every line of every entry in the file" do
+    times = 10
+    @filenames.each do |filename|
+      puts "====== #{filename} ====="
+      @psfile = PokerstarsFile.open(filename).entries.each do |handrecord|
+        printf(".")
+        lambda{handrecord.parse}.should_not raise_error
+      end
+      printf("\n")
+    end
+  end
+end
+
+# describe PokerstarsHandHistoryParser, "when parsing all the PokerstarsFiles in Judi's directory" do
+#   before :each do
+#     @filenames = Dir["/Users/werdna/juditest/*.txt"]
+#   end
+# 
+#   it "should parse every line of every entry in the file" do
+#     times = 10
+#     @filenames.each do |filename|
+#       puts "====== #{filename} ====="
+#       @psfile = PokerstarsFile.open(filename).entries.each do |handrecord|
+#         @stats = HandStatistics.new
+#         @parser = PokerstarsHandHistoryParser.new(@stats)
+#         # puts handrecord.lines.first
+#         printf(".")
+#         handrecord.lines.each do |line|
+#           lambda{@parser.parse(line)}.should_not raise_error
+#         end
+#         # @stats.debug_display
+#       end
+#       printf("\n")
+#     end
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wizardwerdna-pokerstats
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors: 
 - Andrew C. Greenberg
@@ -87,8 +87,10 @@ files:
 - spec/pokerstars_file_spec.rb
 - spec/pokerstars_hand_history_parser.rb
 - spec/spec_helper.rb
+- spec/zpokerstars_hand_history_parser_integration.rb.txt
 has_rdoc: false
 homepage: http://github.com/wizardwerdna/pokerstats
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: poker hand history statistics library