lalala lots of paircolumbus

Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'rubocop', require: false
-gem 'rspec'
+gem 'rspec'

gem_city.rb

@@ -0,0 +1,46 @@
+# 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, :civilians
+  def initialize
+    @thieves = 5
+    @officers = 1
+    @population = 50
+  end
+
+  def civilians
+    population - (officers + thieves)
+  end
+
+  def happiness_of_town
+    overall_happiness = 0
+    @population.times do
+      overall_happiness += individual_happiness
+    end
+    overall_happiness / 100
+  end
+
+  def individual_happiness
+    # happiness is random... people don't know what they want!
+    rand((100 - successful_crime_rate)..100)
+  end
+
+  def successful_crime_rate
+    if officers > thieves || thieves <= 0
+      0
+    else
+      (1 - officers / thieves.to_f) * 100
+    end
+  end
+
+  def city_demographics
+    {  officers:   "#{ percent_of_pop (officers)  }%",
+       thieves:    "#{ percent_of_pop (thieves)   }%",
+       civilians:  "#{ percent_of_pop (civilians) }%" }
+  end
+
+  def percent_of_pop(type)
+    (100 * type / population.to_f).round
+  end
+end

gem_city_spec.rb

@@ -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 }
@@ -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
@@ -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