seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Jonathan Kolyer 2013-10-15 09:54:28 -05:00
parent db5804d1cf e0a00e9fda
commit ed4d6cc3c6
26 changed files with 616 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pb/src/client_container.proto
View File

@ -74,7 +74,7 @@ message ClientMessage {
optional MusicianSessionFresh musician_session_fresh = 115;
optional MusicianSessionStale musician_session_stale = 116;
optional HeartbeatAck heartbeat_ack = 117;
optional JoinRequestAccepted join_request_accepted = 118;
optional JoinRequestApproved join_request_approved = 118;
optional JoinRequestRejected join_request_rejected = 119;
// Client-Session messages (to/from)
@ -199,20 +199,32 @@ message MusicianSessionStale {
message JoinRequest {
optional string join_request_id = 1;
optional string username = 2;
optional string text = 3;
optional string session_id = 2;
optional string username = 3;
optional string photo_url = 4;
optional string msg = 5;
optional string notification_id = 6;
optional string created_at = 7;
}
message JoinRequestAccepted {
message JoinRequestApproved {
optional string join_request_id = 1;
optional string username = 2;
optional string text = 3;
optional string session_id = 2;
optional string username = 3;
optional string photo_url = 4;
optional string msg = 5;
optional string notification_id = 6;
optional string created_at = 7;
}
message JoinRequestRejected {
optional string join_request_id = 1;
optional string username = 2;
optional string text = 3;
optional string session_id = 2;
optional string username = 3;
optional string photo_url = 4;
optional string msg = 5;
optional string notification_id = 6;
optional string created_at = 7;
}
// route_to: session

19
ruby/lib/jam_ruby/message_factory.rb
View File

@ -124,11 +124,22 @@
return Jampb::ClientMessage.new(:type => ClientMessage::Type::MUSICIAN_SESSION_STALE, :route_to => CLIENT_TARGET, :musician_session_stale => stale)
end
# create a join request session message
def join_request(join_request_id, session_id, username, photo_url, msg, notification_id, created_at)
req = Jampb::JoinRequest.new(:join_request_id => join_request_id, :session_id => session_id, :username => username, :photo_url => photo_url, :msg => msg, :notification_id => notification_id, :created_at => created_at)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::JOIN_REQUEST, :route_to => SESSION_TARGET_PREFIX + session_id, :join_request => req)
end
# create a user-joined session message
def join_request(session_id, join_request_id, username, text)
join_request = Jampb::JoinRequest.new(:join_request_id => join_request_id, :username => username, :text => text)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::JOIN_REQUEST, :route_to => SESSION_TARGET_PREFIX + session_id, :join_request => join_request)
# create a join request approved session message
def join_request_approved(join_request_id, session_id, username, photo_url, msg, notification_id, created_at)
req_approved = Jampb::JoinRequestApproved.new(:join_request_id => join_request_id, :session_id => session_id, :username => username, :photo_url => photo_url, :msg => msg, :notification_id => notification_id, :created_at => created_at)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::JOIN_REQUEST_APPROVED, :route_to => SESSION_TARGET_PREFIX + session_id, :join_request_approved => req_approved)
end
# create a join request rejected session message
def join_request_rejected(join_request_id, session_id, username, photo_url, msg, notification_id, created_at)
req_rejected = Jampb::JoinRequestRejected.new(:join_request_id => join_request_id, :session_id => session_id, :username => username, :photo_url => photo_url, :msg => msg, :notification_id => notification_id, :created_at => created_at)
return Jampb::ClientMessage.new(:type => ClientMessage::Type::JOIN_REQUEST_REJECTED, :route_to => SESSION_TARGET_PREFIX + session_id, :join_request_rejected => req_rejected)
end
# create a test message to send in session

2
ruby/lib/jam_ruby/models/join_request.rb
View File

@ -11,7 +11,7 @@ module JamRuby
validates :user, :presence => true
validates :music_session, :presence => true
validates :text, presence: false, no_profanity: true, length: {maximum: 140} # arbitrary decision of 140. the database is at 2000 max on this field
validates :text, no_profanity: true, length: {maximum: 140} # arbitrary decision of 140. the database is at 2000 max on this field
validates_uniqueness_of :user_id, :scope => :music_session_id

67
ruby/lib/jam_ruby/models/notification.rb
View File

@ -108,7 +108,7 @@ module JamRuby
return ids
end
def format_msg(description, user)
def format_msg(description, user = nil)
name = ""
unless user.nil?
name = user.name
@ -138,9 +138,16 @@ module JamRuby
when NotificationTypes::SESSION_INVITATION
return "#{name} has invited you to a session."
when NotificationTypes::JOIN_REQUEST
return "#{name} has requested to join your session."
when NotificationTypes::JOIN_REQUEST_APPROVED
return "#{name} has approved your request to join the session."
when NotificationTypes::JOIN_REQUEST_REJECTED
return "We're sorry, but you cannot join the session at this time."
# when "social_media_friend_joined"
# when "join_request_approved"
# when "join_request_rejected"
# when "band_invitation"
# when "band_invitation_accepted"
# when "recording_available"
@ -181,7 +188,7 @@ module JamRuby
notification.save
# (2) create notification
notification_msg = format_msg(NotificationTypes::FRIEND_REQUEST, user)
notification_msg = format_msg(notification.description, user)
msg = @@message_factory.friend_request(friend_request_id, user_id, user.name, user.photo_url, friend_id, notification_msg, notification.id, notification.created_at.to_s)
# (3) send notification
@ -200,7 +207,7 @@ module JamRuby
notification.save
# (2) create notification
notification_msg = format_msg(NotificationTypes::FRIEND_REQUEST_ACCEPTED, friend)
notification_msg = format_msg(notification.description, friend)
msg = @@message_factory.friend_request_accepted(friend_id, friend.name, friend.photo_url, user_id, notification_msg, notification.id, notification.created_at.to_s)
# (3) send notification
@ -231,7 +238,6 @@ module JamRuby
msg = @@message_factory.musician_session_join(music_session.id, user.id, user.name, user.photo_url)
# (2) send notification
puts "CONNECTION.CLIENT_ID=#{connection.client_id}"
@@mq_router.server_publish_to_session(music_session, msg, sender = {:client_id => connection.client_id})
end
@ -276,15 +282,58 @@ module JamRuby
end
end
def send_join_request(music_session, join_request, sender, text)
def send_join_request(music_session, join_request, text)
# (1) save to database
notification = Notification.new
notification.description = NotificationTypes::JOIN_REQUEST
notification.source_user_id = join_request.user.id
notification.target_user_id = music_session.creator.id
notification.session_id = music_session.id
notification.save
# (2) create notification
msg = @@message_factory.join_request(music_session.id, join_request.id, sender.name, text)
notification_msg = format_msg(notification.description, join_request.user)
msg = @@message_factory.join_request(join_request.id, music_session.id, join_request.user.name, join_request.user.photo_url, notification_msg, notification.id, notification.created_at.to_s)
# (3) send notification
@@mq_router.server_publish_to_session(music_session, msg)
@@mq_router.publish_to_user(music_session.creator.id, msg)
end
def send_join_request_approved(music_session, join_request)
# (1) save to database
notification = Notification.new
notification.description = NotificationTypes::JOIN_REQUEST_APPROVED
notification.source_user_id = music_session.creator.id
notification.target_user_id = join_request.user.id
notification.session_id = music_session.id
notification.save
# (2) create notification
notification_msg = format_msg(notification.description, music_session.creator)
msg = @@message_factory.join_request_approved(join_request.id, music_session.id, music_session.creator.name, music_session.creator.photo_url, notification_msg, notification.id, notification.created_at.to_s)
# (3) send notification
@@mq_router.publish_to_user(join_request.user.id, msg)
end
def send_join_request_rejected(music_session, join_request)
# (1) save to database
notification = Notification.new
notification.description = NotificationTypes::JOIN_REQUEST_REJECTED
notification.source_user_id = music_session.creator.id
notification.target_user_id = join_request.user.id
notification.session_id = music_session.id
notification.save
# (2) create notification
notification_msg = format_msg(notification.description, music_session.creator)
msg = @@message_factory.join_request_rejected(join_request.id, music_session.id, music_session.creator.name, music_session.creator.photo_url, notification_msg, notification.id, notification.created_at.to_s)
# (3) send notification
@@mq_router.publish_to_user(join_request.user.id, msg)
end
end

2
web/app/assets/javascripts/AAB_message_factory.js
View File

@ -22,6 +22,8 @@
FRIEND_UPDATE : "FRIEND_UPDATE",
SESSION_INVITATION : "SESSION_INVITATION",
JOIN_REQUEST : "JOIN_REQUEST",
JOIN_REQUEST_APPROVED : "JOIN_REQUEST_APPROVED",
JOIN_REQUEST_REJECTED : "JOIN_REQUEST_REJECTED",
FRIEND_REQUEST : "FRIEND_REQUEST",
FRIEND_REQUEST_ACCEPTED : "FRIEND_REQUEST_ACCEPTED",
TEST_SESSION_MESSAGE : "TEST_SESSION_MESSAGE",

31
web/app/assets/javascripts/alert.js Normal file
View File

@ -0,0 +1,31 @@
(function(context,$) {
"use strict";
context.JK = context.JK || {};
context.JK.AlertDialog = function(app, okButtonText, message, sessionId, callback) {
var logger = context.JK.logger;
function events() {
$('#btn-alert-ok').unbind("click");
$('#btn-alert-ok').click(function(evt) {
callback(sessionId);
});
$('#btn-alert-cancel').unbind("click");
$('#btn-alert-cancel').click(function(evt) {
app.layout.closeDialog('alert');
});
}
function initialize() {
events();
$('#btn-alert-ok').text(okButtonText);
$('#alert-message').html(message);
}
this.initialize = initialize;
};
})(window,jQuery);

25
web/app/assets/javascripts/jam_rest.js
View File

@ -12,6 +12,29 @@
var self = this;
var logger = context.JK.logger;
function createJoinRequest(joinRequest) {
logger.debug("joinRequest=" + JSON.stringify(joinRequest));
return $.ajax({
type: "POST",
dataType: "json",
url: '/api/join_requests',
contentType: 'application/json',
processData: false,
data: JSON.stringify(joinRequest)
});
}
function updateJoinRequest(joinRequestId, isApproved) {
return $.ajax({
type: "PUT",
dataType: "json",
url: '/api/join_requests/' + joinRequestId,
contentType: 'application/json',
processData: false,
data: JSON.stringify({"approved": isApproved})
});
}
function updateSession(id, newSession, onSuccess) {
logger.debug('Rest.updateSession');
return $.ajax('/api/sessions/' + id, {
@ -297,6 +320,8 @@
this.userDownloadedClient = userDownloadedClient;
this.userCertifiedGear = userCertifiedGear;
this.userSocialPromoted = userSocialPromoted;
this.createJoinRequest = createJoinRequest;
this.updateJoinRequest = updateJoinRequest;
return this;
};

14
web/app/assets/javascripts/layout.js
View File

@ -621,6 +621,20 @@
$('#cancel-button', $notify).html("CANCEL");
}
}
if (descriptor.cancel_callback !== undefined) {
$('#cancel-button', $notify).click(function() {
if (descriptor.cancel_callback_args) {
logger.debug("descriptor.cancel_callback_args=" + descriptor.cancel_callback_args);
descriptor.cancel_callback(descriptor.cancel_callback_args);
return false;
}
else {
descriptor.cancel_callback();
return false;
}
});
}
}
else {
$('#ok-button', $notify).html("OKAY");

40
web/app/assets/javascripts/sessionList.js
View File

@ -5,7 +5,8 @@
context.JK = context.JK || {};
context.JK.SessionList = function(app) {
var logger = context.JK.logger;
var termsDialog;
var rest = context.JK.Rest();
var LATENCY = {
GOOD : {description: "GOOD", style: "latency-green", min: 0.0, max: 20.0},
MEDIUM : {description: "MEDIUM", style: "latency-yellow", min: 20.0, max: 40.0},
@ -135,14 +136,43 @@
// wire up the Join Link to the T&Cs dialog
var $parentRow = $('tr[id=' + session.id + ']', tbGroup);
$('#join-link', $parentRow).click(function(evt) {
openTerms(session.id);
});
if (session.approval_required) {
$('#join-link', $parentRow).click(function(evt) {
openAlert(session.id);
});
}
else {
$('#join-link', $parentRow).click(function(evt) {
openTerms(session.id);
});
}
}
}
function openAlert(sessionId) {
var alertDialog = new context.JK.AlertDialog(app, "YES",
"You must be approved to join this session. Would you like to send a request to join?",
sessionId, onCreateJoinRequest);
alertDialog.initialize();
app.layout.showDialog('alert');
}
function onCreateJoinRequest(sessionId) {
var joinRequest = {};
joinRequest.music_session = sessionId;
joinRequest.user = context.JK.currentUserId;
rest.createJoinRequest(joinRequest)
.done(function(response) {
}).error(app.ajaxError);
app.layout.closeDialog('alert');
}
function openTerms(sessionId) {
termsDialog = new context.JK.TermsDialog(app, sessionId, onTermsAccepted);
var termsDialog = new context.JK.TermsDialog(app, sessionId, onTermsAccepted);
termsDialog.initialize();
app.layout.showDialog('terms');
}

186
web/app/assets/javascripts/sidebar.js
View File

@ -147,6 +147,8 @@
// wire up "x" button to delete notification
$notification.find('#img-delete-notification').click(deleteNotificationHandler);
// customize action buttons based on notification type
if (type === context.JK.MessageType.FRIEND_REQUEST) {
var $action_btn = $notification.find('#btn-notification-action');
$action_btn.text('ACCEPT');
@ -161,9 +163,26 @@
var $action_btn = $notification.find('#btn-notification-action');
$action_btn.text('JOIN');
$action_btn.click(function() {
joinSession({ "session_id": payload.session_id, "notification_id": payload.notification_id });
openTerms({ "session_id": payload.session_id, "notification_id": payload.notification_id });
});
}
else if (type === context.JK.MessageType.JOIN_REQUEST) {
var $action_btn = $notification.find('#btn-notification-action');
$action_btn.text('APPROVE');
$action_btn.click(function() {
approveJoinRequest({ "join_request_id": payload.join_request_id, "notification_id": payload.notification_id });
});
}
else if (type === context.JK.MessageType.JOIN_REQUEST_APPROVED) {
var $action_btn = $notification.find('#btn-notification-action');
$action_btn.text('JOIN');
$action_btn.click(function() {
openTerms({ "session_id": payload.session_id, "notification_id": payload.notification_id });
});
}
else if (type === context.JK.MessageType.JOIN_REQUEST_REJECTED) {
$notification.find('#div-actions').hide();
}
}
function deleteNotificationHandler(evt) {
@ -314,22 +333,6 @@
}
}
function acceptFriendRequest(args) {
rest.acceptFriendRequest({
status : 'accept',
friend_request_id : args.friend_request_id
}).done(function(response) {
deleteNotification(args.notification_id); // delete notification corresponding to this friend request
initializeFriendsPanel(); // refresh friends panel when request is accepted
}).error(app.ajaxError);
}
function joinSession(args) {
context.location = "#/session/" + args.session_id;
deleteNotification(args.notification_id);
}
// default handler for incoming notification
function handleNotification(payload, type) {
var sidebarText;
@ -406,11 +409,28 @@
$('.sidebar .invite-friend-row').hoverIntent(inviteHoverIn, inviteHoverOut);
// $('#sidebar-div').mouseleave(function(evt) {
// hideSearchResults();
// });
registerFriendUpdate();
registerFriendRequest();
registerFriendRequestAccepted();
registerMusicianSessionJoin();
registerMusicianSessionDepart();
registerFriendSessionJoin();
registerSessionInvitation();
registerJoinRequest();
registerJoinRequestApproved();
registerJoinRequestRejected();
// wire up FRIEND_UPDATE handler
// watch for Invite More Users events
$('#sidebar-div .btn-email-invitation').click(function() {
invitationDialog.showEmailDialog();
});
$('#sidebar-div .btn-gmail-invitation').click(function() {
invitationDialog.showGoogleDialog();
});
}
function registerFriendUpdate() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.FRIEND_UPDATE, function(header, payload) {
logger.debug("Handling FRIEND_UPDATE msg " + JSON.stringify(payload));
@ -426,9 +446,9 @@
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
//////////////////////////////////////////////////////////////
}
// wire up FRIEND_REQUEST handler
function registerFriendRequest() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.FRIEND_REQUEST, function(header, payload) {
logger.debug("Handling FRIEND_REQUEST msg " + JSON.stringify(payload));
@ -447,9 +467,20 @@
}
);
});
//////////////////////////////////////////////////////////////
}
// wire up FRIEND_REQUEST_ACCEPTED handler
function acceptFriendRequest(args) {
rest.acceptFriendRequest({
status : 'accept',
friend_request_id : args.friend_request_id
}).done(function(response) {
deleteNotification(args.notification_id); // delete notification corresponding to this friend request
initializeFriendsPanel(); // refresh friends panel when request is accepted
}).error(app.ajaxError);
}
function registerFriendRequestAccepted() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.FRIEND_REQUEST_ACCEPTED, function(header, payload) {
logger.debug("Handling FRIEND_REQUEST_ACCEPTED msg " + JSON.stringify(payload));
@ -465,9 +496,9 @@
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
//////////////////////////////////////////////////////////////
}
// wire up MUSICIAN_SESSION_JOIN handler
function registerMusicianSessionJoin() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.MUSICIAN_SESSION_JOIN, function(header, payload) {
logger.debug("Handling MUSICIAN_SESSION_JOIN msg " + JSON.stringify(payload));
@ -478,9 +509,9 @@
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
//////////////////////////////////////////////////////////////
}
// wire up MUSICIAN_SESSION_DEPART handler
function registerMusicianSessionDepart() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.MUSICIAN_SESSION_DEPART, function(header, payload) {
logger.debug("Handling MUSICIAN_SESSION_DEPART msg " + JSON.stringify(payload));
@ -491,9 +522,9 @@
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
//////////////////////////////////////////////////////////////
}
// wire up MUSICIAN_SESSION_DEPART handler
function registerFriendSessionJoin() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.FRIEND_SESSION_JOIN, function(header, payload) {
logger.debug("Handling FRIEND_SESSION_JOIN msg " + JSON.stringify(payload));
@ -504,9 +535,9 @@
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
//////////////////////////////////////////////////////////////
}
// wire up SESSION_INVITATION handler
function registerSessionInvitation() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.SESSION_INVITATION, function(header, payload) {
logger.debug("Handling SESSION_INVITATION msg " + JSON.stringify(payload));
@ -538,20 +569,95 @@
},
{
"ok_text": "JOIN SESSION",
"ok_callback": joinSession,
"ok_callback": openTerms,
"ok_callback_args": { "session_id": payload.session_id, "notification_id": payload.notification_id }
}
);
});
//////////////////////////////////////////////////////////////
}
// watch for Invite More Users events
$('#sidebar-div .btn-email-invitation').click(function() {
invitationDialog.showEmailDialog();
function openTerms(args) {
var termsDialog = new context.JK.TermsDialog(app, args, onTermsAccepted);
termsDialog.initialize();
app.layout.showDialog('terms');
}
function onTermsAccepted(args) {
deleteNotification(args.notification_id);
context.location = '#/session/' + args.session_id;
}
function registerJoinRequest() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.JOIN_REQUEST, function(header, payload) {
logger.debug("Handling JOIN_REQUEST msg " + JSON.stringify(payload));
handleNotification(payload, header.type);
// display notification
app.notify({
"title": "New Join Request",
"text": payload.msg,
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
},
{
"ok_text": "APPROVE",
"ok_callback": approveJoinRequest,
"ok_callback_args": { "join_request_id": payload.join_request_id, "notification_id": payload.notification_id },
"cancel_text": "REJECT",
"cancel_callback": rejectJoinRequest,
"cancel_callback_args": { "join_request_id": payload.join_request_id, "notification_id": payload.notification_id }
}
);
});
}
$('#sidebar-div .btn-gmail-invitation').click(function() {
invitationDialog.showGoogleDialog();
function approveJoinRequest(args) {
rest.updateJoinRequest(args.join_request_id, true)
.done(function(response) {
deleteNotification(args.notification_id);
}).error(app.ajaxError);
}
function rejectJoinRequest(args) {
rest.updateJoinRequest(args.join_request_id, false)
.done(function(response) {
deleteNotification(args.notification_id);
}).error(app.ajaxError);
}
function registerJoinRequestApproved() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.JOIN_REQUEST_APPROVED, function(header, payload) {
logger.debug("Handling JOIN_REQUEST_APPROVED msg " + JSON.stringify(payload));
handleNotification(payload, header.type);
// display notification
app.notify({
"title": "Join Request Approved",
"text": payload.msg,
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
},
{
"ok_text": "JOIN SESSION",
"ok_callback": openTerms,
"ok_callback_args": { "session_id": payload.session_id, "notification_id": payload.notification_id }
}
);
});
}
function registerJoinRequestRejected() {
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.JOIN_REQUEST_REJECTED, function(header, payload) {
logger.debug("Handling JOIN_REQUEST_REJECTED msg " + JSON.stringify(payload));
handleNotification(payload, header.type);
// display notification
app.notify({
"title": "Join Request Rejected",
"text": payload.msg,
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
}

4
web/app/assets/javascripts/terms.js
View File

@ -3,13 +3,13 @@
"use strict";
context.JK = context.JK || {};
context.JK.TermsDialog = function(app, sessionId, callback) {
context.JK.TermsDialog = function(app, args, callback) {
var logger = context.JK.logger;
function events() {
$('#btn-accept-terms').click(function(evt) {
callback(sessionId);
callback(args);
});
$('#btn-cancel-terms').click(function(evt) {

23
web/app/controllers/api_join_requests_controller.rb
View File

@ -27,14 +27,33 @@ class ApiJoinRequestsController < ApiController
if @join_request.errors.any?
response.status = :unprocessable_entity
respond_with @join_request
respond_with "You cannot join the session at this time."
# respond_with @join_request
else
# send notification
Notification.send_join_request(music_session, @join_request, sender, text)
Notification.send_join_request(music_session, @join_request, text)
respond_with @join_request, :responder => ApiResponder, :location => api_join_request_detail_url(@join_request)
end
end
def update
@join_request = JoinRequest.find(params[:id])
if params[:approved]
# generate invitation if join request is approved
invitation = Invitation.new
invitation.sender = current_user
invitation.receiver = @join_request.user
invitation.music_session = @join_request.music_session
invitation.join_request = @join_request
invitation.save
Notification.send_join_request_approved(@join_request.music_session, @join_request)
else
Notification.send_join_request_rejected(@join_request.music_session, @join_request)
end
end
def delete
@join_request = JoinRequest.show(params[:id], current_user)
@join_request.delete

29
web/app/controllers/ping_controller.rb Normal file
View File

@ -0,0 +1,29 @@
class PingController < ApplicationController
layout false
def index
render 'ping'
end
def at
render 'pingat.jnlp'
end
def cc
render 'pingcc.jnlp'
end
def no
render 'pingno.jnlp'
end
def tw
render 'pingtw.jnlp'
end
def vz
render 'pingvz.jnlp'
end
end

3
web/app/views/api_join_requests/update.rabl Normal file
View File

@ -0,0 +1,3 @@
object @join_request
extends "api_join_requests/join_request"

18
web/app/views/clients/_alert.html.erb Normal file
View File

@ -0,0 +1,18 @@
<!-- Alert Dialog -->
<div class="dialog" layout="dialog" layout-id="alert" style="max-width:550px;">
<div class="content-head">
<%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
<h1>Alert</h1>
</div>
<div class="dialog-inner">
<span id="alert-message"></span>
<br clear="left" /><br />
<div class="left">
<a id="btn-alert-cancel" class="button-orange">CANCEL</a>
</div>
<div class="right">
<a id="btn-alert-ok" class="button-orange"></a>
</div>
<br clear="all" />
</div>
</div>

4
web/app/views/clients/_notify.html.erb
View File

@ -7,9 +7,9 @@
<p></p>
<div class="detail"></div>
<div class="right clearall">
<a id="cancel-button" href="#" class="button-grey" layout-action="close">CANCEL</a>
&nbsp;&nbsp;
<a id="ok-button" href="#" class="button-orange" layout-action="close">OKAY</a>
&nbsp;&nbsp;
<a id="cancel-button" href="#" class="button-grey" layout-action="close">CANCEL</a>
</div>
</div>

1
web/app/views/clients/index.html.erb
View File

@ -14,6 +14,7 @@
<%= render "vu_meters" %>
<%= render "ftue" %>
<%= render "terms" %>
<%= render "alert" %>
<%= render "sidebar" %>
<%= render "createSession" %>
<%= render "findSession" %>

25
web/app/views/ping/ping.html.erb Normal file
View File

@ -0,0 +1,25 @@
<html>
<head>
<title>Test Internet Latency</title>
</head>
<body>
<h1>Test Internet Latency</h1>
<p>Select the link corresponding to your internet service provider.
This will launch an applet to test the performance of your connection.</p>
<h1>My ISP is AT&T</h1>
<p>Click <%= link_to 'here', '/ping/at.jnlp' %>.</p>
<h1>My ISP is Comcast</h1>
<p>Click <%= link_to 'here', '/ping/cc.jnlp' %>.</p>
<h1>My ISP is Time Warner</h1>
<p>Click <%= link_to 'here', '/ping/tw.jnlp' %>.</p>
<h1>My ISP is Verizon</h1>
<p>Click <%= link_to 'here', '/ping/vz.jnlp' %>.</p>
<h1>My ISP is none of the above.</h1>
<p>Click <%= link_to 'here', '/ping/no.jnlp' %>.</p>
</body>
</html>

20
web/app/views/ping/pingat.jnlp.erb Executable file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" href="pingat.jnlp" codebase="https://dl.dropboxusercontent.com/u/5471230/ping">
<information>
<title>Ping</title>
<vendor>JamKazam</vendor>
</information>
<resources>
<!-- Application Resources -->
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="ping.jar" main="true"/>
</resources>
<application-desc name="Ping" main-class="com.jamkazam.ping.Ping" width="400" height="600">
<!-- usage: Ping [label=]addr[:port] ... [-c <count>] [-s <size>] -u <url> -i <isp> [-a] -->
<argument>da1-cc=50.242.148.38:4442</argument>
<argument>-uhttp://www.jamkazam.com/api/users/isp_scoring</argument>
<argument>-iat</argument>
<argument>-a</argument>
</application-desc>
<update check="background"/>
</jnlp>

20
web/app/views/ping/pingcc.jnlp.erb Executable file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" href="pingcc.jnlp" codebase="https://dl.dropboxusercontent.com/u/5471230/ping">
<information>
<title>Ping</title>
<vendor>JamKazam</vendor>
</information>
<resources>
<!-- Application Resources -->
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="ping.jar" main="true"/>
</resources>
<application-desc name="Ping" main-class="com.jamkazam.ping.Ping" width="400" height="600">
<!-- usage: Ping [label=]addr[:port] ... [-c <count>] [-s <size>] -u <url> -i <isp> [-a] -->
<argument>da1-cc=50.242.148.38:4442</argument>
<argument>-uhttp://www.jamkazam.com/api/users/isp_scoring</argument>
<argument>-icc</argument>
<argument>-a</argument>
</application-desc>
<update check="background"/>
</jnlp>

20
web/app/views/ping/pingno.jnlp.erb Executable file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" href="pingno.jnlp" codebase="https://dl.dropboxusercontent.com/u/5471230/ping">
<information>
<title>Ping</title>
<vendor>JamKazam</vendor>
</information>
<resources>
<!-- Application Resources -->
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="ping.jar" main="true"/>
</resources>
<application-desc name="Ping" main-class="com.jamkazam.ping.Ping" width="400" height="600">
<!-- usage: Ping [label=]addr[:port] ... [-c <count>] [-s <size>] -u <url> -i <isp> [-a] -->
<argument>da1-cc=50.242.148.38:4442</argument>
<argument>-uhttp://www.jamkazam.com/api/users/isp_scoring</argument>
<argument>-ino</argument>
<argument>-a</argument>
</application-desc>
<update check="background"/>
</jnlp>

20
web/app/views/ping/pingtw.jnlp.erb Executable file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" href="pingtw.jnlp" codebase="https://dl.dropboxusercontent.com/u/5471230/ping">
<information>
<title>Ping</title>
<vendor>JamKazam</vendor>
</information>
<resources>
<!-- Application Resources -->
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="ping.jar" main="true"/>
</resources>
<application-desc name="Ping" main-class="com.jamkazam.ping.Ping" width="400" height="600">
<!-- usage: Ping [label=]addr[:port] ... [-c <count>] [-s <size>] -u <url> -i <isp> [-a] -->
<argument>da1-cc=50.242.148.38:4442</argument>
<argument>-uhttp://www.jamkazam.com/api/users/isp_scoring</argument>
<argument>-itw</argument>
<argument>-a</argument>
</application-desc>
<update check="background"/>
</jnlp>

20
web/app/views/ping/pingvz.jnlp.erb Executable file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" href="pingvz.jnlp" codebase="https://dl.dropboxusercontent.com/u/5471230/ping">
<information>
<title>Ping</title>
<vendor>JamKazam</vendor>
</information>
<resources>
<!-- Application Resources -->
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="ping.jar" main="true"/>
</resources>
<application-desc name="Ping" main-class="com.jamkazam.ping.Ping" width="400" height="600">
<!-- usage: Ping [label=]addr[:port] ... [-c <count>] [-s <size>] -u <url> -i <isp> [-a] -->
<argument>da1-cc=50.242.148.38:4442</argument>
<argument>-uhttp://www.jamkazam.com/api/users/isp_scoring</argument>
<argument>-ivz</argument>
<argument>-a</argument>
</application-desc>
<update check="background"/>
</jnlp>

9
web/config/routes.rb
View File

@ -44,6 +44,14 @@ SampleApp::Application.routes.draw do
match '/test_connection', to: 'sessions#connection_state', :as => :connection_state
# ping test
match '/ping', to: 'ping#index'
match '/ping/at.jnlp', to: 'ping#at'
match '/ping/cc.jnlp', to: 'ping#cc'
match '/ping/no.jnlp', to: 'ping#no'
match '/ping/tw.jnlp', to: 'ping#tw'
match '/ping/vz.jnlp', to: 'ping#vz'
# spikes
match '/facebook_invite', to: 'spikes#facebook_invite'
match '/gmail_contacts', to: 'spikes#gmail_contacts'
@ -240,6 +248,7 @@ SampleApp::Application.routes.draw do
match '/join_requests/:id' => 'api_join_requests#show', :via => :get, :as => 'api_join_request_detail'
match '/join_requests/:id' => 'api_join_requests#delete', :via => :delete
match '/join_requests' => 'api_join_requests#create', :via => :post
match '/join_requests/:id' => 'api_join_requests#update', :via => :put
match '/join_requests' => 'api_join_requests#index', :via => :get
# Location lookups

54
web/spec/features/find_sessions_spec.rb
View File

@ -14,12 +14,58 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
before(:each) do
UserMailer.deliveries.clear
sign_in_poltergeist user
visit "/#/findSession"
find('#find-session-form')
end
# when the find session page loads, it should show that there are no sessions
it { should have_selector('#sessions-none-found') }
it "shows there are no sessions" do
sign_in_poltergeist user
visit "/#/findSession"
find('#find-session-form')
page.should have_selector('#sessions-none-found')
end
it "finds another public session", :slow => true do
@unique_session_desc = 'Description found easily'
in_client(:one) do
sign_in_poltergeist user
visit "/#/createSession"
sleep 5 # this was in the cucumber steps file and it breaks when i remove it here
# pick a genre
page.select("Rock", :from => "genres")
# fill in description
page.fill_in 'description', :with => @unique_session_desc
# check box for legal terms
page.check('intellectual-property')
# create the session
page.find('#btn-create-session').click
# verify that the in-session page is showing
expect(page).to have_selector('h2', text: 'my tracks')
# with our description showing
# click into session description
# page.find("#session-info").should have_content @unique_session_desc
end
in_client(:two) do
sign_in_poltergeist user
visit "/#/findSession"
find('#find-session-form')
sleep 5 # not happy with this
expect(page).to have_text(@unique_session_desc)
end
end
end

10
web/spec/support/utilities.rb
View File

@ -4,6 +4,14 @@ def cookie_jar
Capybara.current_session.driver.browser.current_session.instance_variable_get(:@rack_mock_session).cookie_jar
end
def in_client(name) # to assist multiple-client RSpec/Capybara testing
Capybara.session_name = name
yield
end
def sign_in(user)
visit signin_path
fill_in "Email", with: user.email
@ -25,4 +33,4 @@ def sign_in_poltergeist(user)
else
page.driver.browser.manage.add_cookie :name => :remember_token, :value => user.remember_token
end
end
end