Merged from John's branch, includs a lot of IP lookup libraries.

[selectricity] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index 8a8dce4d8072faca8cbc29b7e9e1d496c2a521c9..34c9287137addb59e778e785354c00e24334fdef 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -1,3 +1,9 @@
+class VoteInfo < ActionWebService::Struct
+  member :voter_id, :int
+  member :voter_ipaddress, :string
+  member :vote_time, :int
+end
+

 class VoteResultStruct < ActionWebService::Struct
   member :plurality_winners, [:int]
   member :approval_winners, [:int]
 class VoteResultStruct < ActionWebService::Struct
   member :plurality_winners, [:int]
   member :approval_winners, [:int]


@@ -16,6 +22,7 @@ class SelectricityAPI < ActionWebService::API::Base
   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]]
   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]]

+  api_method :get_quickvote_votes, :expects => [:string], :returns => [ [VoteInfo] ]

 end
 
 
 end