Refractor Card Class and the Deck Class

davidortizfrau · Mar 4, 2014 · 1a0a1cc · 1a0a1cc
1 parent cb8ad58
commit 1a0a1cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/card.rb b/card.rb
@@ -1,3 +1,12 @@
 class Card
 	attr_accessor :suit, :value, :face
+
+	@SUITS = ["s", "h", "c", "d"]
+
+	@FACE_VALUES = {"A" => 13, "K" => 12, "Q" => 11, "J" => 10, "10" => 9, "9" => 8,
+	     "8" => 7,  "7" => 6,  "6" => 5,  "5" => 4,  "4" => 3,  "3" => 2, "2" => 1}
+
+	class << self
+  	attr_reader :SUITS, :FACE_VALUES
+  end
 end
diff --git a/deck.rb b/deck.rb
@@ -3,9 +3,8 @@ class Deck
 
 	def initialize
 		self.cards = []
-		%w(s h c d).each do |suit|
-			{"A" => 13, "K" => 12, "Q" => 11, "J" => 10, "10" => 9, "9" => 8,
-			 "8" => 7,  "7" => 6,  "6" => 5,  "5" => 4,  "4" => 3,  "3" => 2, "2" => 1}.each do |key, value|
+		Card.SUITS.each do |suit|
+			Card.FACE_VALUES.each do |key, value|
 				card = Card.new
 			  card.face = key
 				card.suit = suit