social_stream 1.1.12 → 2.0.0.beta1

data/presence/app/overrides/settings/_index/add_chat.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_before "code[erb-loud]:contains('notifications')" -->
+
+<% if SocialStream::Presence.enable && current_subject == current_user %>
+  <%= render partial: "settings/chat" %>
+<% end %>
+

data/presence/app/overrides/toolbar/_home/add_chat.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "code[erb-loud]:contains('toolbar/menu')" -->
+
+<%= render partial: 'chat/index' %>

data/presence/app/overrides/toolbar/_profile/add_chat.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_after "code[erb-loud]:contains('toolbar/contacts')" -->
+
+<%= render partial: 'chat/index',
+           locals: { group: @group } %>

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

@@ -15,4 +15,4 @@
         </a>
       </div>
   <%end%>
-</div>
+</div>

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

@@ -1,77 +1,104 @@
-<% if current_user and current_user.chat_enabled and current_subject.subject_type=="User" %>
-	
+<% if current_user && current_user.chat_enabled %>
+
 <div id="chat_wrapper"> 
 
   <div id="chat_partial">    
   </div>
-	
-	<div id="chat_divs">  
-	  <div id="chat_div"></div>
-	</div>
-	
-	<div id="chat_connecting">
-	  <div class="block">
-      <div class="header">
-        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-        <div class="header_text">
-          <%=t('chat.connecting')%>
-        </div>
-      </div>
-    </div>
-	</div>
-	
-  <div id="chat_connection_off">
-    <div class="block">
-      <div class="header">
-        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-        <div class="header_text">
-          <p id="chat_header_title"><%=t('chat.disconnected')%></p>
-        </div>
-      </div>
+  
+  <div id="chat_divs">  
+    <div id="chat_div">
     </div>
+  </div>
+  
+  <section id="chat_connecting">
+    <header> 
+      <%=image_tag("chat-off.png", :class => "header_icon")%>
+      
+      <%=t('chat.connecting')%>
+    </header>
+  </section>
+  
+  <article id="chat_connection_off">
+    <header>
+      <%=image_tag("chat-off.png", :class => "header_icon")%>
+      <p id="chat_header_title">
+        <%=t('chat.disconnected')%>
+      </p>
+    </header>
+
     <div class="chat_off">
       <div id="passwordFormChat">
-        <label for="user_password" class="chatPasswordTitle"><%=t('chat.password')%></label>
-        <input id="user_password" class="chat_password" type="password"></input>
-      </div>
-      <input class="connectChatButton storePass" value="Connect">
-    </div>	
-	</div>
-	
-	<div id="chat_widgets">
-		<div class="block">
-      <div class="header">
-        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-        <div class="header_text">
-          <%=t('chat.title')%>
-        </div>
+        <label for="user_password" class="chatPasswordTitle">
+          <%=t('chat.password')%>
+        </label>
+        <input id="user_password" class="chat_password" type="password">
+        </input>
       </div>
+      <input type="submit" class="btn storePass connectChatButton" value="Connect">
+    </div>  
+  </article>
+  
+  <div id="chat_widgets">
+    <header>
+      <%=image_tag("chat-off.png", :class => "header_icon")%>
     
-	    <div id="status" class="dropdown">
-	      <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="<%=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>
-						
-			<div class="searchChatContacts">
-			    <select id="search_chat_contact" class="flexselect">
-			      <option value="">""</option>
-			    </select>
-			</div>
-			
+      <%=t('chat.title')%>
+    </header>
+      
+    <div id="status" class="dropdown">
+      <dt>
+        <a href="">
+          <span>
+            <%=t('chat.status.choose')%>
+          </span>
+        </a>
+      </dt>
+      <dd>
+        <ul id="statusList">
+          <li>
+            <a id="available" href="#" class="option">
+              <span class="badge available">
+              </span>
+              <%=t('chat.status.available')%>
+            </a>
+          </li>
+          <li>
+            <a id="away" href="#" class="option">
+              <span class="badge away">
+              </span>
+              <%=t('chat.status.away')%> 
+            </a>
+          </li>
+          <li>
+            <a id="dnd" href="#" class="option">
+              <span class="badge dnd">
+              </span>
+              <%=t('chat.status.dnd')%> 
+            </a>
+          </li>
+          <li>
+            <a id="offline" href="#" class="option">
+              <span class="badge offline">
+              </span> 
+              <%=t('chat.status.offline')%> 
+            </a>
+          </li>
+        </ul>
+      </dd>
     </div>
-	</div>
-	
-	<div>
-		<div id="publisherID"></div>
-	</div>
-	
+      
+    <div class="searchChatContacts">
+      <select id="search_chat_contact" class="flexselect">
+        <option value="">
+          ""
+        </option>
+      </select>
+    </div>
+  </div>
+  <div>
+    <div id="publisherID">
+    </div>
+  </div>
 </div>
 
 
@@ -79,45 +106,50 @@
 
   //Global variables
   var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
-	var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
-	var user_name = '<%=current_user.name%>';
+  var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
+  var user_name = '<%=current_user.name%>';
   var user_slug = '<%=current_user.slug%>';
   var user_jid = PRESENCE.XMPPClient.getJidFromSlug('<%=current_user.slug%>');
-	
+  
 
   $(document).ready(function () {
-			
-		//Inicial field
-		$("#chat_partial").html($("#chat_connecting").html())
-	
-    if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
-			PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
-      initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
-    } else {
-      PRESENCE.UIMANAGER.updateChatWindow();
-    }
-      
-	  PRESENCE.CORE.init();
-  });
+    
+        //Inicial field
+        $("#chat_connecting").hide();
+        $("#chat_connection_off").hide();
+        $("#chat_widgets").hide();
+        $("#statusList").hide();
+        $("#chat_partial").html($("#chat_connecting").html())
+        
+        if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
+          if (PRESENCE.XMPPClient.authByCookie()) {
+            PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
+          } else {
+            PRESENCE.XMPPClient.connectToChat(user_jid);
+          }
+          initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
+        } else {
+          PRESENCE.UIMANAGER.updateChatWindow();
+        }
+        
+        PRESENCE.CORE.init();
+      });
   
-</script>
+  </script>
 
-<% if defined?(flow)!=nil and flow %>
   <script type="text/javascript">
-	  $(document).ready(function () {
-		  PRESENCE.WINDOW.createMainChatBox();
-			PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
-			$("#chat_wrapper").find("#chat_partial").remove();
-		});
-	</script>
-<% end %>
-
+  $(document).ready(function () {
+    PRESENCE.WINDOW.createMainChatBox();
+    PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
+    $("#chat_wrapper").find("#chat_partial").remove();
+  });
+  </script>
 
-<% if defined?(group)!=nil and group %>
+  <% if defined?(group)!=nil and group %>
   <script type="text/javascript">
-  	var current_group_slug = '<%=group.slug%>';
+  var current_group_slug = '<%=group.slug%>';
   </script>
-<% end %>
+  <% end %>
 
 
-<% end %>
+  <% end %>

data/presence/app/views/settings/_chat.html.erb

@@ -0,0 +1,23 @@
+<div id="chat_settings" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>      
+      <%= link_to t('chat.title'),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#chat_settings_content" %>
+    </h5>
+  </header>
+
+  <div class="content settings_content collapse" id="chat_settings_content">
+	  <%= form_tag(:controller => "Xmpp", :action => "updateSettings", :method => "get") do %>
+    <ul  class="settings_block">
+      <li>  
+        <% checked = current_user.chat_enabled %>
+        <%= check_box_tag 'enable_chat', true, checked %>
+        <%= label_tag(:enable_chat, t('chat.settings.checkbox')) %> 
+        <div class="actions center">
+          <%= hidden_field_tag :settings_section, :chat %>
+          <%= submit_tag t('chat.settings.update'), :class => "btn" %>
+        </div>
+      </li>
+    </ul>
+    <% end %>
+  </div>
+</div>

data/presence/config/locales/en.yml

@@ -1,9 +1,9 @@
 en:
   chat:
-    connecting: "Chat Connecting"
-    reconnecting: "Chat Reconnecting"
-    disconnected: "Chat Disconnected"
-    unableconnect: "Chat Out of Service"
+    connecting: "Connecting"
+    reconnecting: "Reconnecting"
+    disconnected: "Disconnected"
+    unableconnect: "Out of Service"
     title: "Chat"
     password: "Password"
     zerousers: "No users connected"
@@ -64,4 +64,4 @@ en:
       finish: "{{name}} close the game"
       waiting: Waiting for response...
       unknown: Unknown response
-      clientIssue: "{{name}}'s client not support games"
+      clientIssue: "{{name}}'s client not support games"

data/presence/config/locales/es.yml

@@ -1,9 +1,9 @@
 es:
   chat:
-    connecting: "Chat Conectando"
-    reconnecting: "Chat Reconectando"
-    disconnected: "Chat Desconectado"
-    unableconnect: "Chat Fuera de servicio"
+    connecting: "Conectando"
+    reconnecting: "Reconectando"
+    disconnected: "Desconectado"
+    unableconnect: "Fuera de servicio"
     title: "Chat"
     password: "Contraseña"
     zerousers: "No hay contactos conectados"
@@ -64,4 +64,4 @@ es:
       finish: "{{name}} ha cerrado el juego"
       waiting: Esperando respuesta...
       unknown: Respuesta desconocida
-      clientIssue: "El cliente de {{name}} no tiene juegos"
+      clientIssue: "El cliente de {{name}} no tiene juegos"

data/presence/lib/generators/social_stream/presence/install_generator.rb

@@ -21,8 +21,7 @@ class SocialStream::Presence::InstallGenerator < Rails::Generators::Base
   end
 
   def require_stylesheets
-    inject_into_file 'app/assets/stylesheets/application.css',
-                     " *= require social_stream-presence\n",
-                     :before => ' *= require_tree .'
+    append_file 'app/assets/stylesheets/social_stream.css.sass',
+                "@import social_stream-presence\n"
   end
 end

data/presence/lib/social_stream-presence.rb

@@ -1,16 +1,6 @@
 require 'social_stream-base'
 
 module SocialStream
-  module Views
-    module Settings
-      autoload :Presence, 'social_stream/views/settings/presence'
-    end
-
-    module Toolbar
-      autoload :Presence, 'social_stream/views/toolbar/presence'
-    end
-  end
-
   module Presence   
     autoload :VERSION, 'social_stream/presence/version'
 

data/presence/lib/social_stream/presence/engine.rb

@@ -1,17 +1,6 @@
 module SocialStream
   module Presence
     class Engine < Rails::Engine
-      initializer "social_stream-presence.views.settings" do
-        SocialStream::Views::Settings.module_eval do
-          include SocialStream::Views::Settings::Presence
-        end
-      end
-
-      initializer "social_stream-presence.views.toolbar" do
-        SocialStream::Views::Toolbar.module_eval do
-          include SocialStream::Views::Toolbar::Presence
-        end
-      end
     end
   end
 end

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "1.1.0"
+    VERSION = "2.0.0.beta1"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -5,7 +5,7 @@ require "social_stream/presence/version"
 Gem::Specification.new do |s|
   s.name        = "social_stream-presence"
   s.version     = SocialStream::Presence::VERSION
-  s.authors     = ["Aldo Gordillo"]
+  s.authors     = ["Aldo Gordillo", "GING"]
   s.email       = ["agordillos@gmail.com"]
   s.homepage    = "https://github.com/ging/social_stream/wiki/Getting-Started-With-Social-Stream-Presence"
   s.summary = "Presence capabilities for Social Stream, the core for building social network websites."
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 1.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta1')
   
   s.add_runtime_dependency "xmpp4r"
 

data/presence/spec/views/settings_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe 'settings/_index' do
+  let(:user) { stub_model(User, { name: "Test User",
+                                  email: "test-user@test.com",
+                                  language: 'en' } ) }
+
+  let(:group) { stub_model(Group, { name: "Test Group",
+                                    to_param: "test-group" } ) }
+
+  before do
+    SocialStream::Presence.stub(:enable) { true }
+
+    view.stub(:current_user).and_return(user)
+  end
+
+  describe "with user" do
+    before do
+      view.stub(:current_subject).and_return(user)
+    end
+
+    it "includes chat settings" do
+      render
+
+      rendered.should =~ /chat_settings/
+    end
+  end
+
+  describe "with group" do
+    before do
+      view.stub(:current_subject).and_return(group)
+    end
+
+    it "does not include chat settings" do
+      render
+
+      rendered.should_not =~ /chat_settings/
+    end
+  end
+
+end