social_stream-presence 1.1.0 → 2.0.0.beta1

data/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

metadata

@@ -1,94 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-presence
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Aldo Gordillo
+- GING
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Social Stream Presence provides everything you need for including presence,
@@ -109,6 +99,8 @@ files:
 - app/assets/images/black_arrow7.png
 - app/assets/images/black_arrow8.png
 - app/assets/images/black_arrow9.png
+- app/assets/images/chat-off.png
+- app/assets/images/chat-on.png
 - app/assets/images/emoticons/beer.png
 - app/assets/images/emoticons/clock.png
 - app/assets/images/emoticons/face-raspberry.png
@@ -176,16 +168,22 @@ files:
 - app/assets/javascripts/presence_videochat.js.erb
 - app/assets/javascripts/presence_windowManager.js
 - app/assets/javascripts/social_stream-presence.js
-- app/assets/stylesheets/TresEnRaya.css
-- app/assets/stylesheets/chat.css.scss
-- app/assets/stylesheets/social_stream-presence.css
+- app/assets/stylesheets/social_stream-presence.css.sass
+- app/assets/stylesheets/social_stream/presence/_toolbar-chat.css.sass
+- app/assets/stylesheets/social_stream/presence/_wrapper-chatBox.css.sass
+- app/assets/stylesheets/social_stream/responsive/_responsive-1200px-min.css.sass
+- app/assets/stylesheets/social_stream/responsive/_responsive-767px-max.css.sass
+- app/assets/stylesheets/social_stream/responsive/_responsive-768px-979px.css.sass
 - app/controllers/xmpp_controller.rb
 - app/decorators/social_stream/base/models/group_decorator.rb
 - app/decorators/social_stream/base/models/tie_decorator.rb
 - app/helpers/xmpp_helper.rb
+- app/overrides/settings/_index/add_chat.html.erb.deface
+- app/overrides/toolbar/_home/add_chat.html.erb.deface
+- app/overrides/toolbar/_profile/add_chat.html.erb.deface
 - app/views/chat/_contacts.html.erb
 - app/views/chat/_index.html.erb
-- app/views/chat/_settings.html.erb
+- app/views/settings/_chat.html.erb
 - app/views/xmpp/active_users.html.erb
 - app/views/xmpp/getOpenTokSessionIDAndToken.xml.builder
 - config/locales/en.yml
@@ -229,63 +227,13 @@ files:
 - lib/social_stream/presence/version.rb
 - lib/social_stream/presence/xmpp_server_order.rb
 - lib/social_stream/presence/xmpp_ssclient.rb
-- lib/social_stream/views/settings/presence.rb
-- lib/social_stream/views/toolbar/presence.rb
 - lib/tasks/presence/installer.rake
 - lib/tasks/presence/multidomain.rake
 - lib/tasks/presence/synchronize.rake
 - social_stream-presence.gemspec
-- spec/demo/.gitignore
-- spec/demo/.rspec
-- spec/demo/README
-- spec/demo/Rakefile
-- spec/demo/app/assets/images/rails.png
-- spec/demo/app/assets/javascripts/application.js
-- spec/demo/app/assets/stylesheets/application.css
-- spec/demo/app/controllers/application_controller.rb
-- spec/demo/app/helpers/application_helper.rb
-- spec/demo/app/mailers/.gitkeep
-- spec/demo/app/models/.gitkeep
-- spec/demo/app/views/layouts/application.html.erb
-- spec/demo/autotest/discover.rb
-- spec/demo/config.ru
-- spec/demo/config/application.rb
-- spec/demo/config/boot.rb
-- spec/demo/config/database.yml
-- spec/demo/config/environment.rb
-- spec/demo/config/environments/development.rb
-- spec/demo/config/environments/production.rb
-- spec/demo/config/environments/test.rb
-- spec/demo/config/initializers/backtrace_silencers.rb
-- spec/demo/config/initializers/inflections.rb
-- spec/demo/config/initializers/mime_types.rb
-- spec/demo/config/initializers/secret_token.rb
-- spec/demo/config/initializers/session_store.rb
-- spec/demo/config/initializers/wrap_parameters.rb
-- spec/demo/config/locales/en.yml
-- spec/demo/config/routes.rb
-- spec/demo/db/seeds.rb
-- spec/demo/doc/README_FOR_APP
-- spec/demo/lib/tasks/.gitkeep
-- spec/demo/log/.gitkeep
-- spec/demo/public/404.html
-- spec/demo/public/422.html
-- spec/demo/public/500.html
-- spec/demo/public/favicon.ico
-- spec/demo/public/index.html
-- spec/demo/public/robots.txt
-- spec/demo/script/rails
-- spec/demo/spec/spec_helper.rb
-- spec/demo/test/fixtures/.gitkeep
-- spec/demo/test/functional/.gitkeep
-- spec/demo/test/integration/.gitkeep
-- spec/demo/test/performance/browsing_test.rb
-- spec/demo/test/test_helper.rb
-- spec/demo/test/unit/.gitkeep
-- spec/demo/vendor/assets/stylesheets/.gitkeep
-- spec/demo/vendor/plugins/.gitkeep
 - spec/discover.rb
 - spec/spec_helper.rb
+- spec/views/settings_spec.rb
 - vendor/assets/javascripts/TB.min.js
 - vendor/assets/javascripts/jquery.gamequery-0.5.1.js
 - vendor/assets/javascripts/jquery.tools.tooltip.js
@@ -296,28 +244,26 @@ files:
 - vendor/assets/stylesheets/jquery.ui.chatbox.css
 homepage: https://github.com/ging/social_stream/wiki/Getting-Started-With-Social-Stream-Presence
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: social_stream-presence
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Presence capabilities for Social Stream, the core for building social network
   websites.
 test_files: []
-has_rdoc: 

data/app/assets/stylesheets/TresEnRaya.css

@@ -1,57 +0,0 @@
-.tresEnRayaContainerDivClass {
-	border: none;
-	width: 100%;
-	height: 100%;
-}
-
-.tresEnRayaMessageDivClass {
-
-}
-
-.tresEnRayaContainerThemeClassic{
-	border: none;
-	background-image: url('games/ter/classic_board.png');
-	background-size: 100%;
-}
-
-.tresEnRayaContainerThemeModern{
-	border: none;
-	background-image: url('games/ter/modern_board.png');
-	background-size: 100%;
-}
-
-.tresEnRayaMessageThemeClassic {
-
-}
-
-.tresEnRayaMessageThemeModern {
-	background-color: black;
-}
-
-p.tresEnRayaMessagePThemeClassic {
-	text-align: center;
-	font-size: 80%;
-}
-
-p.tresEnRayaMessagePThemeModern {
-	text-align: center;
-	font-size: 80%;
-	color: white;
-}
-
-img.tresEnRayaImgThemeClassic{
-	border: none;
-	position: absolute;
-}
-
-img.tresEnRayaImgThemeModern{
-	border: none;
-	position: absolute;
-}
-
-#myGame{
-	width: 200px;
-	height: 200px;
-	margin-left: 200px;
-	margin-top: 300px;
-}