euler_poker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 006bcaa584aea2730f6321f36e756b4ac45aedc7
-  data.tar.gz: d528d36fc097becdec5f17cb918537fb6f7582ef
+  metadata.gz: 38b3301dbaf9bda8a4c633827de7e2a288dc7409
+  data.tar.gz: 2611b9ecd1f325c881dbb2d782ca5893f6a0a5e3
 SHA512:
-  metadata.gz: e076703a9c5bbdf0332d187d6d310dd934b5a1575e6d92d88e01b1c5dd48a140eb29e44d8e3f368dba8ca5acb90cc3c332216be3955685f9a800f43795002605
-  data.tar.gz: 80c2b1989aa4463c28617791bdbe22bd2f6edc508f60d9101e24af2453abbdc841e99cb51ce26c12ac035ddfd64272beb57498853c1d1f4fa4e0e1245bc3b75a
+  metadata.gz: f85b4798a5d5b60c3ae8127df8e82c92ad78d37e9fe744e968c9f515f35fe1c3264a286e06586d80940fecb2059d238956b7f8c15cf66eff0f694d25bd85fd82
+  data.tar.gz: 4bc4e6155453b205bb79bc771baed5b50d6187b99c3b66da82fab6f1cb6742cdb890c5a66ccb582cc897235b4374ae53a7104295044f2bd6dc6b60808c5d63ed

data/lib/euler_poker.rb

@@ -1,6 +1,6 @@
-require 'euler_poker/hand'
-require 'euler_poker/card'
+require 'euler_poker/handable'
 require 'euler_poker/hand_factory'
+require 'euler_poker/card'
 require 'euler_poker/round'
 require 'euler_poker/cli'
 

data/lib/euler_poker/{hand.rb → handable.rb}

@@ -1,5 +1,5 @@
 module EulerPoker
-  class Hand
+  module Handable
     include Comparable
 
     def initialize(cards)
@@ -7,13 +7,20 @@ module EulerPoker
     end
 
     def <=>(other)
-      ranking <=> other.ranking
+      class_result = class_comparison(other)
+      return class_result unless class_result == 0
+
+      return instance_comparison(other)
     end
 
     def ranking
       RANKED_HANDS.reverse.index(self.class)
     end
 
+    def class_comparison(other)
+      ranking <=> other.ranking
+    end
+
     def ranks
       @cards.map(&:rank)
     end

data/lib/euler_poker/hands/flush.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class Flush < Hand
-    def <=>(other)
-      return super unless super == 0
+  class Flush
+    include Handable
 
+    def instance_comparison(other)
       descending_ranks <=> other.descending_ranks
     end
 

data/lib/euler_poker/hands/four_of_a_kind.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class FourOfAKind < Hand
-    def <=>(other)
-      return super unless super == 0
+  class FourOfAKind
+    include Handable
 
+    def instance_comparison(other)
       return quartet_rank <=> other.quartet_rank
     end
 

data/lib/euler_poker/hands/full_house.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class FullHouse < Hand
-    def <=>(other)
-      return super unless super == 0
+  class FullHouse
+    include Handable
 
+    def instance_comparison(other)
       if triplet_rank == other.triplet_rank
         return pair_rank <=> other.pair_rank
       else

data/lib/euler_poker/hands/high_card.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class HighCard < Hand
-    def <=>(other)
-      return super unless super == 0
+  class HighCard
+    include Handable
 
+    def instance_comparison(other)
       descending_ranks <=> other.descending_ranks
     end
 

data/lib/euler_poker/hands/one_pair.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class OnePair < Hand
-    def <=>(other)
-      return super unless super == 0
+  class OnePair
+    include Handable
 
+    def instance_comparison(other)
       if pair_rank != other.pair_rank
         pair_rank <=> other.pair_rank
       else

data/lib/euler_poker/hands/straight.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class Straight < Hand
-    def <=>(other)
-      return super unless super == 0
+  class Straight
+    include Handable
 
+    def instance_comparison(other)
       return ranks.max <=> other.ranks.max
     end
 

data/lib/euler_poker/hands/straight_flush.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class StraightFlush < Hand
-    def <=>(other)
-      return super unless super == 0
+  class StraightFlush
+    include Handable
 
+    def instance_comparison(other)
       return ranks.max <=> other.ranks.max
     end
 

data/lib/euler_poker/hands/three_of_a_kind.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class ThreeOfAKind < Hand
-    def <=>(other)
-      return super unless super == 0
+  class ThreeOfAKind
+    include Handable
 
+    def instance_comparison(other)
       if triplet_rank == other.triplet_rank
         return ranked_extra_cards <=> other.ranked_extra_cards
       else

data/lib/euler_poker/hands/two_pair.rb

@@ -1,8 +1,8 @@
 module EulerPoker
-  class TwoPair < Hand
-    def <=>(other)
-      return super unless super == 0
+  class TwoPair
+    include Handable
 
+    def instance_comparison(other)
       if high_pair_rank != other.high_pair_rank
         high_pair_rank <=> other.high_pair_rank
       elsif low_pair_rank != other.low_pair_rank

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: euler_poker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Richard Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies: []
 description: A solution to problem 54 of Project Euler
 email: rico@toasterlovin.com
@@ -21,8 +21,8 @@ files:
 - lib/euler_poker.rb
 - lib/euler_poker/card.rb
 - lib/euler_poker/cli.rb
-- lib/euler_poker/hand.rb
 - lib/euler_poker/hand_factory.rb
+- lib/euler_poker/handable.rb
 - lib/euler_poker/hands/flush.rb
 - lib/euler_poker/hands/four_of_a_kind.rb
 - lib/euler_poker/hands/full_house.rb