projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged from Mako.
[selectricity]
/
app
/
apis
/
selectricity_api.rb
diff --git
a/app/apis/selectricity_api.rb
b/app/apis/selectricity_api.rb
index 75a840aa6e25df2116b6940626fd1b0ba3ee1a0a..9c95369d9a798917ee68babb9d2f578c0a6b3b04 100644
(file)
--- a/
app/apis/selectricity_api.rb
+++ b/
app/apis/selectricity_api.rb
@@
-7,8
+7,10
@@
class ElectionStruct < ActionWebService::Struct
end
class VoteInfo < ActionWebService::Struct
member :voter_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 :voter_ipaddress, :string
member :vote_time, :int
+ member :vote, [:int]
end
class VoteResultStruct < ActionWebService::Struct
end
class VoteResultStruct < ActionWebService::Struct
@@
-17,12
+19,10
@@
class VoteResultStruct < ActionWebService::Struct
member :condorcet_winners, [:int]
member :ssd_winners, [:int]
member :borda_winners, [:int]
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]
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]
end
class SelectricityAPI < ActionWebService::API::Base
api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]
Benjamin Mako Hill
||
Want to submit a patch?