social_stream-presence 0.6.1 → 0.6.2

data/app/assets/javascripts/{chat_audio.js → chat_audio.js.erb}

@@ -3,6 +3,7 @@
 ////////////////////
 
 //Global audio variables
+var audio_path = '<%=image_path("chat")%>';
 var onMessageAudio;
 
 var html5_audiotypes=[
@@ -23,7 +24,7 @@ function initSound(sound){
   var html5audio=document.createElement('audio')
   
   if (html5audio.canPlayType){ 
-    path = '/assets/chat/' + sound;
+    path = audio_path + "/" + sound;
     window[sound] = new Audio();
 
     for(i=0; i<html5_audiotypes.length; i++){
@@ -47,7 +48,7 @@ function playSound(sound){
     window[sound].play();
   } else {
     //Fallback option: When browser doesn't support HTML5 audio
-    $('body').append('<embed src="/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
+    $('body').append('<embed src="' + audio_path + '/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
   }
 }
 

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

@@ -220,10 +220,11 @@ function showConnectionBoxFromSlug(slug){
 
 function setUserIconStatus(slug, status){
    if (status in statusIcons) {
-     iconName = statusIcons[status];
+     var iconName = statusIcons[status];
      var $img_status = $('img.presence_status');
+		 var path = '<%=image_path("status")%>';
      connectionBox = getConnectionBoxFromSlug(slug);
-     $(connectionBox).find($img_status).attr("src", "/assets/status/" + iconName + ".png")
+     $(connectionBox).find($img_status).attr("src", path + "/" + iconName + ".png")
    }
 }
 

data/app/assets/javascripts/chat_window_manager.js

@@ -211,7 +211,7 @@ function getVideoEmbedForSlug(slug){
 ///////////////////////////
 
 var mainChatBox;
-var chatSlugId="SocialStream_MainChat"
+var chatSlugId="SocialStream_MainChat";
 
 function createMainChatBox(){
 	if (mainChatBox==null){
@@ -258,7 +258,9 @@ function createMainChatBox(){
 
 
 function addContentToMainChatBox(content){
-	$(mainChatBox.parent()).find("#" + chatSlugId).html(content);
+	if (mainChatBox != null) {
+  	$(mainChatBox.parent()).find("#" + chatSlugId).html(content);
+  }
 }
 
 
@@ -274,5 +276,7 @@ function modifyChatPartialIfMainBox(chatPartial){
 }
 
 function changeMainChatBoxHeaderTitle(title){
-  $($(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find("span")[0]).html(title);
+	if (mainChatBox != null) {
+  	$($(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find("span")[0]).html(title);
+  }
 }

data/app/views/chat/_contacts.html.erb

@@ -12,10 +12,10 @@
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul id="statusList">
-					      <li><a id="available" href="#" class="option"><img class="flag" src="/assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">available</span></a></li>
-					      <li><a id="away" href="#" class="option"><img class="flag" src="/assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
-					      <li><a id="dnd" href="#" class="option"><img class="flag" src="/assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
-								<li><a id="offline" href="#" class="option"><img class="flag" src="/assets/status/offline.png" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
+					      <li><a id="available" href="#" class="option"><img class="flag" src="<%=image_path("status/available.png")%>" alt=""/> <%=t('chat.status.available')%> <span class="value">available</span></a></li>
+					      <li><a id="away" href="#" class="option"><img class="flag" src="<%=image_path("status/away.png")%>" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
+					      <li><a id="dnd" href="#" class="option"><img class="flag" src="<%=image_path("status/dnd.png")%>" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
+								<li><a id="offline" href="#" class="option"><img class="flag" src="<%=image_path("status/offline.png")%>" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
 			        </ul>
 			    </dd>
         </div>

data/app/views/chat/_index.html.erb

@@ -32,8 +32,7 @@
       }
       
       initAudio();
-      initFocusListeners();
-			
+      initFocusListeners();			
   });
   
 </script>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  match "/active_users" => "Xmpp#active_users"
+  #match "/active_users" => "Xmpp#active_users"
   
   match '/xmpp/setConnection' => "Xmpp#setConnection"
   match '/xmpp/unsetConnection' => "Xmpp#unsetConecction"

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,79 +1,83 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: social_stream-presence
-version: !ruby/object:Gem::Version
-  version: 0.6.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.6.2
 platform: ruby
-authors:
+authors: 
 - Aldo Gordillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-06 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: social_stream-base
-  requirement: &80060050 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.15.1
   type: :runtime
-  prerelease: false
-  version_requirements: *80060050
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: xmpp4r
-  requirement: &80059820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *80059820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: &80059590 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *80059590
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: net-sftp
-  requirement: &80059370 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *80059370
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &80059160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *80059160
-description: Social Stream is a Ruby on Rails engine providing your application with
-  social networking features and activity streams.
-email:
+  version_requirements: *id005
+description: Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
+email: 
 - iamchrono@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Rakefile
@@ -94,7 +98,7 @@ files:
 - app/assets/images/status/away.png
 - app/assets/images/status/dnd.png
 - app/assets/images/status/offline.png
-- app/assets/javascripts/chat_audio.js
+- app/assets/javascripts/chat_audio.js.erb
 - app/assets/javascripts/chat_interface_manager.js.erb
 - app/assets/javascripts/chat_parser.js
 - app/assets/javascripts/chat_persistence.js
@@ -207,30 +211,33 @@ files:
 - vendor/assets/javascripts/jquery.ui.chatbox.js
 - vendor/assets/javascripts/strophe.js
 - vendor/assets/stylesheets/jquery.ui.chatbox.css
+has_rdoc: true
 homepage: https://github.com/ging/social_stream-presence
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: social_stream-presence
-rubygems_version: 1.8.12
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: Presence capabilities for Social Stream, the core for building social network
-  websites
+summary: Presence capabilities for Social Stream, the core for building social network websites
 test_files: []
-has_rdoc: 
+