social_stream 0.12.7 → 0.12.8

data/base/lib/social_stream/base.rb

@@ -25,10 +25,6 @@ module SocialStream
         end
       end
 
-      initializer "social_stream-base.cancan_devise_integration" do
-        ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
-      end
-
       initializer "social_stream-base.toolbar_config" do
         SocialStream::ToolbarConfig.module_eval do
           include SocialStream::ToolbarConfig::Base
@@ -52,6 +48,10 @@ module SocialStream
           config.email_method = :mailboxer_email
         end
       end
+
+      config.to_prepare do
+        ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
+      end
     end
   end
 end

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.29".freeze
+    VERSION = "0.9.30".freeze
   end
 end

data/base/lib/social_stream/controllers/cancan_devise_integration.rb

@@ -10,8 +10,10 @@ module SocialStream
 
         # Redirect to login if the user is trying to access a protected resource
         # and she is not authenticated
-        def rescue_from_access_denied
-          unless user_signed_in?
+        def rescue_from_access_denied(exception)
+          if user_signed_in?
+            raise exception
+          else
             redirect_to new_user_session_path
           end
         end

data/base/spec/controllers/users_controller_spec.rb

@@ -41,9 +41,7 @@ describe UsersController do
       begin
         get :edit, :id => Factory(:user).to_param
 
-        assert false
-      rescue CanCan::AccessDenied 
-        assert true
+        response.should redirect_to(:new_user_session)
       end
     end
   end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.7".freeze
+  VERSION = "0.12.8".freeze
 end

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

@@ -6,7 +6,6 @@ function log(msg) {
     //console.log(msg)
 }
 
-
 ////////////////////
 //Hash table
 ////////////////////
@@ -24,6 +23,18 @@ statusIcons['away'] = "away";
 statusIcons['xa'] = "away";
 statusIcons['dnd'] = "dnd";
 
+var chatIcons = new Array();
+chatIcons[':)'] = "face-smile.png";
+chatIcons[':('] = "face-sad.png";
+chatIcons['(B)'] = "beer.png";
+chatIcons['(C)'] = "clock.png";
+chatIcons['(P)'] = "present.png";
+chatIcons[':P']= "face-raspberry.png";
+chatIcons[':Z']= "face-tired.png";
+chatIcons['(R)']= "rain.png";
+chatIcons['(S)']= "sun.png";
+chatIcons[';)']= "face-wink.png";
+
 ////////////////////
 //Connect functions
 ////////////////////
@@ -230,32 +241,107 @@ function onMessage(msg) {
     return true;
 }
 
+
+
+function onPresence(presence) {
+	 
+	  //Check presence stanza type
+		ptype = $(presence).attr('type');
+				
+		switch (ptype){
+			case undefined:
+			 processAvailablePresenceStanza(presence)
+			 break;
+			case "available":
+			  processAvailablePresenceStanza(presence)
+        break;
+			case "unavailable":
+        processUnavailablePresenceStanza(presence)
+        break;
+			default : 
+			  //Stanza type not recognize
+				processAvailablePresenceStanza(presence)
+		}
+				  
+	return true;
+} 
+
+function processAvailablePresenceStanza(presence){
+	from = $(presence).attr('from');
+  slug = from.split("@")[0];
+	
+	if (slug != user_slug) {
+		if (getConnectionBoxFromSlug(slug)!=null){
+			status = $(presence).find('show').text(); 
+      setUserIconStatus(slug, status);
+			if (cacheConnectedUsers.indexOf(slug) != -1) {
+	  	  showConnectionBoxFromSlug(slug);
+	    }	
+	  } else {
+	    setTimeout("refreshChatWindow()", 3000);
+	  }
+  }		
+}
+
+function processUnavailablePresenceStanza(presence){
+	from = $(presence).attr('from');
+  slug = from.split("@")[0];
+	
+	if (slug != user_slug) {
+	  if (getConnectionBoxFromSlug(slug)!=null){
+	    hideConnectionBoxFromSlug(slug)
+	  }
+  }
+}
+
+function sendChatMessage(from,to,text){
+    var type = "chat";
+    var body= $build("body");
+    body.t(text);
+    var message = $msg({to: to, from: from, type: 'chat'}).cnode(body.tree());
+    connection.send(message.tree());	  	
+		resumeAwayTimerIfAway();
+		return true;
+}
+
+function authByCookie(){
+	var authMethod = '<%= SocialStream::Presence.auth_method %>';
+	return authMethod=="cookie";
+}
+
+function authByPassword(){
+  var authMethod = '<%= SocialStream::Presence.auth_method %>';
+  return authMethod=="password";
+}
+
+function ifCookie(){
+	return (!(typeof cookie == 'undefined'))
+}
+
+
+
 ///////////////////////////////////////////////////////
-//Allow new features in chat msg like links, images, icons, ...
+// Parser functions
+// Allow new features in chat msg like links, images, emoticons, ...
 ///////////////////////////////////////////////////////
 
-var chatIcons = new Array();
-chatIcons[':)'] = "face-smile.png";
-chatIcons[':('] = "face-sad.png";
-chatIcons['(B)'] = "beer.png";
-chatIcons['(C)'] = "clock.png";
-chatIcons['(P)'] = "present.png";
-chatIcons[':P']= "face-raspberry.png";
-chatIcons[':Z']= "face-tired.png";
-chatIcons['(R)']= "rain.png";
-chatIcons['(S)']= "sun.png";
-chatIcons[';)']= "face-wink.png";
-
+//Patterns
+var html_tag_pattern=/.*\<[^>]+>.*/g
+var simple_word_pattern=/^[aA-zZ0-9]+$/g
+var http_urls_pattern=/(http(s)?:\/\/)([aA-zZ0-9%=_&+?])+([./-][aA-zZ0-9%=_&+?]+)*[/]?/g
+var www_urls_pattern = /(www[.])([aA-zZ0-9%=_&+?])+([./-][aA-zZ0-9%=_&+?]+)*[/]?/g
+var icons_a_pattern=/\([A-Z]\)/g
+var icons_b_pattern=/((:|;)([()A-Z]))/g
+var youtube_video_pattern=/(http(s)?:\/\/)?(((youtu.be\/)([aA-zZ0-9]+))|((www.youtube.com\/watch\?v=)([aA-z0-9Z&=.])+))/g
 
 function parseContent(content){
-	
-	var html_tag_pattern=/.*\<[^>]+>.*/g
-	if (html_tag_pattern.test(content)){
-		content = content.replace(/>/g, "&gt;");
+  
+  if (content.match(html_tag_pattern)!=null){
+    content = content.replace(/>/g, "&gt;");
     content = content.replace(/</g, "&lt;");
-		return "<pre>" + content + "</pre>"
-	}
-	
+    return "<pre>" + content + "</pre>"
+  }
+  
   words = content.split(" ");
   for(i=0; i<words.length; i++){
     words[i] = parseWord(words[i]);
@@ -266,93 +352,77 @@ function parseContent(content){
 
 function parseWord(word){ 
   
-  //Look for empty words
-  if (word.trim()==""){
-		return word
-	}
-
-  //Look for simple words
-	var simple_word_pattern=/^[aA-zZ0-9]+$/g
-	if (simple_word_pattern.test(word)){
-		return word
-	}
+  //Look for empty or simple words
+  if ((word.trim()=="")||(word.match(simple_word_pattern)!=null)){
+    return word
+  }
 
   //Look for http urls
-	var http_urls_pattern=/(http(s)?:\/\/)([aA-zZ0-9%=_&+?])+([./-][aA-zZ0-9%=_&+?]+)*[/]?/g
-  http_urls = word.match(http_urls_pattern)
+  var http_urls = word.match(http_urls_pattern)
   if (http_urls!=null){
-    url = http_urls[0]
-    type = getUrlType(url);
+    var url = http_urls[0]
+    var type = getUrlType(url);
   
     switch(type){
-    case "link":
-			link = buildUrlLink(url,url)
-			subwords = word.split(url)
-			word =  parseWord(subwords[0]) + link + parseWord(subwords[1])
-      break;
-    case "image":
-      imageLink = buildImageLink(url);
-      subwords = word.split(url)
-      word =  parseWord(subwords[0]) + imageLink + parseWord(subwords[1])
-			break;
-    default:
+      case "link":
+        var link = buildUrlLink(url,url)
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + link + parseWord(subwords[1])
+      case "image":
+        var imageLink = buildImageLink(url);
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + imageLink + parseWord(subwords[1])
+      case "video-youtube":
+        var youtubeLink =  buildYoutubeVideoLink(url);
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + youtubeLink + parseWord(subwords[1])
+      default:
+        return word
     }
-    return word
   }
   
 
   //Look for www urls
-	var www_urls_pattern = /(www[.])([aA-zZ0-9%=_&+?])+([.][aA-zZ0-9%=_&+?]+)*[/]?/g
-  www_urls = word.match(www_urls_pattern)
+  var www_urls = word.match(www_urls_pattern)
   if (www_urls!=null){
-    url = www_urls[0]
-    type = getUrlType(url);
+    var url = www_urls[0]
+    var type = getUrlType(url);
 
     switch(type){
     case "link":
-		  link = buildUrlLink("http://" + url,url)
-      subwords = word.split(url)
-      word =  parseWord(subwords[0]) + link + parseWord(subwords[1])
-      break;
+      var link = buildUrlLink("http://" + url,url)
+      var subwords = splitFirst(word,url)
+      return parseWord(subwords[0]) + link + parseWord(subwords[1])
     case "image": 
-			imageLink = buildImageLink("http://" + url);
-			subwords = word.split(url)
-      word =  parseWord(subwords[0]) + imageLink + parseWord(subwords[1])
-      break;
+      var imageLink = buildImageLink("http://" + url);
+      var subwords = splitFirst(word,url)
+      return parseWord(subwords[0]) + imageLink + parseWord(subwords[1])
+    case "video-youtube":
+        var youtubeLink =  buildYoutubeVideoLink("http://" + url);
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + youtubeLink + parseWord(subwords[1])
     default:
-    } 
-    return word
+      return word
+    }  
   }
 
-  //Look for icons: Directly replace
-	var icons_a_pattern=/\(([A-Z])+\)/g
-	var icons_b_pattern=/(:|;)([()A-Z])(.)*/g
-	if (((icons_a_pattern.test(word))) || (icons_b_pattern.test(word))) { 
-  	for (var i in chatIcons) {
-  		word = word.replace(buildRegex(i), buildIconImage(i))
-  	}
+  //Look for icons: Regex
+  var icons_a = word.match(icons_a_pattern)
+  if(icons_a!=null){
+    for(g=0; g<icons_a.length; g++){
+        word = word.replace(buildRegex(icons_a[g]), buildIconImage(icons_a[g]))
+    }
+  }
+
+  var icons_b = word.match(icons_b_pattern)
+  if(icons_b!=null){
+    for(h=0; h<icons_b.length; h++){
+        word = word.replace(buildRegex(icons_b[h]), buildIconImage(icons_b[h]))
+    }
   }
-	
-  //Look for icons with Regex
-//	var icons_a_pattern=/\(([A-Z])+\)/g
-//  if (icons_a_pattern.test(word)){
-//    icon = word.replace(/[^(]*(\([A-Z]+\))(\([A-Z]+\))?(.)*/g, "$1")
-//    subwords = splitFirst(word,icon)
-//    image = buildIconImage(icon);
-//    return subwords[0] + image + subwords[1];
-//  }
-
-//	var icons_b_pattern=/:([()A-Z])(.)*/g
-//  if (icons_b_pattern.test(word)){
-//    icon = word.replace(/[aA-zZ]*(:[()A-Z])(.)*/g, "$1")
-//    subwords = splitFirst(word,icon)
-//		image = buildIconImage(icon);
-//		return subwords[0] + image + subwords[1];
-    //return parseWord(subwords[0]) + image + parseWord(subwords[1]);
-//  }
   
-	
-  //No special content detected
+  
+  //No special content detected (maybe emoticons but not special pattern like urls)
   return word
 }
 
@@ -369,138 +439,105 @@ function splitFirst(word,key){
 function buildIconImage(icon){
   if (icon in chatIcons){
     image_file = chatIcons[icon]
-		image = "<img class=\"chatIcon\" src=\"assets/emoticons/" + image_file + "\"/>";
-		return image
+    return "<img class=\"chatEmoticon\" src=\"assets/emoticons/" + image_file + "\"/>";
   }
   return icon
 }
 
 function buildUrlLink(url,name){
-  link = "<a target=\"_blank\" class=\"chatLink\" href=\"" + url + "\">" + name + "</a>";
-	return link
+  return "<a target=\"_blank\" class=\"chatLink\" href=\"" + url + "\">" + name + "</a>";
 }
 
 function buildImageLink(url){
-  link = "<a target=\"_blank\" class=\"chatImageLink\" href=\"" + url + "\">" + "<img class=\"chatImage\" src=\"" + url + "\"/>" + "</a>";
-  return link
-}
+  return "<a target=\"_blank\" class=\"chatImageLink\" href=\"" + url + "\">" + "<img class=\"chatImage\" src=\"" + url + "\"/>" + "</a>";
+}
+
+function buildYoutubeVideoLink(url){
+  //Get youtube video id
+  var youtube_video_id=url.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
+  var youtube_api_url = "http://gdata.youtube.com/feeds/api/videos/" + youtube_video_id
+
+  //Get info from the video
+  $.ajax({
+        type: "GET",
+        url: youtube_api_url,
+        cache: false,
+        dataType:'jsonp',
+        success: function(data){
+					var url_name = url;
+					var youtube_video_thumbnail = "";
+					
+					//Video title
+					var video_title = $(data).find("media\\:title")
+					if (video_title.length > 0) {
+		  	   //url_name = url + " (" + $(video_title).text() + ")";
+					 url_name = $(video_title).text()
+		      }
+					
+					//Thumbnails
+          var thumbnails = $(data).find("media\\:thumbnail")
+          if (thumbnails.length>0){
+            var thumbnail_url = $(thumbnails[0]).attr("url")
+						if (thumbnail_url!=null){
+							youtube_video_thumbnail = "<p><img class=\"chatVideoImage\" src=\"" + thumbnail_url + "\"/></p>";
+						} 
+          }
+					
+					 //Replace video link
+					 $("a[youtube_id=" + youtube_video_id + "]").html(buildUrlLink(url,url_name)+youtube_video_thumbnail);
+      },
+        error: function(xOptions, textStatus){
+          //Handle errors
+        }
+   });
 
+  return "<a target=\"_blank\" youtube_id=\"" + youtube_video_id + "\" class=\"chatLink\" href=\"" + url + "\">" + url + "</a>";
+}
 
 function buildRegex(word){
-	word = word.replace(")","\\)")
-	word = word.replace("(","\\(")
-  pattern = "(" + word + ")";
+  word = word.replace(")","\\)")
+  word = word.replace("(","\\(")
+  var pattern = "(" + word + ")";
   pattern = buildPattern(pattern)
   return (new RegExp(pattern,'g'));
 }
 
 function buildPattern(pattern){
-	//Escape pattern special characters
+  //Escape pattern special characters
   pattern = pattern.replace("+","\\+")
   pattern = pattern.replace("?","\\?")
   return pattern
 }
 
+
 function getUrlType(url){
-  urlArray = url.split(".");
+
+  if (url.match(youtube_video_pattern)!=null){
+    return  "video-youtube"
+  }
+
+  var urlArray = url.split(".");
   if (urlArray!=null && urlArray.length>0){
-    extension= urlArray[urlArray.length-1]
+    var extension= urlArray[urlArray.length-1]
   } else {
-    extension = null;
+    var extension = null;
   }
 
   switch(extension){
-  case "jpg":
-    return "image"
-    break;
-  case "png":
-    return "image"
-    break;
-	case "gif":
-    return "image"
-    break;
-  default:
-    return "link"
-  }
-}
-
-
-
-function onPresence(presence) {
-	 
-	  //Check presence stanza type
-		ptype = $(presence).attr('type');
-				
-		switch (ptype){
-			case undefined:
-			 processAvailablePresenceStanza(presence)
-			 break;
-			case "available":
-			  processAvailablePresenceStanza(presence)
-        break;
-			case "unavailable":
-        processUnavailablePresenceStanza(presence)
-        break;
-			default : 
-			  //Stanza type not recognize
-				processAvailablePresenceStanza(presence)
-		}
-				  
-	return true;
-} 
-
-function processAvailablePresenceStanza(presence){
-	from = $(presence).attr('from');
-  slug = from.split("@")[0];
-	
-	if (slug != user_slug) {
-		if (getConnectionBoxFromSlug(slug)!=null){
-			status = $(presence).find('show').text(); 
-      setUserIconStatus(slug, status);
-			if (cacheConnectedUsers.indexOf(slug) != -1) {
-	  	  showConnectionBoxFromSlug(slug);
-	    }	
-	  } else {
-	    setTimeout("refreshChatWindow()", 3000);
-	  }
-  }		
-}
-
-function processUnavailablePresenceStanza(presence){
-	from = $(presence).attr('from');
-  slug = from.split("@")[0];
-	
-	if (slug != user_slug) {
-	  if (getConnectionBoxFromSlug(slug)!=null){
-	    hideConnectionBoxFromSlug(slug)
-	  }
+    case "jpg":
+      return "image"
+      break;
+    case "png":
+      return "image"
+      break;
+    case "gif":
+      return "image"
+      break;
+    default:
+      return "link"
   }
 }
 
-function sendChatMessage(from,to,text){
-    var type = "chat";
-    var body= $build("body");
-    body.t(text);
-    var message = $msg({to: to, from: from, type: 'chat'}).cnode(body.tree());
-    connection.send(message.tree());	  	
-		resumeAwayTimerIfAway();
-		return true;
-}
-
-function authByCookie(){
-	var authMethod = '<%= SocialStream::Presence.auth_method %>';
-	return authMethod=="cookie";
-}
-
-function authByPassword(){
-  var authMethod = '<%= SocialStream::Presence.auth_method %>';
-  return authMethod=="password";
-}
-
-function ifCookie(){
-	return (!(typeof cookie == 'undefined'))
-}
-
 ////////////////////
 //Audio functions
 ////////////////////

data/presence/app/assets/stylesheets/chat.css

@@ -239,14 +239,19 @@ input.connectChatButton{
 }
 
 
-/* Chat text */
+/* Chat text style */
 
 .chatImage {
   max-width: 100px;
   max-height: 100px;
 }
 
-.chatIcon {
+.chatVideoImage {
+  max-width: 100px;
+  max-height: 100px;
+}
+
+.chatEmoticon {
   max-width:20px;
   max-height: 20px;
 }
@@ -255,5 +260,6 @@ a.chatLink:link, a.chatLink:visited {
     color: #1E726A;
 }
 
-.chatImageLink {
+a.chatImageLink:link, a.chatImageLink:visited {
+    color: #1E726A;
 }

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.29')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.30')
   s.add_runtime_dependency('social_stream-documents', '~> 0.4.4')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 12
-  - 7
-  version: 0.12.7
+  - 8
+  version: 0.12.8
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 0
         - 9
-        - 29
-        version: 0.9.29
+        - 30
+        version: 0.9.30
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency