lib/lita/handlers/onewheel_election_cnn.rb in lita-onewheel-election-cnn-1.0.0 vs lib/lita/handlers/onewheel_election_cnn.rb in lita-onewheel-election-cnn-1.1.0

@@ -17,12 +17,12 @@
         Lita.logger.debug 'get_source started'
         results = JSON.parse(RestClient.get('http://data.cnn.com/ELECTION/2016/full/P.full.json'))
 
         results['candidates'].each do |candidate|
           candidate_str = "#{candidate['fname']} #{candidate['lname']}: "
-          candidate_str += "WINNER! " if candidate['winner']
-          candidate_str += "#{candidate['pctDecimal']}%, #{candidate['evotes']} electoral votes."
+          candidate_str += "#{candidate['pctDecimal']}%"
+          candidate_str += " WINNER! #{candidate['evotes']} electoral votes." if candidate['winner']
           response.reply candidate_str
         end
       end
 
       def election_by_state(response)
@@ -33,11 +33,11 @@
 
         results['races'].each do |race|
           if race['state'].downcase == state.downcase
             race['candidates'].each do |candidate|
               candidate_str = "#{state} - #{candidate['fname']} #{candidate['lname']}: "
-              candidate_str += "WINNER! " if candidate['winner']
-              candidate_str += "#{candidate['pctDecimal']}%, #{candidate['evotes']} electoral votes."
+              candidate_str += "#{candidate['pctDecimal']}%"
+              candidate_str += " WINNER! #{candidate['evotes']} electoral votes." if candidate['winner']
               response.reply candidate_str
             end
           end
         end
       end