social_stream 0.12.14 → 0.13.0

data/presence/config/routes.rb

@@ -1,8 +1,5 @@
 Rails.application.routes.draw do
-  match "/test" => "Xmpp#index"
-  match "/xmpp4r_test" => "Xmpp#test"
-  match "/active_users" => "Xmpp#active_users"
-  match '/chat' => "Xmpp#chat"
+  #match "/active_users" => "Xmpp#active_users"
   
   match '/xmpp/resetConnection' => "Xmpp#resetConnection"
   match '/xmpp/setConnection' => "Xmpp#setConnection"

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

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.36')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.4.8')
-  s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.5.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.1.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
-  - 14
-  version: 0.12.14
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 +01:00
+date: 2011-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 115
+        hash: 55
         segments: 
         - 0
-        - 9
-        - 36
-        version: 0.9.36
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 11
         segments: 
         - 0
-        - 4
-        - 8
-        version: 0.4.8
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 20
-        version: 0.0.20
+        version: 0.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -661,6 +661,7 @@ files:
 - base/db/migrate/20110712090343_remove_spheres.rb
 - base/db/migrate/20110712142140_remove_permission_function.rb
 - base/db/migrate/20110912074426_add_reject_relation.rb
+- base/db/migrate/20111124100618_object_actors.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
@@ -676,6 +677,7 @@ files:
 - base/lib/social_stream/base/version.rb
 - base/lib/social_stream/controllers/cancan_devise_integration.rb
 - base/lib/social_stream/controllers/helpers.rb
+- base/lib/social_stream/controllers/objects.rb
 - base/lib/social_stream/d3.rb
 - base/lib/social_stream/migrations/base.rb
 - base/lib/social_stream/migrations/components.rb
@@ -874,11 +876,9 @@ files:
 - documents/app/views/audios/_audio_processing.html.erb
 - documents/app/views/audios/_audio_show.html.erb
 - documents/app/views/audios/_audio_with_details.html.erb
-- documents/app/views/audios/_mediapreviews.html.erb
 - documents/app/views/audios/_new.html.erb
 - documents/app/views/audios/destroy.js.erb
 - documents/app/views/audios/index.html.erb
-- documents/app/views/audios/index.js.erb
 - documents/app/views/audios/show.html.erb
 - documents/app/views/common_documents/_document_info.html.erb
 - documents/app/views/common_documents/_edit_form.html.erb
@@ -894,9 +894,7 @@ files:
 - documents/app/views/documents/_new_activity_fields.html.erb
 - documents/app/views/documents/destroy.js.erb
 - documents/app/views/documents/index.html.erb
-- documents/app/views/documents/index.js.erb
 - documents/app/views/documents/show.html.erb
-- documents/app/views/pictures/_mediapreviews.html.erb
 - documents/app/views/pictures/_new.html.erb
 - documents/app/views/pictures/_picture.html.erb
 - documents/app/views/pictures/_picture_focus_search.html.erb
@@ -905,7 +903,6 @@ files:
 - documents/app/views/pictures/_picture_with_details.html.erb
 - documents/app/views/pictures/destroy.js.erb
 - documents/app/views/pictures/index.html.erb
-- documents/app/views/pictures/index.js.erb
 - documents/app/views/pictures/show.html.erb
 - documents/app/views/videos/_new.html.erb
 - documents/app/views/videos/_video.html.erb
@@ -1119,6 +1116,114 @@ files:
 - lib/social_stream/release/global/release.rb
 - lib/social_stream/release/global/version_file.rb
 - lib/social_stream/version.rb
+- linkser/.gitignore
+- linkser/.rspec
+- linkser/Gemfile
+- linkser/MIT-LICENSE
+- linkser/README.rdoc
+- linkser/Rakefile
+- linkser/app/assets/javascripts/linkser.js.erb
+- linkser/app/assets/javascripts/social_stream-linkser.js
+- linkser/app/assets/stylesheets/linkser.css.scss
+- linkser/app/assets/stylesheets/social_stream-linkser.css
+- linkser/config/locales/en.yml
+- linkser/config/locales/es.yml
+- linkser/config/routes.rb
+- linkser/lib/generators/social_stream/linkser/install_generator.rb
+- linkser/lib/social_stream-linkser.rb
+- linkser/lib/social_stream/linkser/engine.rb
+- linkser/lib/social_stream/linkser/version.rb
+- linkser/lib/social_stream/migrations/linkser.rb
+- linkser/social_stream-linkser.gemspec
+- linkser/spec/dummy/Rakefile
+- linkser/spec/dummy/app/controllers/application_controller.rb
+- linkser/spec/dummy/app/helpers/application_helper.rb
+- linkser/spec/dummy/app/views/layouts/application.html.erb
+- linkser/spec/dummy/config.ru
+- linkser/spec/dummy/config/application.rb
+- linkser/spec/dummy/config/boot.rb
+- linkser/spec/dummy/config/database.yml
+- linkser/spec/dummy/config/environment.rb
+- linkser/spec/dummy/config/environments/development.rb
+- linkser/spec/dummy/config/environments/production.rb
+- linkser/spec/dummy/config/environments/test.rb
+- linkser/spec/dummy/config/initializers/backtrace_silencers.rb
+- linkser/spec/dummy/config/initializers/devise.rb
+- linkser/spec/dummy/config/initializers/inflections.rb
+- linkser/spec/dummy/config/initializers/mime_types.rb
+- linkser/spec/dummy/config/initializers/secret_token.rb
+- linkser/spec/dummy/config/initializers/session_store.rb
+- linkser/spec/dummy/config/locales/en.yml
+- linkser/spec/dummy/config/navigation.rb
+- linkser/spec/dummy/config/relations.yml
+- linkser/spec/dummy/config/routes.rb
+- linkser/spec/dummy/db/.gitkeep
+- linkser/spec/dummy/documents/documents/000/000/001/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/002/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/003/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/004/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/005/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/006/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/007/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/008/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/009/original.pdf
+- linkser/spec/dummy/documents/documents/000/000/010/original.pdf
+- linkser/spec/dummy/documents/pictures/000/000/011/original.png
+- linkser/spec/dummy/documents/pictures/000/000/011/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/011/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/012/original.png
+- linkser/spec/dummy/documents/pictures/000/000/012/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/012/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/013/original.png
+- linkser/spec/dummy/documents/pictures/000/000/013/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/013/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/014/original.png
+- linkser/spec/dummy/documents/pictures/000/000/014/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/014/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/015/original.png
+- linkser/spec/dummy/documents/pictures/000/000/015/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/015/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/016/original.png
+- linkser/spec/dummy/documents/pictures/000/000/016/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/016/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/017/original.png
+- linkser/spec/dummy/documents/pictures/000/000/017/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/017/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/018/original.png
+- linkser/spec/dummy/documents/pictures/000/000/018/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/018/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/019/original.png
+- linkser/spec/dummy/documents/pictures/000/000/019/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/019/thumb0.png
+- linkser/spec/dummy/documents/pictures/000/000/020/original.png
+- linkser/spec/dummy/documents/pictures/000/000/020/thumb.png
+- linkser/spec/dummy/documents/pictures/000/000/020/thumb0.png
+- linkser/spec/dummy/public/404.html
+- linkser/spec/dummy/public/422.html
+- linkser/spec/dummy/public/500.html
+- linkser/spec/dummy/public/favicon.ico
+- linkser/spec/dummy/public/javascripts/application.js
+- linkser/spec/dummy/public/javascripts/controls.js
+- linkser/spec/dummy/public/javascripts/dragdrop.js
+- linkser/spec/dummy/public/javascripts/effects.js
+- linkser/spec/dummy/public/javascripts/prototype.js
+- linkser/spec/dummy/public/javascripts/rails.js
+- linkser/spec/dummy/public/stylesheets/.gitkeep
+- linkser/spec/dummy/script/rails
+- linkser/spec/integration/navigation_spec.rb
+- linkser/spec/socialstream_linkser_spec.rb
+- linkser/spec/spec_helper.rb
+- linkser/spec/support/cancan.rb
+- linkser/spec/support/db.rb
+- linkser/spec/support/devise.rb
+- linkser/spec/support/mock.rb
+- linkser/vendor/assets/javascripts/jquery.jplayer.js
+- linkser/vendor/assets/stylesheets/jplayer.blue.monday.css
+- linkser/vendor/assets/stylesheets/jplayer.blue.monday.jpg
+- linkser/vendor/assets/stylesheets/jplayer.blue.monday.video.play.hover.png
+- linkser/vendor/assets/stylesheets/jplayer.blue.monday.video.play.png
+- linkser/vendor/assets/stylesheets/jquery.lightbox.css
+- linkser/vendor/assets/stylesheets/pbar-ani.gif
 - presence/.gitignore
 - presence/Gemfile
 - presence/Rakefile
@@ -1138,6 +1243,7 @@ files:
 - presence/app/assets/images/status/available.png
 - presence/app/assets/images/status/away.png
 - presence/app/assets/images/status/dnd.png
+- presence/app/assets/images/status/offline.png
 - presence/app/assets/javascripts/chat_audio.js
 - presence/app/assets/javascripts/chat_interface_manager.js.erb
 - presence/app/assets/javascripts/chat_parser.js
@@ -1156,8 +1262,6 @@ files:
 - presence/app/views/chat/_off.html.erb
 - presence/app/views/chat/_settings.html.erb
 - presence/app/views/xmpp/active_users.html.erb
-- presence/app/views/xmpp/index.html
-- presence/app/views/xmpp/test.html.erb
 - presence/config/locales/en.yml
 - presence/config/locales/es.yml
 - presence/config/routes.rb

data/documents/app/views/audios/index.js.erb

@@ -1 +0,0 @@
-$('#media_wall').html("<%= escape_javascript(render :partial =>"audios/mediapreviews") %>");

data/documents/app/views/documents/index.js.erb

@@ -1 +0,0 @@
-$('#media_wall').html("<%= escape_javascript(render :partial =>"documents/mediapreviews") %>");

data/documents/app/views/pictures/_mediapreviews.html.erb

@@ -1,8 +0,0 @@
-<% @document_activities.each do |a| %>
-	<% document = a.activity_objects.first.document %>
-	<div class="media_preview picture">
-		<img src="<%= link_for_wall(document) %>" class="media_preview_image" />
-		<div class="media_preview_title"><%= document.file_file_name %></div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-<% end %>

data/documents/app/views/pictures/index.js.erb

@@ -1 +0,0 @@
-$('#media_wall').html("<%= escape_javascript(render :partial =>"pictures/mediapreviews") %>");

data/presence/app/views/xmpp/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Ruby on Rails: Welcome aboard</title>
-    <script type="text/javascript">
-
-    </script>
-  </head>
-  <body>
-    <div id="page">
-      <p> Hello World </p>
-			
-			<p> <a href="/xmpp4r_test">Test</a></p>
-			<p> <a href="/active_users">Usuarios conectados al servidor XMPP</a></p>
-			
-    </div>
-  </body>
-</html>

data/presence/app/views/xmpp/test.html.erb

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Demo2</title>
-</head>
-<body>
-
-<p> <a href="/test">Volver</a></p>
-
-</body>
-</html>