lita-onewheel-election-cnn 4.0.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289326007436b02f499e5afb0f96947540a8a134
-  data.tar.gz: 088034f74b84735b5a0e03440a381d5837a92938
+  metadata.gz: dcb36f750767782db3259ff0c1d9c8cb4125fa30
+  data.tar.gz: 96f838ab65a3b2e6fa584b21260c61a1aed33156
 SHA512:
-  metadata.gz: 56cef4f0d6b7c6159bdeb55fbbb4c5c53a2416017d2b5dd41fed460dfd42a2defa44db6becc7679ba46b40bc467bd197eafe0e5fb98b6ffd661cec7b04be6323
-  data.tar.gz: 73736c8fb622c1e9b9a9b38fe1c426a463256e07e1a02ae587e77793c6865a4dd7d768aa457d84ba262de27ebe5fa7cd7f09d3b6c30b90ec78581f254b972d4f
+  metadata.gz: 4783f07244c7353d8171775137269befe9a5cac21752ef53fc44f9c165d58d47efc1956917b500882f0a4eff5327319417d2845b11af998759fb7878ad0c92f7
+  data.tar.gz: f0e062b036c60d5ced29faccdb3de0343a54afa767d600e30753d67f277b89ccb7b8ded9799a1414fb24935313bbcdb4ac2a7a4180bc4cc8f6833fb4fa38ef63

data/lib/lita/handlers/onewheel_election_cnn.rb

@@ -48,6 +48,11 @@ module Lita
           end
         end
 
+        blueredstr = get_blueredstr(votes)
+        response.reply "Clinton #{votes['blue']['percentage']}% #{votes['blue']['popular']} |#{blueredstr}\x0300| Trump #{votes['red']['percentage']}% #{votes['red']['popular']}"
+      end
+
+      def get_blueredstr(votes)
         bluecount = (votes['blue']['percentage'].to_f / 2).to_i
         redcount = (votes['red']['percentage'].to_f / 2).to_i
 
@@ -57,7 +62,7 @@ module Lita
         (50 - bluecount - redcount).times { blueredstr += '-' }
         blueredstr += "\x0304"
         redcount.times { blueredstr += '█' }
-        response.reply "Clinton #{votes['blue']['percentage']}% #{votes['blue']['popular']} |#{blueredstr}\x0300| Trump #{votes['red']['percentage']}% #{votes['red']['popular']}"
+        blueredstr
       end
 
       def election_by_state(response)
@@ -65,6 +70,7 @@ module Lita
         results = JSON.parse(RestClient.get('http://data.cnn.com/ELECTION/2016/full/P.full.json'))
 
         state = stateness(response.matches[0][0])
+        votes = {'blue' => {}, 'red' => {}}
 
         results['races'].each do |race|
           if race['state'].downcase == state.downcase
@@ -72,12 +78,23 @@ module Lita
             response.reply state_reply
             Lita.logger.debug "Replying with #{state_reply}"
             race['candidates'].each do |candidate|
-              candidate_str = "#{candidate['fname']} #{candidate['lname']}: "
-              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
+              if candidate['lname'] == 'Clinton'
+                votes['blue']['percentage'] = candidate['pctDecimal']
+                votes['blue']['popular']    = candidate['cvotes']
+                votes['blue']['electoral']  = candidate['evotes']
+                votes['blue']['winner']     = candidate['winner']
+              end
+
+              if candidate['lname'] == 'Trump'
+                votes['red']['percentage'] = candidate['pctDecimal']
+                votes['red']['popular']    = candidate['cvotes']
+                votes['red']['electoral']  = candidate['evotes']
+                votes['red']['winner']     = candidate['winner']
+              end
             end
+
+            blueredstr = get_blueredstr(votes)
+            response.reply "Clinton #{(votes['blue']['winner'] == true)? ' WINNER! ' : '' }#{votes['blue']['percentage']}% #{votes['blue']['popular']} |#{blueredstr}\x0300| Trump #{votes['red']['percentage']}% #{votes['red']['popular']}"
           end
         end
       end

data/lita-onewheel-election-cnn.gemspec

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

data/spec/lita/handlers/onewheel_election_cnn_spec.rb

@@ -28,8 +28,7 @@ describe Lita::Handlers::OnewheelElectionCnn, lita_handler: true do
     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%, 0 popular votes")
-    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes")
+    expect(replies[1]).to eq("Clinton 0.0% 0 |\u000312\u000300--------------------------------------------------\u000304\u000300| Trump 0.0% 0")
   end
 
   it 'shows by STATE' do
@@ -37,8 +36,7 @@ describe Lita::Handlers::OnewheelElectionCnn, lita_handler: true do
     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%, 0 popular votes")
-    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes")
+    expect(replies[1]).to eq("Clinton 0.0% 0 |\u000312\u000300--------------------------------------------------\u000304\u000300| Trump 0.0% 0")
   end
 
   it 'shows by full state name downcase' do
@@ -46,8 +44,7 @@ describe Lita::Handlers::OnewheelElectionCnn, lita_handler: true do
     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%, 0 popular votes")
-    expect(replies[2]).to eq("Donald Trump: 0.0%, 0 popular votes")
+    expect(replies[1]).to eq("Clinton 0.0% 0 |\u000312\u000300--------------------------------------------------\u000304\u000300| Trump 0.0% 0")
   end
 
   it 'ansis' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-election-cnn
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrew Kreps