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

trying to get vessel volume to fill #17

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions lib/vessel.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
class Vessel
attr_reader :volume
attr_reader :volume, :name, :empty

def initialize(name, volume)
def initialize(name = 'FAKE', volume = 100)
@name = name
@volume = volume
@empty = true
end

def empty?
@empty
end

def fill
@empty = false
end

def get_volume
@volume
end

def add_volume(value)
@volume = @volume + value
end

end
8 changes: 8 additions & 0 deletions lib/water_dispenser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ def initialize(reservoir)
end

def dispense(vessel)
water = reservoir.current_water_volume - vessel.get_volume
if water < 0
water = reservoir.current_water_volume
else
water = vessel.get_volume
end
vessel.fill
reservoir.drain(vessel.volume)

end

end
6 changes: 5 additions & 1 deletion lib/water_reservoir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ def fill
end

def drain(volume)
self.current_water_volume -= volume
if (current_water_volume >= volume)
self.current_water_volume -= volume
else
self.current_water_volume = 0
end
end

end
4 changes: 3 additions & 1 deletion spec/chiller_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require_relative '../lib/chiller'

describe 'A chiller' do

it 'has a exits' do
expect(Chiller)
end
end
20 changes: 20 additions & 0 deletions spec/freezer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
require_relative '../lib/freezer'

describe 'A freezer' do
it 'has a exits' do
expect(Freezer)
end

it 'symbolys' do
freezer = Freezer.new()
expect(freezer).to respond_to(:capacity)
expect(freezer).to respond_to(:temperature)
end

it 'temperature' do
freezer = Freezer.new()
expect(freezer.temperature).to eq(70)
end

it 'set level' do
freezer = Freezer.new()
freezer.set_level(5)
expect(freezer.temperature).to eq(20)
end

end
9 changes: 9 additions & 0 deletions spec/item_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,13 @@

describe 'An item of food or a beverage' do

it 'has a exits' do
expect(Item)
end

it 'has name and volume' do
item = Item.new("foo",100)
expect(item.name).to eq("foo")
expect(item.volume).to eq(100)
end
end
4 changes: 3 additions & 1 deletion spec/refrigerator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require_relative '../lib/refrigerator'

describe 'A refrigerator' do

it 'has a exits' do
expect(Refrigerator)
end
end
2 changes: 0 additions & 2 deletions spec/vessel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
end

it 'is initially empty' do
skip
vessel = Vessel.new('FAKE', 100)
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
32 changes: 32 additions & 0 deletions spec/water_dispenser_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
require_relative '../lib/water_dispenser'

describe 'A water dispenser' do
it 'has a exits' do
expect(WaterDispenser)
end

it 'has a resouvor' do
reservoir = WaterReservoir.new
water_dispenser = WaterDispenser.new(reservoir)
expect(water_dispenser.reservoir).to eq(reservoir)
end

it 'can dispense' do
reservoir = WaterReservoir.new(100)
water_dispenser = WaterDispenser.new(reservoir)
vessel = Vessel.new()
expect(water_dispenser.dispense(vessel)).to eq(0)
end

it 'cant dispense past 0' do
reservoir = WaterReservoir.new()
water_dispenser = WaterDispenser.new(reservoir)
vessel = Vessel.new()
expect(water_dispenser.dispense(vessel)).to eq(0)
end

it 'vessel is filled' do
reservoir = WaterReservoir.new()
water_dispenser = WaterDispenser.new(reservoir)
vessel = Vessel.new()
expect(vessel).to be_empty
water_dispenser.dispense(vessel)
expect(vessel).to_not be_empty
end

end
25 changes: 25 additions & 0 deletions spec/water_reservoir_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
require_relative '../lib/water_reservoir'

describe 'A water reservoir' do
it 'has a exits' do
expect(WaterReservoir)
end

it 'has a capacity and current water volume' do
reservoir = WaterReservoir.new
expect(reservoir).to respond_to(:capacity)
expect(reservoir).to respond_to(:current_water_volume)
end

it 'to be empty' do
reservoir = WaterReservoir.new
expect(reservoir).to be_empty
end

it 'to not be empty' do
reservoir = WaterReservoir.new(10,10)
expect(reservoir).to_not be_empty
end

it 'to drain' do
reservoir = WaterReservoir.new(10,10)
reservoir.drain(5)
expect(reservoir.current_water_volume).to eq(5)
end

end