card_deck 2.1.1 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTEyZGE0MWI2MGFhYmVjMGVmMTZmYjM2M2Q5ZmFmM2M5MGE4NjM4NA==
+    NzU3ZDY0NzJjMjI5ZTdjNzlkODJmYjAyNjU2NjE0M2NhM2Q4MzBjMw==
   data.tar.gz: !binary |-
-    OGZhZDVmODA3MDY5YTE5MzYzMGM2ZGExNzk1NzU3ZDAyOTkzY2MyMw==
+    YjI2NWM4YjhkYWZhODU1ZjMxYzFjM2EzZTI3M2U2ZWY3ZDUwNDNjYw==
 SHA512:
   metadata.gz: !binary |-
-    ZTQwNTk1YzAzZmJiNDJkMWVmZmNhMzQ4OTQ2MGE4MzE3MWQ4NzljYzI3MjNh
-    ZWY5ZDE4OGM1ZDg5OGFhZDk1MTNhNWJjOGRlNmFkOTJlNjNkM2FmNmI1ZWRh
-    MGQyNzAwOTVlY2IzNjU5ZWIxYjdmYmNlYjEyMTFjYmZhZjIwMTQ=
+    ZjQyMDQ0MzYyNGRmNjAzMmQ1YmY5MDBmOTAzMzcwMjI0MWRjYjMyNjU2N2I3
+    MDMwYTFkZjk4NTZjNDk2YjkzNTQ1ODI3YzFhYThkNzY0ZTBhNjEwY2E3Mzll
+    NDA0MDU1ODkxMTZjOGM1NDBmZTgxOThhOWU0MWQ2MGE3NWVhM2E=
   data.tar.gz: !binary |-
-    Yzk2MjBmYjNmMjk2ZjE3ZWUwMGIxMjRkNTlkYjhiNWNjMDUyMjYxMGI3ZmIy
-    ZTVlYzBiMmVmZWRmYzE2ZTAyODk4ODE1Zjc2NWJmOGYxY2Y4MDgyOWVhYTFi
-    OGE5ZDhjZjZiZmVjYjNkMDJhZWQ5ZWI4ZDIyZWI3OGM2YjI3NWQ=
+    Y2U1OGEwMGRhMTJiNTU1ODJiOTY5OWVjZjhmNjExMjNlN2E5ZjI0MmUyNzZh
+    ZjViZGIxMDNlMGFhZjJhNzBkODc2MzBiN2U2NGVjYTRkM2YwZTQ1ZWM1Yzdk
+    OGEyMmQ0MDFiOWNiNDE3YjkzOThkYWQ3YWZjYzNmMGYzMGM0ZmU=

data/lib/card.rb

@@ -1,24 +1,23 @@
 module CardDeck # The gem
-	def Card(num, suit); Card.new num, suit; end # an easier way to generate a card
+	def Card(num=Card::Num, suit=Card::Suit.sample); Card.new num, suit; end # an easier way to generate a card
 	class CardError < StandardError; end # Errors for when you incorrectly use a card.
 	class Card # The central part of any card game. It is what makes card games 'Card' games.
-		HEARTS, SPADES, DIAMONDS, CLUBS = "\u2665", "\u2660", "\u2666", "\u2663" # Suits
-		NUM = %w(Ace King Queen Jack Joker) + (2..10).to_a # Legal arguments for parameter num in Card#new.
-		SUIT = [HEARTS, SPADES, DIAMONDS, CLUBS] # Legal arguments for parameter suit in Card#new
+		Hearts, Spades, Diamonds, Clubs = "\u2665", "\u2660", "\u2666", "\u2663" # Suits
+		Num = %w(Ace King Queen Jack Joker) + (2..10).to_a # Legal arguments for parameter num in Card#new.
+		Suit = [Hearts, Spades, Diamonds, Clubs] # Legal arguments for parameter suit in Card#new
 		attr_accessor :num # The card's number. Must be Ace, 2, 3, 4, 5, 6, 7, 8, 9, 10, Jack, Queen, King, or Joker
 		attr_accessor :suit # The card's suit. Must be Spades, Diamonds, Clubs, or Hearts.
-		def initialize(num, suit) # Creates a new card. Parameter num is the card's number. Parameter suit is the card's suit
-			unless SUIT.include? suit
+		def initialize(num=Num.sample, suit=Suit.sample) # Creates a new card. Parameter num is the card's number. Parameter suit is the card's suit. When given no arguments, the num and suit are randomly generated
+			unless Suit.include? suit
 				suit = case suit.downcase
-					when "diamonds" then DIAMONDS
-					when "spades" then SPADES
-					when "hearts" then HEARTS
-					when "clubs" then CLUBS
+					when "diamonds" then Diamonds
+					when "spades" then Spades
+					when "hearts" then Hearts
+					when "clubs" then Clubs
 				end
 			end
 			@num, @suit = num, suit
 		end
-		def self.gen; self.new NUM.sample, SUIT.sample; end # Creates a random new card.
 		def abbreviation # The shorter representation of the card
 			unless @num == "Joker"
 				if @num == 10 then "#{@suit}#{@num}"
@@ -29,7 +28,8 @@ module CardDeck # The gem
 				@num
 			end
 		end
-		def black?; suit == SPADES || suit == CLUBS; end # Tests if the suit color is black
+		def black?; suit == Spades || suit == Clubs; end # Tests if the suit color is black
+		def red?; suit == Hearts || suit == Diamonds; end # Tests if the suit color is red
 		alias abbr abbreviation # A shorter method name
 		alias to_s abbr
 	end

data/lib/deck.rb

@@ -4,7 +4,7 @@ module CardDeck
 		attr_accessor :cards # The cards in the deck
 		def initialize(args=Hash.new(false)) # Creates a new Deck. Includes Jokers when parmeter args == {jokers: true}
 			@cards = Array.new
-			for suit in Card::SUIT
+			for suit in Card::Suit
 				stock 'Ace', suit
 				for num in (2..10).to_a; stock num, suit; end
 				stock 'Jack', suit
@@ -14,6 +14,6 @@ module CardDeck
 			2.times {stock 'Joker'} if args[:jokers]
 		end
 		private
-			def stock(num, suit=Card::SUIT.sample); @cards.push Card.new num, suit; end # Creates a Card to add to Deck#cards
+			def stock(num, suit=Card::Suit.sample); @cards.push Card.new num, suit; end # Creates a Card to add to Deck#cards
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: card_deck
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Zachary Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec