Skip to content
Open
Show file tree
Hide file tree
Changes from 4 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
56 changes: 0 additions & 56 deletions GemCity.rb

This file was deleted.

2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'rubocop', require: false
gem 'rspec'
gem 'rspec'
39 changes: 39 additions & 0 deletions gem_city.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# This class represents the town of GemCity
# This is a town riddled with crime but we can find out how happy the town is
class GemCity
attr_reader :population
attr_accessor :thieves, :officers

def initialize
@thieves = 5
@officers = 1
@population = 50
end

def happiness_of_town
# happiness is random... people don't know what they want!
happiness_vals = (1..@population).collect do
rand((100 - successful_crime_rate)..100)
end
happiness = happiness_vals.reduce(0, :+)
happiness / 100
end

def successful_crime_rate
if @thieves <= 0 || @officers > thieves
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whenever these if conditions get even a little complicated, I think they should be extracted to a private method. What do you think a good name for this condition might be? no_crime_can_occur?, plenty_of_cops?, something like that.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer no_crime_can_occur? because it captures the meaning of the method without exposing how the method makes that decision.

0
else
(1 - @officers.to_f / @thieves.to_f) * 100
end
end

def percentage_of_population(group)
format('%.0f%', (group.to_f / @population.to_f) * 100.0)
end

def city_demographics
{ thieves: percentage_of_population(@thieves),
officers: percentage_of_population(@officers),
civilians: percentage_of_population(@population - @thieves - @officers) }
end
end
48 changes: 24 additions & 24 deletions gem_city_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'rspec'
require_relative 'GemCity' # This line may need to be changed
require_relative 'gem_city'

describe 'Gem City' do
let(:city) { GemCity.new }
Expand All @@ -15,19 +15,19 @@
end

it 'officers = thieves' do
city.thieves 1
city.setOfficers 1 # This line may need to be changed
city.thieves = 1
city.officers = 1
expect(city.successful_crime_rate).to eq(0)
end

it 'thieves = 0' do
city.thieves 0
city.thieves = 0
expect(city.successful_crime_rate).to eq(0)
end

it 'officers > thieves' do
city.thieves 1
city.setOfficers 2 # This line may need to be changed
city.thieves = 1
city.officers = 2
expect(city.successful_crime_rate).to eq(0)
end
end
Expand All @@ -38,26 +38,26 @@
end

it 'successful_crime_rate = 0' do
city.thieves 0
city.thieves = 0
expect(city.happiness_of_town).to eq(50)
end
end

# context 'city_demographics' do
# it 'initialize' do
# demographics = city.city_demographics
# expect(demographics[:thieves]).to eq('10%')
# expect(demographics[:officers]).to eq('2%')
# expect(demographics[:civilians]).to eq('88%')
# end

# it 'thieves = 10, officers = 25' do
# city.thieves = 10
# city.officers = 25
# demographics = city.city_demographics
# expect(demographics[:thieves]).to eq('20%')
# expect(demographics[:officers]).to eq('50%')
# expect(demographics[:civilians]).to eq('30%')
# end
# end
context 'city_demographics' do
it 'initialize' do
demographics = city.city_demographics
expect(demographics[:thieves]).to eq('10%')
expect(demographics[:officers]).to eq('2%')
expect(demographics[:civilians]).to eq('88%')
end

it 'thieves = 10, officers = 25' do
city.thieves = 10
city.officers = 25
demographics = city.city_demographics
expect(demographics[:thieves]).to eq('20%')
expect(demographics[:officers]).to eq('50%')
expect(demographics[:civilians]).to eq('30%')
end
end
end