Added popular vote data

onewheelskyward · Nov 9, 2016 · 16fc014 · 16fc014
1 parent 0070120
commit 16fc014
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/lib/lita/handlers/onewheel_election_cnn.rb b/lib/lita/handlers/onewheel_election_cnn.rb
@@ -33,7 +33,7 @@ def election(response)
         response.reply "United States 2016 Presidential Election, #{results['races'][0]['pctsrep']}% reporting."
         results['candidates'].each do |candidate|
           candidate_str = "#{candidate['fname']} #{candidate['lname']}: "
-          candidate_str += "#{candidate['pctDecimal']}%, #{candidate['evotes']} electoral votes."
+          candidate_str += "#{candidate['pctDecimal']}%, #{candidate['cvotes']} popular votes, #{candidate['evotes']} electoral votes."
           candidate_str += "  WINNER!  " if candidate['winner']
           Lita.logger.debug "Replying with #{candidate_str}"
           response.reply candidate_str
@@ -53,7 +53,7 @@ def election_by_state(response)
             Lita.logger.debug "Replying with #{state_reply}"
             race['candidates'].each do |candidate|
               candidate_str = "#{candidate['fname']} #{candidate['lname']}: "
-              candidate_str += "#{candidate['pctDecimal']}%"
+              candidate_str += "#{candidate['pctDecimal']}%, #{candidate['cvotes']} popular votes"
               candidate_str += " WINNER! #{candidate['evotes']} electoral votes." if candidate['winner']
               Lita.logger.debug "Replying with #{candidate_str}"
               response.reply candidate_str

diff --git a/lita-onewheel-election-cnn.gemspec b/lita-onewheel-election-cnn.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-election-cnn'
-  spec.version       = '3.5.0'
+  spec.version       = '3.6.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = %q{Lita interface to CNN's 2016 Presidential Election JSON.}

diff --git a/spec/lita/handlers/onewheel_election_cnn_spec.rb b/spec/lita/handlers/onewheel_election_cnn_spec.rb
@@ -12,44 +12,44 @@
     allow(RestClient).to receive(:get) { mock }
     send_command 'election'
     expect(replies[0]).to eq("United States 2016 Presidential Election, 1% reporting.")
-    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 electoral votes.")
-    expect(replies[2]).to eq("Donald Trump: 0.0%, 19 electoral votes.")
+    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 popular votes, 0 electoral votes.")
+    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes, 19 electoral votes.")
   end
 
   it 'shows a winner' do
     mock = File.open('spec/fixtures/winner.json').read
     allow(RestClient).to receive(:get) { mock }
     send_command 'election'
     expect(replies[0]).to eq("United States 2016 Presidential Election, 1% reporting.")
-    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 electoral votes.  WINNER!  ")
-    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 electoral votes.")
+    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 popular votes, 0 electoral votes.  WINNER!  ")
+    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes, 0 electoral votes.")
   end
 
   it 'shows by state' do
     mock = File.open('spec/fixtures/election.json').read
     allow(RestClient).to receive(:get) { mock }
     send_command 'election va'
     expect(replies[0]).to eq("Virginia, 13 electoral votes, 0% reporting")
-    expect(replies[1]).to eq("Hillary Clinton: 0.0%")
-    expect(replies[2]).to eq("Donald Trump: 0.0%")
+    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 popular votes")
+    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes")
   end
 
   it 'shows by STATE' do
     mock = File.open('spec/fixtures/election.json').read
     allow(RestClient).to receive(:get) { mock }
     send_command 'election VA'
     expect(replies[0]).to eq("Virginia, 13 electoral votes, 0% reporting")
-    expect(replies[1]).to eq("Hillary Clinton: 0.0%")
-    expect(replies[2]).to eq("Donald Trump: 0.0%")
+    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 popular votes")
+    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes")
   end
 
   it 'shows by full state name downcase' do
     mock = File.open('spec/fixtures/election.json').read
     allow(RestClient).to receive(:get) { mock }
     send_command 'election new york'
     expect(replies[0]).to eq("NEW YORK, 29 electoral votes, 0% reporting")
-    expect(replies[1]).to eq("Hillary Clinton: 0.0%")
-    expect(replies[2]).to eq("Donald Trump: 0.0%")
+    expect(replies[1]).to eq("Hillary Clinton: 0.0%, 0 popular votes")
+    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes")
   end
 
   it 'ansis' do