rpoker 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b9ef52714d62177bd664c67c4d2364d689a25c
-  data.tar.gz: 46884f0610f8cbb5bd184ca2b97a1ee8868ba21b
+  metadata.gz: 5741ebe32752dd99d446d310de326c3135044d7e
+  data.tar.gz: 19f9e061844a3cee879bf6b8446021a4c2d885b6
 SHA512:
-  metadata.gz: 33a3401c1f6272b60b2f8dadc28af9f3ec26070ec67afc0500cdefd1d7f15dc7fa164d4a204670bad1c9f2f8f0b68cb4b6990520150e71a9e31c151b6be42996
-  data.tar.gz: 16e3413647dedf0457e538ed7aaef29066ae891706b92b11a769a0239cf95766a97e3c8d3f641207b2e5cfecf09c6dadcf62bb7c141392c7346f9c859fc78c10
+  metadata.gz: 30d83de20f3889b6f7136e6da6986e71d87674db9ae7f8c67414aa3c706ba2bc6679a5fdac66dd1334bb64995c2e52b62d13b7e6c287ac172e5f0ff5c2de5b01
+  data.tar.gz: a68d3baea1a99ef7b84e668e2779651929aafbe77931ce9fa8a08cadca05864ab9612dc7d0dd49928a3ca7e9ec16e31ccb412ca437e8b2988ff9412125199689

data/lib/rpoker/card.rb

@@ -1,8 +1,8 @@
 class Card
   attr_reader :value, :suit
 
-  FACES = %w(T J Q K A)
-  SUITS = %w(h d c s)
+  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 = {

data/lib/rpoker/hand.rb

@@ -2,7 +2,7 @@ class Hand
   include Comparable
   attr_reader :cards
 
-  TYPES = %w(
+  RANKS = %i{
     straight_flush
     four_of_a_kind
     full_house
@@ -11,7 +11,7 @@ class Hand
     three_of_a_kind
     two_pair
     pair
-  )
+  }
 
   def initialize(cards)
     @cards =
@@ -35,78 +35,85 @@ class Hand
     return -1 if winner == other_hand
   end
 
+  def rank
+    @rank ||= RANKS.find { |rank| send("#{rank}?") } || :high_card
+  end
+
+  def rank_idx
+    RANKS.index(rank) || RANKS.size
+  end
+
   def display
     puts cards.join(" ")
   end
 
   def suits
-    @suits ||= cards.map(&:suit)
+    cards.map(&:suit)
   end
 
   def values
-    @values ||= cards.map(&:value)
-  end
-
-  def int_values
-    @int_values ||= cards.map(&:to_i)
+    cards.map(&:value)
   end
 
-  def num_uniq_values
-    @num_uniq_values ||= values.uniq.size
+  def nums
+    wheel? ? [5,4,3,2,1] : cards.map(&:to_i)
   end
 
-  def wheel?
-    values == %w(A 5 4 3 2)
+  def straight_flush?
+    flush? && straight?
   end
 
   def flush?
-    suits.all? { |suit| suit == suits.first }
+    suits.uniq.size == 1
   end
 
   def straight?
-    wheel? || (int_values.first == int_values.last + 4 && num_uniq_values == 5)
+    wheel? || (nums.first == nums.last + 4 && form == :abcde)
   end
 
-  def straight_flush?
-    flush? && straight?
+  def wheel?
+    values == %w(A 5 4 3 2)
   end
 
-  def full_house?
-    same_values?(0, 2) && same_values?(3, 4)
+  def four_of_a_kind?
+    form == :aaaab
   end
 
-  def four_of_a_kind?
-    same_values?(0, 3)
+  def full_house?
+    form == :aaabb
   end
 
   def three_of_a_kind?
-    same_values?(0, 2) && num_uniq_values == 3
+    form == :aaabc
   end
 
   def two_pair?
-    same_values?(0, 1) && same_values?(2, 3) && num_uniq_values == 3
+    form == :aabbc
   end
 
   def pair?
-    same_values?(0, 1) && num_uniq_values == 4
-  end
-
-  def rank
-    (TYPES.find { |type| send("#{type}?".to_sym) } || "high_card").gsub('_', ' ')
+    form == :aabcd
   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] }
+    @cards.sort_by! { |card| [-value_count[card.value], -card.to_i] }
+  end
+
+  def value_count
+    @value_count ||=
+      values.each_with_object(Hash.new(0)) { |v, hsh| hsh[v] += 1 }
+  end
+
+  def counts
+    value_count.values.sort_by { |count| -count }
   end
 
-  def same_values?(start, stop)
-    vals = values[start..stop]
-    vals.all? { |value| value == vals.first }
+  def form
+    @form ||=
+      counts.zip(%w(a b c d e)).map { |count, l| l*count }.join.to_sym
   end
 
   def validate!

data/lib/rpoker/matchup.rb

@@ -1,52 +1,20 @@
 class Matchup
   attr_reader :hand1, :hand2
-
   def initialize(hand1, hand2)
     @hand1, @hand2 = hand1, hand2
   end
 
   def winner
-    Hand::TYPES.each do |type|
-      # build the boolean type check method
-      is_type = "#{type}?".to_sym
-
-      # check whether either hand is of the type
-      if hand1.send(is_type) && hand2.send(is_type)
-        return same_type_winner
-      elsif hand1.send(is_type)
-        return hand1
-      elsif hand2.send(is_type)
-        return hand2
-      end
-    end
-
-    # both hands are high card rank and can be compared by
-    # comparing values
-    same_type_winner
+    return hand1 if hand1.rank_idx < hand2.rank_idx
+    return hand2 if hand2.rank_idx < hand1.rank_idx
+    same_rank_winner
   end
 
   private
-  # for two hands of the same type (straight, flush, etc):
-  # 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 either hand is a wheel
-    if hand1.wheel? && hand2.wheel?
-      return nil
-    elsif hand1.wheel?
-      return hand2
-    elsif hand2.wheel?
-      return hand1
-    end
-
-    # compare the numeric value pairs
-    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
+  def same_rank_winner
+    hand1.nums.zip(hand2.nums).each do |v1, v2|
+      return hand1 if v1 > v2
+      return hand2 if v2 > v1
     end
     nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpoker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben Cornelis
@@ -40,9 +40,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby library for comparing and ranking poker hands
 test_files: []
-has_rdoc: