Merged from Mako.

[selectricity] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index af75cf67d28f60db7e366a8c503fb39f859f0170..9c95369d9a798917ee68babb9d2f578c0a6b3b04 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -1,13 +1,16 @@
 class ElectionStruct < ActionWebService::Struct
   member :name, :string
   member :description, :string
-  member :candidates, [:int]
+  member :candidate_ids, [:int]
+  member :candidate_names, [:string]
   member :id, :int
 end
 class VoteInfo < ActionWebService::Struct
   member :voter_id, :int
+  member :voter_session_id, :string
   member :voter_ipaddress, :string
   member :vote_time, :int
+  member :vote, [:int]
 end
 
 class VoteResultStruct < ActionWebService::Struct
@@ -16,12 +19,10 @@ 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 => [:string, :int, [[:int]]], :returns => [:string]
@@ -30,7 +31,8 @@ class SelectricityAPI < ActionWebService::API::Base
   api_method :quickvote_candidate_ids_to_names, :expects => [:string,[:int]], :returns => [[:string]]
   api_method :get_quickvote_votes, :expects => [:string], :returns => [ [VoteInfo] ]
   api_method :list_quickvotes, :expects => [], :returns => [[ElectionStruct]]
-
+  api_method :get_quickvote, :expects => [:string], :returns => [ElectionStruct]
+  api_method :create_quickvote, :expects => [ElectionStruct], :returns => [:string]
 end