the_gambler 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## 1.1.0
+
+Got seven-card hands working.
+
+## 1.0.0
+
+Got accurate poker hande valuations for all cases.
+
+## 0.1.0
+
+Poker hand evaluation barely working.

data/README.md

@@ -27,6 +27,7 @@ Right now, the following stuff works. Assume anything not mentioned in this list
 
 * Blackjack hand evaluation
 * Poker hand evaluation
+* 5 or 7 card hands
 
 ## Contributing to `the_gambler`
  

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/the_gambler/poker.rb

@@ -95,17 +95,24 @@ module TheGambler
     end
     
     def straight?
-      values = contents.map(&:numerical_value).sort
-      values == (values.min..values.max).to_a or values == [2, 3, 4, 5, 14]
+      # values = contents.map(&:numerical_value).sort
+      # values == (values.min..values.max).to_a or values == [2, 3, 4, 5, 14]
+      nums = contents.map(&:numerical_value)
+      return true if nums.sort == [2, 3, 4, 5, 14]
+
+      (2..14).each_cons(5) do |straight|
+        return true if (nums & straight).count == 5
+      end
     end
     
     def flush?
-      contents.map(&:suit).uniq.count == 1
+      c = contents.group_by(&:suit)
+      !! contents.group_by(&:suit).values.detect{|k| k.count == 5}
     end
     
     def full_house?
-      as_string = contents.sort_by(&:numerical_value).map(&:to_s).join
-      as_string =~ %r{(.{1,2})[SCHD]\1[SCHD]\1[SCHD](.{1,2})[SCHD]\2[SCHD]} or as_string =~ %r{(.{1,2})[SCHD]\1[SCHD](.{1,2})[SCHD]\2[SCHD]\2[SCHD]}
+      c = contents.group_by(&:numerical_value).values.map(&:count)
+      c.any?{|x| x == 3} and c.select{|x| x >= 2}.count >= 2
     end
     
     def four_of_a_kind?
@@ -117,7 +124,7 @@ module TheGambler
     end
     
     def royal_flush?
-      contents.sort_by(&:numerical_value).map(&:to_s).join =~ %r{\A10([SCHD])J\1Q\1K\1A\1\Z}i
+      contents.sort_by(&:numerical_value).map(&:to_s).join =~ %r{10([SCHD])J\1Q\1K\1A\1}i
     end
     
   end

data/spec/hands/seven_or_nine_card_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module TheGambler
+  describe Hand do
+    context 'seven-card hands' do
+      it 'should recognize a royal flush within a seven-card hand' do
+        Hand.new(*%w{2D QH KH 4C JH 10H AH}).royal_flush?.should be_true
+      end
+
+      it 'should recognize a straight flush within a seven-card hand' do
+        Hand.new(*%w{9H QH KH 4C JH 10H 7D}).straight_flush?.should be_true
+      end
+
+      context 'with four of a kind' do
+        it 'should recognize a four of a kind within a seven-card hand' do
+          Hand.new(*%w{9D 9H 9C 4C 9S 10H 7D}).four_of_a_kind?.should be_true
+        end
+
+        it 'should recognize four of a kind and three of a kind at the same time as four of a kind only' do
+          Hand.new(*%w{9D 9H 9C 4C 9S 4H 4D}).four_of_a_kind?.should be_true
+        end
+      end
+
+      context 'with a full house' do
+        it 'should recognize a full house within a seven-card hand' do
+          Hand.new(*%w{9D 9H 9H 4C 4H 10H 7D}).full_house?.should be_true
+        end
+
+        it 'should recognize a full house within a seven-card hand' do
+          Hand.new(*%w{9D 9H 9H 4C 4H 4H 7D}).full_house?.should be_true
+        end
+      end
+
+      it 'should recognize a flush within a seven-card hand' do
+        Hand.new(*%w{9H QH KH 4C 6H 10H 7D}).flush?.should be_true
+      end
+
+      context 'with a straight' do
+        it 'should recognize a straight within a seven-card hand' do
+          Hand.new(*%w{9D QH KH JC 6H 10H 7D}).straight?.should be_true
+        end
+      end
+
+      it 'should recognize a three of a kind within a seven-card hand' do
+        Hand.new(*%w{QD QH QC 4C JH 10H 7D}).three_of_a_kind?.should be_true
+      end
+
+      it 'should recognize a two pair within a seven-card hand' do
+        Hand.new(*%w{9D QH 9H 4C 4H 10H QD}).two_pair?.should be_true
+      end
+
+      it 'should recognize a pair within a seven-card hand' do
+        Hand.new(*%w{KD QH KH 4C JH 10H 7D}).one_pair?.should be_true
+      end
+
+      it 'should recognize a high card within a seven-card hand' do
+        Hand.new(*%w{9D QH KH 4C 2H 10H 7D}).high_card?.should be_true
+      end
+    end
+  end
+end
+

data/the_gambler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "the_gambler"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["max thom stahl"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
     "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/hands/seven_or_nine_card_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: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -118,6 +118,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -144,6 +145,7 @@ files:
 - 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/hands/seven_or_nine_card_spec.rb
 - spec/players/player_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/shared_poker_hands.rb
@@ -164,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3691939105348010071
+      hash: 9032265535672364
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: