rpoker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837799d0168ceccf52c989c3b0c4133af13967d5
-  data.tar.gz: 7f8c046ce3fe08e926c7f6000b1a77743f937dc3
+  metadata.gz: 59b9ef52714d62177bd664c67c4d2364d689a25c
+  data.tar.gz: 46884f0610f8cbb5bd184ca2b97a1ee8868ba21b
 SHA512:
-  metadata.gz: 4d72492401a71f9802a157f5b11aea9ab91604cec64f0ff6d3ad631efa8e9df1453d6d29cd6d5c900e7f91b8aebd01d01fbc055b77cc83680faeb81d8bc82ea5
-  data.tar.gz: 08f668889a8267825ea742a4e3aaa87d5d1dc5e4301318486a0412794c46b396d225299145c3173642d1169d6889ab46d79766ca8a399fa99f41d12244e86ce5
+  metadata.gz: 33a3401c1f6272b60b2f8dadc28af9f3ec26070ec67afc0500cdefd1d7f15dc7fa164d4a204670bad1c9f2f8f0b68cb4b6990520150e71a9e31c151b6be42996
+  data.tar.gz: 16e3413647dedf0457e538ed7aaef29066ae891706b92b11a769a0239cf95766a97e3c8d3f641207b2e5cfecf09c6dadcf62bb7c141392c7346f9c859fc78c10

data/lib/rpoker/card.rb

@@ -1,6 +1,10 @@
 class Card
   attr_reader :value, :suit
 
+  FACES = %w(T J Q K A)
+  SUITS = %w(h d c s)
+  VALUES = %w(2 3 4 5 6 7 8 9) + FACES
+
   FACE_VALUES = {
     "T" => 10,
     "J" => 11,
@@ -11,7 +15,10 @@ class Card
 
   def initialize(string)
     chars = string.split("")
+    raise ArgumentError.new("Too many characters") if chars.size > 2
+
     @value, @suit = [chars.first.upcase, chars.last.downcase]
+    validate!
   end
 
   def to_s
@@ -22,7 +29,14 @@ class Card
     value.to_i.to_s != value
   end
 
-  def num_value
+  def to_i
     face_card? ? FACE_VALUES[value] : value.to_i
   end
+
+  private
+
+  def validate!
+    raise ArgumentError.new("The first character must be a card value") unless VALUES.include?(value)
+    raise ArgumentError.new("The second character must be a suit") unless SUITS.include?(suit)
+  end
 end

data/lib/rpoker/hand.rb

@@ -20,7 +20,12 @@ class Hand
         cards.map { |card| card.is_a?(Card) ? card : Card.new(card) }
       when String
         cards.split(" ").map {|s| Card.new(s)}
+      else
+        raise ArgumentError.new("Input must be a string or array")
       end
+
+    validate!
+    sort_cards!
   end
 
   def <=>(other_hand)
@@ -31,7 +36,7 @@ class Hand
   end
 
   def display
-    print cards.map { |card| card.to_s }.join(" ")
+    puts cards.join(" ")
   end
 
   def suits
@@ -42,39 +47,16 @@ class Hand
     @values ||= cards.map(&:value)
   end
 
-  def num_values
-    @num_values ||= cards.map(&:num_value)
-  end
-
-  def sorted_values
-    @sorted_values ||= num_values.sort.reverse
-  end
-
-  # sort card values by their multiplicity in descending order
-  # e.g. for the hand Js 2s Jh 4s 2c the method returns [11, 11, 2, 2, 4]
-  def values_sorted_by_count
-    @values_sorted_by_count ||=
-      [4,3,2,1].inject([]) { |sorted, n|
-        sorted += sorted_values.select { |value| sorted_values.count(value) == n } }
-  end
-
-  # sort distinct card values by their multiplicity in descending order
-  # e.g. for the hand Js 2s Jh 4s 2c the method returns [11, 2, 4]
-  def uniq_values_sorted_by_count
-    @uniq_values_sorted_by_count ||= values_sorted_by_count.uniq
+  def int_values
+    @int_values ||= cards.map(&:to_i)
   end
 
   def num_uniq_values
     @num_uniq_values ||= values.uniq.size
   end
 
-  def same_values_in_sorted?(start, stop)
-    values_slice = values_sorted_by_count[start..stop]
-    values_slice.all? { |value| value == values_slice.first }
-  end
-
   def wheel?
-    sorted_values == [14, 5, 4, 3, 2]
+    values == %w(A 5 4 3 2)
   end
 
   def flush?
@@ -82,7 +64,7 @@ class Hand
   end
 
   def straight?
-    wheel? || (sorted_values.first == sorted_values.last + 4 && num_uniq_values == 5)
+    wheel? || (int_values.first == int_values.last + 4 && num_uniq_values == 5)
   end
 
   def straight_flush?
@@ -90,26 +72,55 @@ class Hand
   end
 
   def full_house?
-    same_values_in_sorted?(0, 2) && same_values_in_sorted?(3, 4)
+    same_values?(0, 2) && same_values?(3, 4)
   end
 
   def four_of_a_kind?
-    same_values_in_sorted?(0, 3)
+    same_values?(0, 3)
   end
 
   def three_of_a_kind?
-    same_values_in_sorted?(0, 2) && num_uniq_values == 3
+    same_values?(0, 2) && num_uniq_values == 3
   end
 
   def two_pair?
-    same_values_in_sorted?(0, 1) && same_values_in_sorted?(2, 3) && num_uniq_values == 3
+    same_values?(0, 1) && same_values?(2, 3) && num_uniq_values == 3
   end
 
   def pair?
-    same_values_in_sorted?(0, 1) && num_uniq_values == 4
+    same_values?(0, 1) && num_uniq_values == 4
   end
 
   def rank
     (TYPES.find { |type| send("#{type}?".to_sym) } || "high_card").gsub('_', ' ')
   end
+
+  private
+  # sort cards by their value multiplicity in descending order
+  # e.g. sort Js 2s Jh 4s 2c as Js Jh 2s 2c 4s
+  def sort_cards!
+    vals = cards.map(&:to_i)
+    counts = Hash[vals.map { |val| [val, vals.count(val)] }]
+    @cards.sort_by! { |card| [-counts[card.to_i], -card.to_i] }
+  end
+
+  def same_values?(start, stop)
+    vals = values[start..stop]
+    vals.all? { |value| value == vals.first }
+  end
+
+  def validate!
+    validate_length!
+    check_for_duplicates!
+  end
+
+  def validate_length!
+    raise ArgumentError.new("A hand must contain 5 cards") unless cards.size == 5
+  end
+
+  def check_for_duplicates!
+    unless cards.map(&:to_s).uniq.size == 5
+      raise ArgumentError.new("A hand cannot contain duplicate cards")
+    end
+  end
 end

data/lib/rpoker/matchup.rb

@@ -22,16 +22,15 @@ class Matchup
 
     # both hands are high card rank and can be compared by
     # comparing values
-    return same_type_winner
+    same_type_winner
   end
 
   private
   # for two hands of the same type (straight, flush, etc):
-  # returns the winner by sorting the hands' numeric values
+  # returns the winner by sorting the hands' integer values
   # and then comparing value pairs in descending order
   def same_type_winner
-
-    # check for the special case where one hand is a wheel
+    # check for the special case where either hand is a wheel
     if hand1.wheel? && hand2.wheel?
       return nil
     elsif hand1.wheel?
@@ -41,14 +40,14 @@ class Matchup
     end
 
     # compare the numeric value pairs
-    values1, values2 = [hand1, hand2].map(&:uniq_values_sorted_by_count)
-    values1.zip(values2).each do |v1, v2|
+    value_pairs = hand1.int_values.zip(hand2.int_values)
+    value_pairs.each do |v1, v2|
       if v1 > v2
         return hand1
       elsif v2 > v1
         return hand2
       end
     end
-    return nil
+    nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpoker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Cornelis