rpoker 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5741ebe32752dd99d446d310de326c3135044d7e
-  data.tar.gz: 19f9e061844a3cee879bf6b8446021a4c2d885b6
+  metadata.gz: 796e19ad9f806076d80c6b38cb37577a60fc2e48
+  data.tar.gz: 0229718b26ac3c2faf86e9c5061eb575807f6684
 SHA512:
-  metadata.gz: 30d83de20f3889b6f7136e6da6986e71d87674db9ae7f8c67414aa3c706ba2bc6679a5fdac66dd1334bb64995c2e52b62d13b7e6c287ac172e5f0ff5c2de5b01
-  data.tar.gz: a68d3baea1a99ef7b84e668e2779651929aafbe77931ce9fa8a08cadca05864ab9612dc7d0dd49928a3ca7e9ec16e31ccb412ca437e8b2988ff9412125199689
+  metadata.gz: 5b5576b3369451d33a07d1cc19cee5301bf2957b149e45558238b6b567058b75ee7eb3e989df69726fb7b8209fb2c493bed40922f4f5d043af000d763ba69110
+  data.tar.gz: 0102369e0d2c4e4020f3a8d0cbd1c84723aac6d3a60f9ca2be4c3cbeb0d58f0bbe0dab5998edcc2808f49545d6ba333713bbcbb54689d4888e7f0fad8de62e13

data/lib/rpoker/card.rb

@@ -1,42 +1,64 @@
 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,
-    "Q" => 12,
-    "K" => 13,
-    "A" => 14
+  attr_reader :rank, :suit
+
+  FACE_TO_NUM = {
+    'T' => 10,
+    'J' => 11,
+    'Q' => 12,
+    'K' => 13,
+    'A' => 14
   }
 
-  def initialize(string)
-    chars = string.split("")
-    raise ArgumentError.new("Too many characters") if chars.size > 2
+  def initialize(str)
+    validate!(str)
 
-    @value, @suit = [chars.first.upcase, chars.last.downcase]
-    validate!
+    chars = str.chars
+    @rank = chars.first.upcase
+    @suit = chars.last.downcase
   end
 
   def to_s
-    "#{@value}#{@suit}"
+    "#{rank}#{suit}"
   end
 
-  def face_card?
-    value.to_i.to_s != value
+  def face?
+    faces.include? rank
   end
 
   def to_i
-    face_card? ? FACE_VALUES[value] : value.to_i
+    face? ? FACE_TO_NUM[rank] : rank.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)
+  def validate!(str)
+    raise ArgumentError, 'Input must be a string'       unless str.is_a? String
+    raise ArgumentError, 'Wrong number of characters'   unless str.length == 2
+    raise ArgumentError, 'Input must start with a rank' unless rank?(str[0])
+    raise ArgumentError, 'Input must end with a suit'   unless suit?(str[1])
+  end
+
+  def rank?(str)
+    ranks.include? str.upcase
+  end
+
+  def suit?(str)
+    suits.include? str.downcase
+  end
+
+  def ranks
+    numerics + faces
+  end
+
+  def numerics
+    %w(2 3 4 5 6 7 8 9)
+  end
+
+  def faces
+    %w(T J Q K A)
+  end
+
+  def suits
+    %w(s c d h)
   end
 end

data/lib/rpoker/hand.rb

@@ -14,18 +14,9 @@ class Hand
   }
 
   def initialize(cards)
-    @cards =
-      case cards
-      when Array
-        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
+    @cards = parse_cards(cards)
 
-    validate!
-    sort_cards!
+    validate_cards!
   end
 
   def <=>(other_hand)
@@ -47,15 +38,15 @@ class Hand
     puts cards.join(" ")
   end
 
-  def suits
+  def card_suits
     cards.map(&:suit)
   end
 
-  def values
-    cards.map(&:value)
+  def card_ranks
+    cards.map(&:rank)
   end
 
-  def nums
+  def card_values
     wheel? ? [5,4,3,2,1] : cards.map(&:to_i)
   end
 
@@ -64,70 +55,90 @@ class Hand
   end
 
   def flush?
-    suits.uniq.size == 1
+    card_suits.uniq.size == 1
   end
 
   def straight?
-    wheel? || (nums.first == nums.last + 4 && form == :abcde)
+    return true if wheel?
+    sorted_values = card_values.sort
+    sorted_values.last - sorted_values.first == 4 && form == :xxxxx
   end
 
   def wheel?
-    values == %w(A 5 4 3 2)
+    card_ranks.sort == %w(A 2 3 4 5).sort
   end
 
   def four_of_a_kind?
-    form == :aaaab
+    form == :AAAAx
   end
 
   def full_house?
-    form == :aaabb
+    form == :AAABB
   end
 
   def three_of_a_kind?
-    form == :aaabc
+    form == :AAAxx
   end
 
   def two_pair?
-    form == :aabbc
+    form == :AABBx
   end
 
   def pair?
-    form == :aabcd
+    form == :AAxxx
   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!
-    @cards.sort_by! { |card| [-value_count[card.value], -card.to_i] }
+  def form
+    @form ||= compute_form
   end
 
-  def value_count
-    @value_count ||=
-      values.each_with_object(Hash.new(0)) { |v, hsh| hsh[v] += 1 }
+  # sort cards by their rank multiplicity in descending order
+  # e.g. sort 2s Jh 4s Js 2c as Jh Js 2s 2c 4s
+  def sort!
+    @cards.sort_by! { |card| [-card_rank_to_count[card.rank], -card.to_i] }
   end
 
-  def counts
-    value_count.values.sort_by { |count| -count }
+  private
+
+  def card_rank_to_count
+    @card_rank_to_count ||=
+      card_ranks.each_with_object(Hash.new(0)) { |v, hsh| hsh[v] += 1 }
   end
 
-  def form
-    @form ||=
-      counts.zip(%w(a b c d e)).map { |count, l| l*count }.join.to_sym
+  def compute_form
+    card_rank_counts      = card_rank_to_count.values.sort.reverse
+    counts_for_duplicates = card_rank_counts.select { |c| c > 1 }
+
+    counts_for_duplicates.zip(['A', 'B'])
+      .map { |count, letter| letter * count }.join.ljust(5, 'x').to_sym
   end
 
-  def validate!
+  def parse_cards(cards)
+    case cards
+    when Array  then cards.map { |card| card.is_a?(Card) ? card : Card.new(card) }
+    when String then cards.split(' ').map { |s| Card.new(s) }
+    else raise ArgumentError, 'Input must be a string or array'
+    end
+  end
+
+  def validate_cards!
     validate_length!
     check_for_duplicates!
   end
 
   def validate_length!
-    raise ArgumentError.new("A hand must contain 5 cards") unless cards.size == 5
+    unless cards.size == 5
+      raise ArgumentError, 'A hand must contain 5 cards'
+    end
   end
 
   def check_for_duplicates!
-    unless cards.map(&:to_s).uniq.size == 5
-      raise ArgumentError.new("A hand cannot contain duplicate cards")
+    if duplicates?
+      raise ArgumentError, 'A hand cannot contain duplicate cards'
     end
   end
+
+  def duplicates?
+    cards.map(&:to_s).uniq.size < 5
+  end
 end

data/lib/rpoker/matchup.rb

@@ -12,7 +12,12 @@ class Matchup
 
   private
   def same_rank_winner
-    hand1.nums.zip(hand2.nums).each do |v1, v2|
+    hand1.sort!
+    hand2.sort!
+
+    value_pairs = hand1.card_values.zip(hand2.card_values)
+
+    value_pairs.each do |v1, v2|
       return hand1 if v1 > v2
       return hand2 if v2 > v1
     end

metadata

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