Gawain Hewitt Takeaway challenge

lib/menu.rb

@@ -15,15 +15,13 @@ def show
   end
 
   def check(dish)
-    _dish = dish.to_sym
+    the_dish = dish.to_sym
     @dishes.each do |dish|
-      "food #{dish[:food]}"
-      if _dish == dish[:food]
+      if the_dish == dish[:food]
         return true
       end
     end
     return false
   end
 
 end
-

lib/takeaway.rb

@@ -1,16 +1,14 @@
 require './lib/menu'
 
 class Takeaway
-
+  attr_reader :menu, :summary
+
   def initialize(input: $stdin, output: $stdout)
     @input = input
     @output = output
     @menu = Menu.new
     @dishes = []
-  end
-
-  def menu
-    @menu
+    @summary = []
   end
 
   def show_menu
@@ -19,24 +17,45 @@ def show_menu
 
   def order
     loop do
-      @output.puts "Please type each dish you require followed by return. When you have finished your order press return twice."
-      dish = @input.gets.chomp
-      # return true if dish == "" 
+      dish = ask_for_order
+      return true if dish == "" 
       if menu.check(dish)
-        @output.puts "how many do you want?"
-        quantity = @input.gets.to_i
-        return true
+        quantity = ask_for_quantity
+        log_order(dish, quantity)
       else
-        @output.puts "Sorry, we don't have that dish - perhaps you've made a spelling mistake?"
+        clarify_order
       end
     end
   end
-
-end
 
+  private
+
+  def confirm_order
+    true
+  end
 
-# need to get the method order looping to keep asking until double return
-# line 24 and removing line 28 does this for an irb test but it breaks 
-# the rspec tests. Until this is fixed we can't run the 3 items test
-# also the order is not being put anywhere yet - needs to be added to a 
-# hash - and perhaps to and order class
+  def ask_for_order
+    @output.puts <<~ORDER 
+    Please type each dish you require followed by return. 
+    When you have finished your order press return twice.
+    ORDER
+    dish = @input.gets.chomp
+  end
+
+  def clarify_order
+    @output.puts "Sorry, we don't have that dish - perhaps you've made a spelling mistake?"
+  end
+
+  def ask_for_quantity
+    @output.puts "how many do you want?"
+    quantity = @input.gets.to_i
+  end
+
+  def log_order(dish, quantity)
+    order_item = {}
+    order_item[:food] = dish
+    order_item[:quantity] = quantity
+    @summary << order_item
+  end
+
+end

spec/feature_test_spec.rb

@@ -6,17 +6,21 @@
       output = place_order_with_input("Brocoli", "Broccoli")
 
       expect(output).to eq <<~OUTPUT
-        Please type each dish you require followed by return. When you have finished your order press return twice.
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         Sorry, we don't have that dish - perhaps you've made a spelling mistake?
-        Please type each dish you require followed by return. When you have finished your order press return twice.
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         how many do you want?
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         OUTPUT
     end
   end
 
   def place_order_with_input(*order)
-    input = StringIO.new(order.join("\n") + "\n")
-    output= StringIO.new
+    input = StringIO.new(order.join("\n") + "\n" + "\n" + "\n")
+    output = StringIO.new
 
     takeaway = Takeaway.new(input: input, output: output)
     expect(takeaway.order).to eq true

spec/menu_spec.rb

@@ -28,4 +28,3 @@
   end
 
 end
-

spec/takeaway_spec.rb

@@ -11,31 +11,49 @@
   end
 
   context '#order' do
-    it 'can order one item from menu' do
-      output = place_order_with_input("Broccoli")
+    it 'can ask for one order from menu' do
+      output = place_order_with_input_and_return_output("Broccoli")
 
       expect(output).to eq <<~OUTPUT
-        Please type each dish you require followed by return. When you have finished your order press return twice.
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         how many do you want?
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         OUTPUT
     end
-    xit 'can order three items from menu' do
-      output = place_order_with_input("Broccoli", 2, "Chips", 1, "Ice_cream", 1)
+    it 'can ask for three orders from menu' do
+      output = place_order_with_input_and_return_output("Broccoli", 2, "Chips", 1, "Ice_cream", 1)
 
       expect(output).to eq <<~OUTPUT
-        Please type each dish you require followed by return. When you have finished your order press return twice.
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         how many do you want?
-        Please type each dish you require followed by return. When you have finished your order press return twice.
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         how many do you want?
-        Please type each dish you require followed by return. When you have finished your order press return twice.
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         how many do you want?
+        Please type each dish you require followed by return. 
+        When you have finished your order press return twice.
         OUTPUT
     end
+    it 'stores an order of one dish' do
+      takeaway = place_order_with_input_and_return_class("Chips", 1)
+      expect(takeaway.summary).to eq([{ food: "Chips", quantity: 1 }])
+    end
+    it 'stores an order of four dishes' do
+      takeaway = place_order_with_input_and_return_class("Chips", 1, "Broccoli", 3, "Tofu", 1, "Ice_cream", 4)
+      expect(takeaway.summary).to eq([{ food: "Chips", quantity: 1 }, 
+        { food: "Broccoli", quantity: 3 }, { food: "Tofu", quantity: 1 }, 
+        { food: "Ice_cream", quantity: 4 }])
+    end
   end
 
-  def place_order_with_input(*order)
-    input = StringIO.new(order.join("\n") + "\n")
-    output= StringIO.new
+  def place_order_with_input_and_return_output(*order)
+    input = StringIO.new(order.join("\n") + "\n" + "\n" + "\n")
+    output = StringIO.new
 
     takeaway = Takeaway.new(input: input, output: output)
     allow(takeaway.menu).to receive(:check).and_return(true)
@@ -44,4 +62,15 @@ def place_order_with_input(*order)
     output.string
   end
 
+  def place_order_with_input_and_return_class(*order)
+    input = StringIO.new(order.join("\n") + "\n" + "\n" + "\n")
+    output = StringIO.new
+
+    takeaway = Takeaway.new(input: input, output: output)
+    allow(takeaway.menu).to receive(:check).and_return(true)
+    expect(takeaway.order).to eq true
+
+    takeaway
+  end
+
 end