Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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'
50 changes: 50 additions & 0 deletions gem_city.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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

def initialize
@people = {
thieves: 5,
officers: 1
}
Copy link
Member

Choose a reason for hiding this comment

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

Do these two values really need to be joined into Hash? Consider the simplification if they weren't.

Copy link
Author

Choose a reason for hiding this comment

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

I had used it because that's the way it came but having them as instance variables and using attr_accessor is much nicer

@population = 50
end

def thieves(thieves_number = @people[:thieves])
Copy link
Member

Choose a reason for hiding this comment

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

Officers have both a getter and setter method, but thieves just have this hybrid method. I think two methods is better.

@people[:thieves] = thieves_number
end

def officers
@people[:officers]
end

def officers=(officers)
@people[:officers] = officers
end

def happiness_of_town
# Happiness is random... people don't know what they want!
happiness_vals = []
happiness = 0
(1..@population).each do
happiness_vals.push(rand((100 - successful_crime_rate)..100))
end
happiness_vals.each do |value|
happiness += value
end
happiness / 100
end

def successful_crime_rate
thieves = @people[:thieves]
officers = @people[:officers]
if thieves <= 0 || officers > thieves
odds_percent = 0
else
odds = 1 - (officers.to_f / thieves.to_f)
odds_percent = odds * 100
end
odds_percent
end
end
6 changes: 3 additions & 3 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 @@ -16,7 +16,7 @@

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

Expand All @@ -27,7 +27,7 @@

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