the_gambler 0.1.0 → 1.0.0

data/README.md

@@ -2,7 +2,7 @@
 
 Yet another poker hand evaluator. I'm writing it because poker hand evaluators
 are useful to me in some of my side projects. If it's useful to you, too, all
-the better.
+the better. If it's not, then don't use it. Easy.
 
 ## Usage
 
@@ -18,19 +18,17 @@ Start rockin':
 You can initialize `Card`s using a (case-insensitive) String (_e.g._ `"JC"`), 
 an Array (_e.g._ `['9', 'S']`), or a Hash (_e.g._ `{rank: 'Q', suit: :diamonds}`).
 
+Hands are just arrays of cards. You can use the `#blackjack_value` and `#poker_value` methods to use
+them in games.
+
 ## Beta progress
 
 Right now, the following stuff works. Assume anything not mentioned in this list doesn't work properly.
 
 * Blackjack hand evaluation
-* (Very) Rough poker hand evaluation (i.e., flush > three of a kind, but not distinguishing between different instances of hands)
-* Exact poker hand evaluation of all types of hands (!!!).
-
-### Known issues
-
-* Hands with the same ranking but different high cards are valued equally.
+* Poker hand evaluation
 
-## Contributing to the_gambler
+## Contributing to `the_gambler`
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.

data/VERSION

@@ -1 +1 @@
-0.1.0
+1.0.0

data/lib/the_gambler/poker.rb

@@ -8,41 +8,71 @@ module TheGambler
     
     def poker_value
       if royal_flush? then
-        10e10
+        
+        10000e10
+        
       elsif straight_flush? then
+        
         if contents.map(&:numerical_value).sort == [2, 3, 4, 5, 14] then
-          10e9 + 1
+          10000e9 + 1
         else
-          10e9 + contents.max_by(&:numerical_value).numerical_value
+          10000e9 + contents.max_by(&:numerical_value).numerical_value
         end
+        
       elsif four_of_a_kind? then
+        
         c = contents.group_by(&:numerical_value)
-        10e8 + c.keys.max_by{|k| c[k].count}
+        10000e8 + 13 * c.keys.max_by{|k| c[k].count} + c.keys.min_by{|k| c[k].count}
+        
       elsif full_house? then
+        
         c = contents.group_by(&:numerical_value)
-        10e7 + c.keys.detect{|k| c[k].count == 3} * 13 + c.keys.detect{|k| c[k].count == 2}
+        10000e7 + c.keys.detect{|k| c[k].count == 3} * 13 + c.keys.detect{|k| c[k].count == 2}
+        
       elsif flush? then
-        10e6 + contents.max_by(&:numerical_value).numerical_value
+        
+        10000e6 + contents.max_by(&:numerical_value).numerical_value
+        
       elsif straight? then
+        
         if contents.map(&:numerical_value).sort == [2, 3, 4, 5, 14] then
-          10e5 + 1
+          10000e5 + 1
         else
-          10e5 + contents.max_by(&:numerical_value).numerical_value
+          10000e5 + contents.max_by(&:numerical_value).numerical_value
         end
+        
       elsif three_of_a_kind? then
+        
         c = contents.group_by(&:numerical_value)
-        10e4 + c.keys.detect{|k| c[k].count == 3}
+        a, b = c.keys.select{|k| c[k].count == 1}.minmax
+        10000e4 + 13 * 13 * c.keys.detect{|k| c[k].count == 3} + 13 * b + a
+        
       elsif two_pair? then
+        
         c = contents.group_by(&:numerical_value)
         
         pair_one, pair_two = c.keys.select{|k| c[k].count == 2}.minmax
+        kicker = c.keys.detect{|k| c[k].count == 1}
+        
+        10000e3 + 13 * 13 * pair_two + 13 * pair_one + kicker
         
-        10e3 + 13 * pair_two + pair_one
       elsif one_pair? then
+        
         c = contents.group_by(&:numerical_value)
-        10e2 + c.keys.detect{|k| c[k].count == 2}
+        kicker_value = 0
+        c.keys.select{|k| c[k].count == 1}.each do |n|
+          kicker_value = kicker_value * 13 + n
+        end
+        10000e2 + (13 ** 4) * c.keys.detect{|k| c[k].count == 2} + kicker_value
+        
       elsif high_card? then
-        contents.max_by(&:numerical_value).numerical_value
+        
+        value = 0
+        contents.map(&:numerical_value).sort.each_with_index do |n, i|
+          value += 13 ** i * n
+        end
+        value
+        
       end
     end
     

data/spec/decks/deck_spec.rb

@@ -4,11 +4,30 @@ module TheGambler
   
   describe Deck do
     let(:deck) { Deck.new }
-    
-    it 'should default to sorted, not shuffled' do
-      
+
+    describe '#initialize' do
+      it 'should accept cards as arguments' do
+        pending
+      end
+
+      it 'should accept an array of cards as arguments' do
+        pending
+      end
+
+    end
+
+    describe '#deal' do
+      it 'should deal the first card in the deck' do
+        pending
+      end
+    end
+
+    describe '#shuffle' do
+      it 'should change the ordering of the deck in a random manner' do
+        pending
+      end
     end
     
   end
   
-end
+end

data/spec/hands/poker/kicker_cards_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+module TheGambler
+  describe Hand do
+    describe '#poker_value' do
+      context 'with kicker cards' do
+        
+        context 'four of a kind' do
+          def four_of_a_kind(primary, kicker)
+            Hand.new "#{primary}S", "#{primary}C", "#{primary}H", "#{primary}D", "#{kicker}D"
+          end
+          
+          it 'should value four aces and a jack higher than four aces and a 3' do
+            four_of_a_kind('A', 'J').poker_value.should > four_of_a_kind('A', '3').poker_value
+          end
+          
+          it 'should value four 2s and an ace higher than four 2s and a 10' do
+            four_of_a_kind('2', 'A').poker_value.should > four_of_a_kind('2', '10').poker_value
+          end
+        end
+        
+        context 'three of a kind' do
+          def three_of_a_kind(primary, kicker1, kicker2)
+            Hand.new "#{primary}S", "#{primary}C", "#{primary}H", "#{kicker1}D", "#{kicker2}D"
+          end
+          
+          it 'should value three aces, a jack, and a 2 higher than three aces, a 10, and a 2' do
+            three_of_a_kind('A', 'J', '2').poker_value.should > three_of_a_kind('A', '10', '2').poker_value
+          end
+          
+          it 'should value three kings, a jack, and a 10 higher than three kings, a jack, and a 2' do
+            three_of_a_kind('K', 'J', '10').poker_value.should > three_of_a_kind('K', 'J', '2').poker_value
+          end
+        end
+        
+        context 'two pair' do
+          def two_pair(primary, secondary, kicker)
+            Hand.new "#{primary}S", "#{primary}C", "#{secondary}H", "#{secondary}D", "#{kicker}D"
+          end
+          
+          it 'should value two pairs with an ace kicker higher than two pairs with a 10 kicker' do
+            two_pair('J', '2', 'A').poker_value.should > two_pair('J', '2', '10').poker_value
+          end
+          
+          it 'should value two pairs with a 10 kicker higher than two pairs with an 8 kicker' do
+            two_pair('J', '2', '10').poker_value.should > two_pair('J', '2', '8').poker_value
+          end
+          
+        end
+
+        context 'one pair' do
+          def one_pair(pair, a, b, c)
+            Hand.new "#{pair}H", "#{pair}C", "#{a}D", "#{b}D", "#{c}D"
+          end
+
+          it 'should value a pair with J, 7, 2 higher than a pair with 10, 7, 2'  do
+            one_pair('A', 'J', '7', '2').poker_value.should > one_pair('A', '10', '7', '2').poker_value
+          end
+
+          it 'should value a pair with J, 7, 5 higher than a pair with J, 6, 5' do
+            one_pair('A', 'J', '7', '5').poker_value.should > one_pair('A', 'J', '6', '5').poker_value
+          end
+
+          it 'should value a pair with J, 7, 5 higher than a pair with J, 7, 2' do
+            one_pair('A', 'J', '7', '5').poker_value.should > one_pair('A', 'J', '7', '2').poker_value
+          end
+        end
+
+        context 'high card' do
+          it 'should value high card hand AQJ72 higher than ATJ72'  do
+            Hand.new(*%w{AD QC JS 7H 2D}).poker_value.should > Hand.new(*%w{AD 10C JS 7H 2D}).poker_value
+          end
+
+          it 'should value high card hand AQJ72 higher than AQT72'  do
+            Hand.new(*%w{AD QC JS 7H 2D}).poker_value.should > Hand.new(*%w{AD QC 10S 7H 2D}).poker_value
+          end
+
+          it 'should value high card hand AQJ72 higher than AQJ62'  do
+            Hand.new(*%w{AD QC JS 7H 2D}).poker_value.should > Hand.new(*%w{AD QC JS 6H 2D}).poker_value
+          end
+
+          it 'should value high card hand AQJ76 higher than AQJ72'  do
+            Hand.new(*%w{AD QC JS 7H 6D}).poker_value.should > Hand.new(*%w{AD QC JS 7H 2D}).poker_value
+          end
+        end
+        
+      end
+    end
+  end
+end

data/the_gambler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "the_gambler"
-  s.version = "0.1.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["max thom stahl"]
-  s.date = "2012-11-18"
+  s.date = "2012-11-20"
   s.description = "\n    Really common tasks in programs that use playing cards are a pain to implement. This is my\n    implementation. Use it. Or don't.\n  "
   s.email = "max@villainousindustries.com"
   s.extra_rdoc_files = [
@@ -33,17 +33,18 @@ Gem::Specification.new do |s|
     "lib/the_gambler/poker.rb",
     "spec/cards/initialization_spec.rb",
     "spec/decks/deck_spec.rb",
-    "spec/hands/hand_flush_spec.rb",
-    "spec/hands/hand_four_of_a_kind_spec.rb",
-    "spec/hands/hand_full_house_spec.rb",
-    "spec/hands/hand_high_card_spec.rb",
-    "spec/hands/hand_one_pair_spec.rb",
-    "spec/hands/hand_royal_flush_spec.rb",
-    "spec/hands/hand_straight_flush_spec.rb",
-    "spec/hands/hand_straight_spec.rb",
-    "spec/hands/hand_three_of_a_kind_spec.rb",
-    "spec/hands/hand_two_pair_spec.rb",
     "spec/hands/hands_spec.rb",
+    "spec/hands/poker/hand_flush_spec.rb",
+    "spec/hands/poker/hand_four_of_a_kind_spec.rb",
+    "spec/hands/poker/hand_full_house_spec.rb",
+    "spec/hands/poker/hand_high_card_spec.rb",
+    "spec/hands/poker/hand_one_pair_spec.rb",
+    "spec/hands/poker/hand_royal_flush_spec.rb",
+    "spec/hands/poker/hand_straight_flush_spec.rb",
+    "spec/hands/poker/hand_straight_spec.rb",
+    "spec/hands/poker/hand_three_of_a_kind_spec.rb",
+    "spec/hands/poker/hand_two_pair_spec.rb",
+    "spec/hands/poker/kicker_cards_spec.rb",
     "spec/players/player_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/shared_examples/shared_poker_hands.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_gambler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,17 +132,18 @@ files:
 - lib/the_gambler/poker.rb
 - spec/cards/initialization_spec.rb
 - spec/decks/deck_spec.rb
-- spec/hands/hand_flush_spec.rb
-- spec/hands/hand_four_of_a_kind_spec.rb
-- spec/hands/hand_full_house_spec.rb
-- spec/hands/hand_high_card_spec.rb
-- spec/hands/hand_one_pair_spec.rb
-- spec/hands/hand_royal_flush_spec.rb
-- spec/hands/hand_straight_flush_spec.rb
-- spec/hands/hand_straight_spec.rb
-- spec/hands/hand_three_of_a_kind_spec.rb
-- spec/hands/hand_two_pair_spec.rb
 - spec/hands/hands_spec.rb
+- spec/hands/poker/hand_flush_spec.rb
+- spec/hands/poker/hand_four_of_a_kind_spec.rb
+- spec/hands/poker/hand_full_house_spec.rb
+- spec/hands/poker/hand_high_card_spec.rb
+- spec/hands/poker/hand_one_pair_spec.rb
+- spec/hands/poker/hand_royal_flush_spec.rb
+- spec/hands/poker/hand_straight_flush_spec.rb
+- spec/hands/poker/hand_straight_spec.rb
+- spec/hands/poker/hand_three_of_a_kind_spec.rb
+- spec/hands/poker/hand_two_pair_spec.rb
+- spec/hands/poker/kicker_cards_spec.rb
 - spec/players/player_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/shared_poker_hands.rb
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 417615722838553205
+      hash: 3691939105348010071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: