Wave 3 complete

lib/highest_score.rb

@@ -13,9 +13,6 @@ def self.highest_score_from(array_of_words)
           wordscore_hash[w] = score
         end
 
-        #find max value of a value in a hash
-        # wordscore_hash.max[0]
-
         #returns all keys with max value
         top_scoring_words_hash = {}
         wordscore_hash.each do |k, v|

lib/player.rb

@@ -1,16 +1,18 @@
 require 'pry'
 require "./lib/score.rb"
 require "./lib/highest_score.rb"
+require "./lib/tilebag.rb"
 
 module Scrabble
 
   class Player
-    attr_accessor :name, :words_played, :player_score
+    attr_accessor :name, :words_played, :player_score, :tiles
 
     def initialize(name)
       @name = name.capitalize
       @words_played = []
       @player_score = 0
+      @tiles = []
     end
 
     def play_word(word)
@@ -44,5 +46,10 @@ def highest_scoring_word
     def highest_word_score
       ScrabbleGame.score(highest_scoring_word)
     end
+
+    def draw_tiles(tilebag)
+      num = 7 - @tiles.length
+      @tiles += (tilebag.draw_tiles(num))
+    end
   end
 end

lib/score.rb

@@ -39,10 +39,10 @@ def self.score(word)
         word_score += value[letter]
       end
 
-          if letters.length == 8
-          word_score += 50
-          puts "BONUS! You used all seven letters! You get 50 extra points!"
-          end
+      if letters.length == 8
+      word_score += 50
+      puts "BONUS! You used all seven letters! You get 50 extra points!"
+      end
 
       return word_score
     end

lib/tilebag.rb

@@ -3,15 +3,6 @@
 
 module Scrabble
 
-# DONE! Create a TileBag class with a minimum of 5 specs. It should have the following class and instance methods:
-# DONE! #initialize Called when you use TileBag.new, sets up an instance with a collection of default tiles
-# #draw_tiles(num) returns num number of random tiles, removes the tiles from the default set.
-# #tiles_remaining returns the number of tiles remaining in the bag
-# Create specs for (minimum 2) and add to the Player class the following instance methods:
-#
-# #tiles a collection of letters that the player can play (max 7)
-# #draw_tiles(tile_bag) fills tiles array until it has 7 letters from the given tile bag
-
   class TileBag
 
   attr_accessor :quantity
@@ -51,18 +42,23 @@ def initialize
 # turn @quantity into an array, shuffle, pop, and return x amount of letters
 
     def draw_tiles(num)
+      if num > 7
+        return []
+      else
       letters_array = []
         num.times do
         letters_array.push(@quantity.keys.shuffle.pop)
         end
-
         letters_array.each do |letter|
-          quantity.find
-
+          @quantity[letter] -= 1
         end
+        return letters_array
+      end
+    end
 
-      return letters_array
-
+    def tiles_remaining
+      sum = @quantity.values.inject(0) {|sum, value| sum + value}
+      sum
     end
   end
 end

spec/player_spec.rb

@@ -4,6 +4,7 @@
 describe Scrabble::Player do
   before :each do
     @bob = Scrabble::Player.new("Bob")
+    @tilebag = Scrabble::TileBag.new
   end
 
   describe ".new" do
@@ -99,5 +100,41 @@
     end
   end
 
+  describe "tiles" do
+    it "Tiles is an instance variable is created on player instatiation" do
+      expect(@bob.tiles).to eq []
+    end
+  end
+  #
+  describe "draw_tiles" do
+    before :each do
+      @bob.draw_tiles(@tilebag)
+    end
+    it "Fills player's tiles array with the given number of tiles, starting from an empty @tiles" do
+      expect(@bob.tiles.length).to eq 7
+    end
+  end
+
+  describe "draw_tiles" do
+    before :each do
+      @bob.tiles = ["x", "x"]
+      @bob.draw_tiles(@tilebag)
+    end
+    it "Fills player's tiles array with the given number of tiles, starting from a non-empty @tile" do
+      expect(@bob.tiles.length).to eq 7
+    end
+    it "Removes the same number of tiles from the tile bag" do
+      expect(@tilebag.tiles_remaining).to eq 93
+    end
+  end
 
+  describe "draw_tiles" do
+    before :each do
+      @bob.tiles = ["x", "x", "x", "x", "x", "x", "x"]
+      @bob.draw_tiles(@tilebag)
+    end
+    it "@tiles remains the same if it is already full" do
+      expect(@bob.tiles).to eq ["x", "x", "x", "x", "x", "x", "x"]
+    end
+  end
 end

spec/score_spec.rb

@@ -1,37 +1,34 @@
 require "./lib/score.rb"
 
-# describe Word do
-# @word = Scrabblegame.new
-# end
-
-describe "#word as parameter" do
-  it "checks if the input is a string" do
-    word = "test"
-    #.to be String/Fixnum
-    expect(word).to be_an_instance_of String
+describe Scrabble::ScrabbleGame do
+  describe "#word as parameter" do
+    it "checks if the input is a string" do
+      word = "test"
+      expect(word).to be_an_instance_of String
+    end
   end
-end
 
-describe "score" do
-  it "checks the value of the word 'puppy'" do
-    word = "puppy"
-    expect(Scrabble::Scrabblegame.score(word)).to eq 14
-  end
-  it "checks the value of the word 'huzzah'" do
-    word = "huzzah"
-    expect(Scrabble::Scrabblegame.score(word)).to eq 30
-  end
-  it "checks the value of the word 'cat'" do
-    word = "cat"
-    expect(Scrabble::Scrabblegame::score(word)).to eq 5
-  end
-  it "checks the value of nothing" do
-    word = ""
-    expect(Scrabble::Scrabblegame::score(word)).to eq 0
-  end
-  it "checks that 50 points are added to an 8 letter word" do
-    word = "flapjack"
-    expect(Scrabble::Scrabblegame::score(word)).to eq 76
-  end
+  describe "score" do
+    it "checks the value of the word 'puppy'" do
+      word = "puppy"
+      expect(Scrabble::ScrabbleGame.score(word)).to eq 14
+    end
+    it "checks the value of the word 'huzzah'" do
+      word = "huzzah"
+      expect(Scrabble::ScrabbleGame.score(word)).to eq 30
+    end
+    it "checks the value of the word 'cat'" do
+      word = "cat"
+      expect(Scrabble::ScrabbleGame::score(word)).to eq 5
+    end
+    it "checks the value of nothing" do
+      word = ""
+      expect(Scrabble::ScrabbleGame::score(word)).to eq 0
+    end
+    it "checks that 50 points are added to an 8 letter word" do
+      word = "flapjack"
+      expect(Scrabble::ScrabbleGame::score(word)).to eq 76
+    end
 
+  end
 end

spec/tilebag_spec.rb

@@ -6,20 +6,33 @@
       @tilebag = Scrabble::TileBag.new
     end
 
-      describe ".new" do
-        it "creates a new instance of a tile bag" do
-          expect(@tilebag).to be_an_instance_of Scrabble::TileBag
-        end
+    describe ".new" do
+      it "creates a new instance of a tile bag" do
+        expect(@tilebag).to be_an_instance_of Scrabble::TileBag
       end
+    end
 
-      describe "draw_tilebag(num)" do
-        it "randomly grabs (num) number of tiles" do
-          expect((@tilebag.draw_tiles(3)).length).to eq 3
-        end
-
+    describe "draw_tilebag(num)" do
+      before :each do
+        @tilebag.draw_tiles(4)
       end
+      it "removes tiles from the tilebag" do
+        expect(@tilebag.tiles_remaining).to eq 94
+      end
+      it "grabs (num) number of tiles" do
+        expect((@tilebag.draw_tiles(3)).length).to eq 3
+      end
+      it "does not likely draw the same letter array twice" do
+        expect(@tilebag.draw_tiles(6)).not_to eq(@tilebag.draw_tiles(6))
+      end
+      it "does not allow user to draw over 7 tiles" do
+        expect(@tilebag.draw_tiles(8)).to eq []
+      end
+    end
 
-
-
-
+    describe "tiles_remaining" do
+      it "returns the total number of tiles that remain after a Player" do
+        expect(@tilebag.tiles_remaining).to eq 98
+      end
+    end
   end