Merge my branch, which properly implements casting quickvotes

[selectricity-live] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index 8c0f04f64c11b6e61c060926ae977f0424f3d1cc..8a8dce4d8072faca8cbc29b7e9e1d496c2a521c9 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -4,13 +4,18 @@ class VoteResultStruct < ActionWebService::Struct
   member :condorcet_winners, [:int]
   member :ssd_winners, [:int]
   member :borda_winners, [:int]
+  member :errors, [:string]
+end
+class CandidateMap < ActionWebService::Struct
   member :candidate_ids, [:int]
   member :candidate_names, [:string]
   member :errors, [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
-  api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]
+  api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]
   api_method :get_quickvote_results, :expects => [:string], :returns => [VoteResultStruct]
+  api_method :get_quickvote_candidate_map, :expects => [:string], :returns => [CandidateMap]
+  api_method :quickvote_candidate_ids_to_names, :expects => [:string,[:int]], :returns => [[:string]]
 end