Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final Exam for 362 #7

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
10 changes: 9 additions & 1 deletion lib/vessel.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
class Vessel
attr_reader :volume
attr_reader :name
attr_accessor :volume

def initialize(name, volume)
@name = name
@volume = volume
end

def empty?
@volume == 0
end

def fill
end

end
5 changes: 4 additions & 1 deletion lib/water_dispenser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ def initialize(reservoir)
end

def dispense(vessel)
reservoir.drain(vessel.volume)
if reservoir.drain(vessel.volume).negative?
puts "Danger The dispenser has reached 0"
@volume = 0
end
end

end
2 changes: 1 addition & 1 deletion lib/water_reservoir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def empty?
end

def fill
current_water_volume = capacity
current_water_volume + capacity
end

def drain(volume)
Expand Down
8 changes: 8 additions & 0 deletions spec/item_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
require_relative '../lib/item'

describe 'An item of food or a beverage' do
before do
@item = Item.new('FAKE', 200)
end

it 'has a name and volume' do
expect(@item.name).to eq('FAKE')
expect(@item.volume).to eq(200)
end

end
6 changes: 2 additions & 4 deletions spec/vessel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
describe 'A vessel for holding liquid' do

it 'has a name and volume' do
vessel = Vessel.new
vessel = Vessel.new('FAKE', 100)
expect(vessel.name).to eq('FAKE')
expect(vessel.volume).to eq(100)
end

it 'is initially empty' do
skip
vessel = Vessel.new('FAKE', 100)
vessel = Vessel.new('FAKE', 0)
expect(vessel).to be_empty
end

it 'is no longer empty when we fill it' do
skip
vessel = Vessel.new('FAKE', 100)
vessel.fill
expect(vessel).to_not be_empty
Expand Down
12 changes: 12 additions & 0 deletions spec/water_dispenser_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
require_relative '../lib/water_dispenser'

describe 'A water dispenser' do
before do
@res = WaterReservoir.new
@dispenser = WaterDispenser.new(@res)
@vessel = Vessel.new("fake", 100)
end

it 'has a resevoir' do
expect(@dispenser.reservoir).to eq(@res)
end

it 'despenses water in a vessel' do
expect(@dispenser.dispense(@vessel)).to eq(0)
end
end
15 changes: 15 additions & 0 deletions spec/water_reservoir_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
require_relative '../lib/water_reservoir'

describe 'A water reservoir' do
before do
@res = WaterReservoir.new(10, 20)
end

it 'has a capacity and initial_water_volume' do
expect(@res.capacity).to eq(10)
expect(@res.current_water_volume).to eq(20)
end

it 'is tests if empty' do
expect(@res).to_not be_empty
end

it 'fills' do
expect(@res.fill).to eq(30)
end
end