social_stream 0.22.1 → 0.23.1

data/presence/lib/social_stream/presence/models/buddy_manager.rb

@@ -23,35 +23,41 @@ module SocialStream
             return
           end
 
-          #WEB DOMAIN
-          domain = SocialStream::Presence.domain
-          user_sid = self.sender.slug + "@" + domain
-          user_name =  self.sender.name  
-          buddy_sid = self.receiver.slug + "@" + domain
-          buddy_name =  self.receiver.name
-          site_name = I18n.t('site.name').delete(' ')
-          
-          #Check if is a positive and replied tie         
-          if self.bidirectional?
-            #Execute setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
-            SocialStream::Presence::XmppServerOrder::setRosterForBidirectionalTie(user_sid,buddy_sid,user_name,buddy_name,site_name,site_name)
-          elsif self.positive?
-            #Case: Possitive tie unidirectional
-            #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
-            subscription_type = "from"
-            SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,site_name,subscription_type)
-          else
-            #Negative Tie
+          begin
+            #WEB DOMAIN
+            domain = SocialStream::Presence.domain
+            user_sid = self.sender.slug + "@" + domain
+            user_name =  self.sender.name  
+            buddy_sid = self.receiver.slug + "@" + domain
+            buddy_name =  self.receiver.name
+            site_name = I18n.t('site.name').delete(' ')
             
-            if self.contact.positive_replied?
-              #Bidirectional contacts
-              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
-              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,site_name)
+            #Check if is a positive and replied tie         
+            if self.bidirectional?
+              #Execute setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
+              SocialStream::Presence::XmppServerOrder::setRosterForBidirectionalTie(user_sid,buddy_sid,user_name,buddy_name,site_name,site_name)
+            elsif self.positive?
+              #Case: Possitive tie unidirectional
+              #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
+              subscription_type = "from"
+              SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,site_name,subscription_type)
             else
-              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
+              #Negative Tie
+              
+              if self.contact.positive_replied?
+                #Bidirectional contacts
+                #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
+                SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,site_name)
+              else
+                SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
+              end
+              
+              return  
             end
-            
-            return  
+          
+          rescue Exception => e
+            logger.warn ("WARNING Exeception in Buddy Manager save_buddy: " + e.message)
+            puts ("WARNING Exeception in Buddy Manager save_buddy: " + e.message)
           end
           
         end

data/presence/lib/social_stream/presence/models/group_manager.rb

@@ -19,7 +19,12 @@ module SocialStream
             return
           end 
           
-          SocialStream::Presence::XmppServerOrder::createPersistentRoom(self.slug,SocialStream::Presence.domain)
+          begin
+            SocialStream::Presence::XmppServerOrder::createPersistentRoom(self.slug,SocialStream::Presence.domain)
+          rescue Exception => e
+            logger.warn ("WARNING Exeception in Group Manager create_group_room: " + e.message)
+            puts ("WARNING Exeception in Group Manager create_group_room: " + e.message)
+          end
         end
         
         
@@ -33,7 +38,12 @@ module SocialStream
               return
             end
             
-            SocialStream::Presence::XmppServerOrder::destroyRoom(self.slug,SocialStream::Presence.domain)
+            begin
+              SocialStream::Presence::XmppServerOrder::destroyRoom(self.slug,SocialStream::Presence.domain)
+            rescue Exception => e 
+              logger.warn ("WARNING Exeception in Group Manager remove_group_room: " + e.message)
+              puts ("WARNING Exeception in Group Manager remove_group_room: " + e.message)
+            end
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.8.5"
+    VERSION = "0.10.0"
   end
 end

data/presence/lib/social_stream/presence/xmpp_server_order.rb

@@ -184,7 +184,7 @@ module SocialStream
             groups = Group.all
 
             groups.each do |group|
-              commands << buildCommand("emanagement","createRoom",[group.slug,webDomain])
+              commands << buildCommand("emanagement","createPersistentRoom",[group.slug,webDomain])
             end
             
             executeCommands(commands)
@@ -640,4 +640,4 @@ module SocialStream
       end
     end
   end
-end
+end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/presence/vendor/assets/javascripts/strophe.muc.js

@@ -48,7 +48,7 @@ Strophe.addConnectionPlugin('muc', {
     });
     if (password != null) msg.cnode(Strophe.xmlElement("password", [], password));
     if (this._muc_handler == null) {
-      this._muc_handler = conn.addHandler(function(stanza) {
+      this._muc_handler = this._connection.addHandler(function(stanza) {
         var from, handler, handlers, id, roomname, x, xmlns, xquery, _i, _len;
         from = stanza.getAttribute('from');
         roomname = from.split("/")[0];

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.4')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.11.2')
-  s.add_runtime_dependency('social_stream-events', '~> 0.8.2')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.6.1')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.8.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.11.3')
+  s.add_runtime_dependency('social_stream-events', '~> 0.9.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.7.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.10.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &76895720 !ruby/object:Gem::Requirement
+  requirement: &72068930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.4
+        version: 0.17.0
   type: :runtime
   prerelease: false
-  version_requirements: *76895720
+  version_requirements: *72068930
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &76895340 !ruby/object:Gem::Requirement
+  requirement: &72068670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *76895340
+  version_requirements: *72068670
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &76894830 !ruby/object:Gem::Requirement
+  requirement: &72068430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *76894830
+  version_requirements: *72068430
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &76894500 !ruby/object:Gem::Requirement
+  requirement: &72068200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *76894500
+  version_requirements: *72068200
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &76894170 !ruby/object:Gem::Requirement
+  requirement: &72067970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *76894170
+  version_requirements: *72067970
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76893710 !ruby/object:Gem::Requirement
+  requirement: &72067730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *76893710
+  version_requirements: *72067730
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &76893300 !ruby/object:Gem::Requirement
+  requirement: &72067440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76893300
+  version_requirements: *72067440
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76892780 !ruby/object:Gem::Requirement
+  requirement: &72067070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76892780
+  version_requirements: *72067070
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76892350 !ruby/object:Gem::Requirement
+  requirement: &72066590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *76892350
+  version_requirements: *72066590
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76891780 !ruby/object:Gem::Requirement
+  requirement: &72066220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *76891780
+  version_requirements: *72066220
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &76891290 !ruby/object:Gem::Requirement
+  requirement: &72065320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *76891290
+  version_requirements: *72065320
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &76890690 !ruby/object:Gem::Requirement
+  requirement: &72064900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *76890690
+  version_requirements: *72064900
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -339,6 +339,8 @@ files:
 - base/app/assets/javascripts/search.js.erb
 - base/app/assets/javascripts/settings.js
 - base/app/assets/javascripts/social_stream-base.js
+- base/app/assets/javascripts/social_stream.comments.js
+- base/app/assets/javascripts/social_stream.objects.js
 - base/app/assets/javascripts/social_stream.search.js.erb
 - base/app/assets/javascripts/social_stream.timeline.js
 - base/app/assets/javascripts/social_stream.wall.js.erb
@@ -428,6 +430,7 @@ files:
 - base/app/models/activity.rb
 - base/app/models/activity_object.rb
 - base/app/models/activity_object_activity.rb
+- base/app/models/activity_object_property.rb
 - base/app/models/activity_verb.rb
 - base/app/models/actor.rb
 - base/app/models/audience.rb
@@ -659,6 +662,7 @@ files:
 - base/db/migrate/20120111141717_activity_channels.rb
 - base/db/migrate/20120201185454_singleton_single_relations.rb
 - base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
+- base/db/migrate/20120302215722_activity_object_properties.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
@@ -1004,21 +1008,26 @@ files:
 - events/Gemfile
 - events/README.rdoc
 - events/Rakefile
-- events/app/assets/javascripts/0_init.js
+- events/app/assets/images/poster.png
 - events/app/assets/javascripts/events.js.coffee
 - events/app/assets/javascripts/social_stream-events.js
+- events/app/assets/javascripts/social_stream.events.poster.js
 - events/app/assets/stylesheets/events.css.scss
 - events/app/assets/stylesheets/social_stream-events.css
 - events/app/controllers/events_controller.rb
 - events/app/controllers/rooms_controller.rb
+- events/app/helpers/events_helper.rb
+- events/app/models/activity_object_property/poster.rb
 - events/app/models/event.rb
 - events/app/models/room.rb
 - events/app/views/events/_calendar_month.erb
 - events/app/views/events/_event.html.erb
+- events/app/views/events/_form_poster.html.erb
 - events/app/views/events/_new.html.erb
 - events/app/views/events/_sidebar_calendar.html.erb
 - events/app/views/events/create.js.erb
 - events/app/views/events/destroy.js.erb
+- events/app/views/events/edit.js.erb
 - events/app/views/events/index.html.erb
 - events/app/views/rooms/_form.html.erb
 - events/app/views/rooms/_index.html.erb
@@ -1039,6 +1048,7 @@ files:
 - events/lib/social_stream/events/ability.rb
 - events/lib/social_stream/events/engine.rb
 - events/lib/social_stream/events/models/actor.rb
+- events/lib/social_stream/events/models/document.rb
 - events/lib/social_stream/events/version.rb
 - events/lib/social_stream/migrations/events.rb
 - events/lib/social_stream/toolbar_config/events.rb
@@ -1207,23 +1217,33 @@ files:
 - presence/app/assets/images/emoticons/present.png
 - presence/app/assets/images/emoticons/rain.png
 - presence/app/assets/images/emoticons/sun.png
+- presence/app/assets/images/games/ter/classic_aspa.png
+- presence/app/assets/images/games/ter/classic_board.png
+- presence/app/assets/images/games/ter/classic_circle.png
+- presence/app/assets/images/games/ter/modern_aspa.png
+- presence/app/assets/images/games/ter/modern_board.png
+- presence/app/assets/images/games/ter/modern_circle.png
 - presence/app/assets/images/status/available.png
 - presence/app/assets/images/status/away.png
 - presence/app/assets/images/status/chat.png
 - presence/app/assets/images/status/dnd.png
 - presence/app/assets/images/status/offline.png
-- presence/app/assets/javascripts/chat_audio.js.erb
-- presence/app/assets/javascripts/chat_interface_manager.js.erb
-- presence/app/assets/javascripts/chat_parser.js
-- presence/app/assets/javascripts/chat_persistence.js
-- presence/app/assets/javascripts/chat_utilities.js
-- presence/app/assets/javascripts/chat_window_manager.js
 - presence/app/assets/javascripts/jquery.flexselect.sstreampresence.js
 - presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js
+- presence/app/assets/javascripts/presence.js.erb
+- presence/app/assets/javascripts/presence_XmppClient.js.erb
+- presence/app/assets/javascripts/presence_audio.js.erb
+- presence/app/assets/javascripts/presence_game.js.erb
+- presence/app/assets/javascripts/presence_game_ter.js.erb
+- presence/app/assets/javascripts/presence_notifications.js
+- presence/app/assets/javascripts/presence_parser.js
+- presence/app/assets/javascripts/presence_persistence.js
+- presence/app/assets/javascripts/presence_store.js
+- presence/app/assets/javascripts/presence_uiManager.js.erb
+- presence/app/assets/javascripts/presence_utilities.js
+- presence/app/assets/javascripts/presence_videochat.js.erb
+- presence/app/assets/javascripts/presence_windowManager.js
 - presence/app/assets/javascripts/social_stream-presence.js
-- presence/app/assets/javascripts/store.js
-- presence/app/assets/javascripts/videochat.js.erb
-- presence/app/assets/javascripts/xmpp_client_management.js.erb
 - presence/app/assets/stylesheets/chat.css.scss
 - presence/app/assets/stylesheets/social_stream-presence.css
 - presence/app/controllers/xmpp_controller.rb
@@ -1257,6 +1277,8 @@ files:
 - presence/ejabberd/installer.sh
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.beam
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.erl
+- presence/ejabberd/mod_muc_admin/mod_muc_admin.beam
+- presence/ejabberd/mod_muc_admin/mod_muc_admin.erl
 - presence/ejabberd/mod_sspresence/mod_sspresence.beam
 - presence/ejabberd/mod_sspresence/mod_sspresence.erl
 - presence/lib/OpenTok/Exceptions.rb

data/events/app/assets/javascripts/0_init.js

@@ -1,4 +0,0 @@
-var SocialStream = SocialStream || {};
-SocialStream.Events = SocialStream.Events || {};
-SocialStream.Events.current = SocialStream.Events.current || {};
-