social_stream 0.23.2 → 0.23.3

data/events/app/views/events/_event.html.erb

@@ -40,6 +40,11 @@
     <div class="title">
     <%= link_to event.title, event %>
     </div>
+
+    <div class="description">
+    <%= simple_format auto_link(event.description) %>
+    </div>
+
   </div>
 <% end %>
 

data/events/app/views/events/_sidebar_calendar.html.erb

@@ -26,34 +26,12 @@
   </table>
 
   <%= javascript_tag do %>
-    var now = new Date();
-    $('#sidebar_day_' + now.getDate() + '_' + (now.getMonth()+1) + '_' + now.getFullYear()).addClass('today');
-    var re = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
-    $('#sidebar_calendar td').each(function(index, domEl){
-      var m = re.exec(domEl.id);
-      if(m == null) return;
-      var d = new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
-      if(d < now) $(domEl).addClass('past');
-      if(m[2] != (now.getMonth()+1) && d > now) $(domEl).addClass('next_month');
-    });
-    $.ajax({
-      dataType: 'json',
-      cache: false,
-      url: "<%= escape_javascript polymorphic_path([@current_subject, Event.new]) %>",
-      data: {
-        start: <%= bow.to_i %>,
-	end: <%= (bow + 28.days).to_i %>
-      },
-      success: function(events) {
-        $.map(events, function(event) {
-	  var start = new Date(event.start); // This applies TZ
-	  var end = new Date(event.end);
-	  for(loopTime=start.getTime(); loopTime <= end.getTime(); loopTime+=86400000) {
-	    var d = new Date(loopTime);
-	    $('#sidebar_day_'+ d.getDate() + '_' + (d.getMonth()+1) + '_' + d.getFullYear()).addClass("busy");
-	  }
-	})
-      }
+    $(function(){
+      SocialStream.Calendar.init({
+        eventsPath: "<%= escape_javascript polymorphic_path([@current_subject, Event.new]) %>",
+        start: "<%= bow.to_i %>",
+	end: "<%= (bow + 28.days).to_i %>"
+      });
     });
   <% end %>
 

data/events/app/views/events/index.js.erb

@@ -0,0 +1,3 @@
+$("#tipsy-<%= params[:tipsy] %>").html("<%= escape_javascript render(@events) %>");
+
+SocialStream.Event.index();

data/events/app/views/rooms/_form.html.erb

@@ -26,6 +26,6 @@
 
 <%= javascript_tag do %>
   $(function(){
-    $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+    $('#room_name').watermark("<%= escape_javascript t('room.watermark.name') %>");
   });
 <% end %>

data/events/app/views/rooms/create.js.erb

@@ -1,7 +1,7 @@
 <% if @room.valid? %>
   $('#rooms').replaceWith("<%= escape_javascript render(:partial => 'index') %>");
   $('#room_name').val("");
-  $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+  $('#room_name').watermark("<%= escape_javascript t('room.watermark.name') %>");
 <% else %>
   $('#new_room').replaceWith("<%= escape_javascript render(:partial => 'form') %>");
 <% end %>

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.9.1".freeze
+    VERSION = "0.9.2".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.17.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.23.2".freeze
+  VERSION = "0.23.3".freeze
 end

data/presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js

@@ -223,7 +223,7 @@
       .hover(function() {uiChatboxTitlebarGames.addClass('ui-state-hover');},
            function() {uiChatboxTitlebarGames.removeClass('ui-state-hover');})
       .click(function(event) {
-        pickGamesButton(self)
+				PRESENCE.GAME.INTERFACE.pickGamesButton(self)
         return false;
       })
       .appendTo(uiChatboxTitlebar),

data/presence/app/assets/javascripts/presence.js.erb

@@ -1,4 +1,19 @@
 var PRESENCE = PRESENCE || {};
 
 PRESENCE.VERSION = '<%=SocialStream::Presence::VERSION%>';
-PRESENCE.AUTHORS = 'Aldo Gordillo';
+PRESENCE.AUTHORS = 'Aldo Gordillo';
+
+
+PRESENCE.CORE = (function(P,$,undefined){
+
+  var init = function(){
+     initFocusListeners();
+     checkVideocallFeature();
+		 PRESENCE.GAME.init(strophe_connection);
+		 initAudio();
+  };
+
+  return {
+    init: init
+  };
+}) (PRESENCE, jQuery);

data/presence/app/assets/javascripts/presence_XmppClient.js.erb

@@ -53,6 +53,12 @@ function chatContact(domain,resource,client,version) {
 	this.guest_token=null;
 	this.session=null;
 	this.publisher=null;
+	
+	//Game params
+	//Sender: disconnected, waiting, playing
+  //Receiver: disconnected , pending , playing
+	this.gameStatus="disconnected";
+	this.game=null;
 } 
 
 //Rooms information
@@ -387,6 +393,7 @@ function processUnavailablePresenceStanza(presence){
   if (slug != user_slug) {
     if (getConnectionBoxFromSlug(slug)!=null){
 			updateInterfaceAfterPresenceStanza(slug,false)
+			PRESENCE.GAME.userDisconnected(slug)
     }
   }
 }
@@ -426,7 +433,7 @@ function onIQStanza(iq){
 	var type = iq.getAttribute("type");
 	var from = iq.getAttribute("from");
 	var slug = from.split("@")[0];
-	
+
 	if (slug == user_slug) {
 		return true;
   }
@@ -577,12 +584,11 @@ function handleIQResultFromVideochatRequestCancel(iq,slug){
     var response = queryElement.getElementsByTagName('response');
     
     if(response.length == 1){
-      receiveVideoChatCancelationFromUser(slug,$(response).text());
+      receiveVideoChatCancelationFromUser(slug);
       return true;
     }
   }
   
-  receiveVideoChatCancelationFromUser(slug,"Bad response");
   return true;
 }
 
@@ -764,6 +770,7 @@ function handleIQResultFromMucOccupantsRequest(iq){
 			var nick = $(value).attr("name");
 			if(roomsInfo[room_slug].occupants.indexOf(nick)==-1){
 				roomsInfo[room_slug].occupants.push(nick)
+				addNickToNotificationInGroup(room_slug,nick)
 			}
     });
   }

data/presence/app/assets/javascripts/presence_game.js.erb

@@ -3,74 +3,309 @@
 ////////////////////
 
 PRESENCE.GAME = (function(P,$,undefined){
-  
-  //Gamecore variables  
-  var connection = null;
-	iqStanzaID['gameRequest'] = "gameRequestID";
 
-  var init = function(myConnection){
-    connection = myconnection;
-  };
+	/////////////////////////////////
+  //       GAME CORE VARS        //
+  /////////////////////////////////
+	 
+	//Manage Game information
+	//gameID == Game to play
+  //Players == List of players
+  //Options == Game options
+	function game(gameId,gameName,players,options){
+	  this.id = gameId;
+		this.name = gameName;
+		this.players = players;
+		this.options = options;
+		this.handler = null;
+	}
 	
+	function player(id,name){
+    this.id = id;
+    this.name = name;
+  }
+	
+	function validationResult(pass,reason){
+    this.pass = pass;
+    this.reason = reason;
+  }
+	
+	var createValidationResult = function (pass,reason){
+		return new validationResult(pass,reason);
+	}
 	
-	var sendIQStanzaToRequestGame = function (slug,players,options){
-
-	  if (slug in contactsInfo) {
-	    var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
-	    
-	    var iq = $iq({to: jid, type: "get", id: iqStanzaID['gameRequest']})
-	    .c("query", {xmlns: "urn:ietf:params:xml:ns:xmpp-stanzas"})
-			 .c("game", {name: "gameName"})
-			   .c("players", {})
-			     .c("player1").t("player1value").up()
-					 .c("player2").t("player2value").up()
-				 .c("options", {})
-           .c("options1").t("options1value").up()
-           .c("options2").t("options2value").up()
-	    strophe_connection.sendIQ(iq);
-	  }
-  };
-
-  //Getters
-  var getDummy = function(){
-    return param;
-  };
-
 
-  return {
-    init: init,
-		sendIQStanzaToRequestGame: sendIQStanzaToRequestGame,
-    getDummy: getDummy
+	/////////////////////////////////
+	//         CORE METHODS        //
+	/////////////////////////////////
+	
+  var init = function(myConnection){
+    P.GAME.COMUNICATION.init(myConnection);
   };
+	
 
-}) (PRESENCE, jQuery);
-
-
+	var requestUserToPlay = function (slug,game){
+		if (slug in contactsInfo) {
+      var gameStatus = contactsInfo[slug].gameStatus;
+    } else {
+      var gameStatus = null;
+    }
+    
+    if(! isUserConnected()){
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.offline"));
+      if(gameStatus!=null){
+        contactsInfo[slug].gameStatus = "disconnected";
+      }
+      return;
+    }
 
+    if(! isSlugChatConnected(slug)){
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.guestOffline", {name: getNameFromSlug(slug)}));
+      if(gameStatus!=null){
+        contactsInfo[slug].gameStatus = "disconnected";
+      }
+      return;
+    }
+  
+    if(gameStatus==null){
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t('chat.game.unable'));
+      return;
+    }
+  
+    if(gameStatus!="disconnected"){
+			P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,"Esta ocupado en otro estado!=desconectado...")
+      return;
+    }
 
+    //gameStatus=="disconnected"
+    //Start connection
+    contactsInfo[slug].gameStatus="waiting";
+    P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t('chat.game.waiting'));
 
+	  contactsInfo[slug].game = game
+		var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
+	  return P.GAME.COMUNICATION.sendIQStanzaToRequestGame(jid,game);
+	}
+	
+	var responseUserToPlay = function (slug,result){
+		if (! slug in contactsInfo) {
+		 	return;
+	  }
+		var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
+    P.GAME.COMUNICATION.sendIQStanzaToResponseGameRequest(jid,result)
+    if(result=="yes"){
+      contactsInfo[slug].gameStatus="playing";
+      PRESENCE.GAME.INTERFACE.updateInterfaceBeforeStartGame(slug);
+    } else {
+      contactsInfo[slug].gameStatus="disconnected";
+      PRESENCE.GAME.INTERFACE.updateInterfaceAfterFinishGame(slug);
+    }
+  }
 
+	var sendAction = function(gameId,players,action){
+		$.each(players, function(index, value) {
+      var slug = value.id;
+			if(slug!=user_slug){
+				if(slug in contactsInfo){
+					var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
+          P.GAME.COMUNICATION.sendIQStanzaWithAction(jid,gameId,action);
+				}
+			}
+    });
+	}
 
 
+  var updateLogicAfterReceivedGameRequest = function(slug,gameId,gameName,players,options){	    
+    if(! slug in contactsInfo){
+      return;
+    }
+    contactsInfo[slug].game = new game(gameId,gameName,players,options)    
+    if (contactsInfo[slug].gameStatus!="disconnected"){
+      P.GAME.COMUNICATION.sendIQStanzaToResponseGameRequest(slug,"busy");
+      return true;
+    } else {
+      contactsInfo[slug].gameStatus="pending";
+    } 
+    P.GAME.INTERFACE.updateInterfaceAfterGameRequestReceived(slug)
+  }
 
+  var updateLogicAfterReceivedGameRequestResponse = function(slug,response){
+    if(contactsInfo[slug].gameStatus!="waiting"){
+      return true;
+    }
+    if(response=="yes"){
+      contactsInfo[slug].gameStatus = "playing";
+      P.GAME.INTERFACE.updateInterfaceBeforeStartGame(slug)
+    } else if (response=="no"){
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.rejected", {name: getNameFromSlug(slug)}));
+      contactsInfo[slug].gameStatus="disconnected";
+    } else if (response=="busy"){
+      P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.rejectedBusy", {name: getNameFromSlug(slug)}));
+      contactsInfo[slug].gameStatus="disconnected";
+    } else {
+			P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,I18n.t("chat.game.unknown", {name: getNameFromSlug(slug)}));
+      contactsInfo[slug].gameStatus="disconnected";
+		}
+  }
+	
+	var updateLogicAfterReceivedGameRequestCancelation = function(slug,status){
+    if(slug in contactsInfo){
+      if (status == "finish") {
+        if (contactsInfo[slug].gameStatus == "pending") {
+          P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.cancel", {name: getNameFromSlug(slug)}));
+          contactsInfo[slug].gameStatus = "disconnected";
+        } else if (contactsInfo[slug].gameStatus == "playing") {
+          P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug, I18n.t("chat.game.finish", {name: getNameFromSlug(slug)}));
+          contactsInfo[slug].gameStatus = "disconnected";
+        } 
+      }
+    } else {
+      finishGame(slug);
+    }
+  }
 
+  var getPlayerNameWithId = function(slug){
+		if(! slug in contactsInfo){
+			var game = contactsInfo[slug].game
+			if((game!=null)&&(game.players!=null)){ 
+				 $.each(game.players, function(index, value) {
+           if(value[0]==slug){
+					 	return value[1]
+					 }
+        });
+			}
+		}
+		return null
+	}
 
+  //Validation functions
+	var validateParams = function(myPlayer,game,myDivID){
+    var result;
+		
+		result = checkGameObject(game);
+    if(! result[0] ){
+      return result;
+    }
+    
+    if ((typeof myPlayer=="undefined")||(typeof myDivID=="undefined")){
+      return new validationResult(false,"myPlayer or myDivID undefined");
+    }
 
+    //Check if myPlayers is an Array
+    if (game.players.constructor.toString().indexOf("Array") == -1){
+      return new validationResult(false,"Game.Players is not an array");
+    }
 
+    //Check if myOptions is an Array
+    if (game.options.constructor.toString().indexOf("Array") == -1){
+      return new validationResult(false,"Game.options is not an array");
+    }
+    
+    //Check that myPlayer is contained on myPlayers
+    if(game.players.indexOf(myPlayer)==-1){
+      return new validationResult(false,"myPlayer is not contained in players array");
+    }
 
+    return new validationResult(true,"Ok");  
+  }
+	
 
-////////////////////
-//Interface Events
-////////////////////
-var global;
+	var checkGameObject = function(game){
+    if((typeof game=="undefined")||(typeof game.id=="undefined")||(typeof game.name=="undefined")
+      ||(typeof game.players=="undefined")||(typeof game.options=="undefined")){
+      return new validationResult(false,"Some game field (game/game.id/game.name/game.players/game.options) is undefined");
+    }
+    
+    if((game.id=="")||(game.name=="")){
+      return new validationResult(false,"game.id or game.name is empty");
+    }
+    
+    if(game.id.split(" ").length > 2){
+      return new validationResult(false,"Invalid game.id. No whitespaces allowd in this field");
+    }
+		
+		return new validationResult(true,"Ok");   
+  }
+	
+	var startGame = function (slug,divID){
+		var game = contactsInfo[slug].game;
+		var myplayer = new player(user_slug,getPlayerNameWithId(user_slug))
+		var validationResult = validateParams(myplayer,game,divID)
+		
+		if(! validationResult.pass){
+			var msg = "StartPlay error with reason: " + validationResult.reason;
+			P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,msg);
+			return;
+		}
+		
+		if(typeof PRESENCE.GAME[game.id].validateParams == "function"){
+			validationResult = PRESENCE.GAME[game.id].validateParams(myplayer,game,divID)
+			if(! validationResult.pass){
+	      var msg = "StartPlay error with reason: " + validationResult.reason;
+				P.GAME.INTERFACE.updateInterfaceOnInformationMessage(slug,msg);
+	      return;
+      }
+    } else {
+			log("Warning: Missed " + game.name + " validateParams method")
+		}
+		
+		if(typeof PRESENCE.GAME[game.id].minimumRequirements == "function"){
+      //Check requirements
+    } else {
+      log("Warning: Missed " + game.name + " minRequirements method")
+    }
+		
+		//Add handler and remove previous if exits
+		if(game.handler!=null){
+			PRESENCE.GAME.COMUNICATION.removeHandler(game.handler)
+		}
+		game.handler = PRESENCE.GAME.COMUNICATION.addHandler(game.id)
+		
+		//Call PRESENCE.GAME.gameId
+		var myplayer = new player(user_slug,user_name)
+    PRESENCE.GAME[game.id].init(myplayer,game,divID)
+	}
+	
+	var finishGame = function (slug){
+		if(slug in contactsInfo){
+      var gameStatus = contactsInfo[slug].gameStatus;
+      if(gameStatus=="playing"){
+				var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
+        P.GAME.COMUNICATION.sendIQStanzaToFinishGame(jid);
+				if(contactsInfo[slug].game.handler!=null){
+					P.GAME.COMUNICATION.removeHandler(contactsInfo[slug].game.handler);
+          contactsInfo[slug].game.handler==null;
+        }
+      } else if(gameStatus=="waiting"){
+				var jid=slug+"@"+contactsInfo[slug].domain+"/"+contactsInfo[slug].resource;
+        P.GAME.COMUNICATION.sendIQStanzaToFinishGame(jid);
+      } else if(gameStatus=="pending"){
+        P.GAME.COMUNICATION.sendIQStanzaToResponseGameRequest(slug,"no");
+      }
+      contactsInfo[slug].gameStatus="disconnected";
+    }
+		
+		PRESENCE.GAME.INTERFACE.updateInterfaceAfterFinishGame(slug)
+	}
 
-function play(){
-	$(".chat-gamesthick").css("display","block");
-}
+  var userDisconnected = function(slug){
+		finishGame(slug)
+	}
 
-function pickGamesButton(uiElement){
-  var slug = $(uiElement.element).attr("id");
-  //clickGamesButton(slug);
-	log("clickGamesButton(slug)" + slug)
-}
+  return {
+    init: init,
+		game: game,
+		player: player,
+		startGame: startGame,
+		finishGame: finishGame,
+		createValidationResult: createValidationResult,
+		requestUserToPlay: requestUserToPlay,
+		responseUserToPlay: responseUserToPlay,
+		updateLogicAfterReceivedGameRequest: updateLogicAfterReceivedGameRequest,
+		updateLogicAfterReceivedGameRequestCancelation: updateLogicAfterReceivedGameRequestCancelation,
+		updateLogicAfterReceivedGameRequestResponse: updateLogicAfterReceivedGameRequestResponse,
+		sendAction: sendAction,
+		userDisconnected: userDisconnected
+  };
 
+}) (PRESENCE, jQuery);