social_stream 0.12.1 → 0.12.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. data/Rakefile +3 -5
  2. data/base/app/assets/javascripts/social_stream-base.js +1 -0
  3. data/base/app/models/contact.rb +3 -1
  4. data/base/config/routes.rb +14 -4
  5. data/base/lib/social_stream/base/version.rb +1 -1
  6. data/base/vendor/assets/javascripts/jquery.screw.js +188 -0
  7. data/documents/app/assets/javascripts/documents.js.erb +6 -0
  8. data/documents/app/assets/stylesheets/documents.css.scss +5 -0
  9. data/documents/app/controllers/documents_controller.rb +31 -4
  10. data/documents/app/views/common/_headers.html.erb +76 -0
  11. data/documents/app/views/common/_index.html.erb +16 -30
  12. data/documents/config/routes.rb +1 -1
  13. data/documents/lib/social_stream/documents/version.rb +1 -1
  14. data/documents/social_stream-documents.gemspec +1 -1
  15. data/events/db/migrate/20111102145626_add_more_fields_to_events.rb +24 -0
  16. data/events/lib/social_stream/events/version.rb +1 -1
  17. data/events/social_stream-events.gemspec +1 -1
  18. data/lib/social_stream/version.rb +1 -1
  19. data/presence/app/assets/javascripts/store.js +6 -0
  20. data/presence/app/assets/javascripts/{xmpp_client.js → xmpp_client.js.erb} +53 -1
  21. data/presence/app/controllers/xmpp_controller.rb +2 -2
  22. data/presence/app/views/xmpp/_chat.html.erb +22 -36
  23. data/presence/app/views/xmpp/_chat_connecting.html.erb +1 -1
  24. data/presence/app/views/xmpp/_chat_contacts.html.erb +6 -6
  25. data/presence/app/views/xmpp/_chat_off.html.erb +29 -15
  26. data/presence/app/views/xmpp/index.html +0 -1
  27. data/presence/config/locales/en.yml +11 -0
  28. data/presence/config/locales/es.yml +11 -0
  29. data/presence/config/routes.rb +1 -0
  30. data/presence/ejabberd/conf/ssconfig_example.cfg +6 -0
  31. data/presence/ejabberd/ejabberd_scripts/authentication_script +61 -5
  32. data/presence/ejabberd/ejabberd_scripts/emanagement +123 -35
  33. data/presence/ejabberd/mod_sspresence/mod_sspresence.beam +0 -0
  34. data/presence/lib/generators/social_stream/presence/templates/initializer.rb +13 -6
  35. data/presence/lib/social_stream-presence.rb +9 -4
  36. data/presence/lib/social_stream/presence/models/buddy_manager.rb +10 -2
  37. data/presence/lib/social_stream/presence/version.rb +1 -1
  38. data/presence/lib/social_stream/presence/xmpp_server_order.rb +193 -121
  39. data/presence/lib/tasks/presence/synchronize.rake +2 -2
  40. data/presence/social_stream-presence.gemspec +2 -0
  41. data/social_stream.gemspec +3 -3
  42. metadata +19 -15
  43. data/presence/app/views/xmpp/chat.html.erb +0 -13
@@ -7,7 +7,7 @@ namespace :presence do
7
7
  desc "Synchronize user presence"
8
8
  task :connections => :environment do
9
9
  puts "Starting presence:synchronize:connections"
10
- SocialStream::Presence::XmppServerOrder::synchronize_presence
10
+ SocialStream::Presence::XmppServerOrder::synchronizePresence
11
11
  puts "Synchronization complete"
12
12
  end
13
13
 
@@ -15,7 +15,7 @@ namespace :presence do
15
15
  desc "Remove all rosters and populate rosters from Social Stream data."
16
16
  task :rosters => :environment do
17
17
  puts "Starting presence:synchronize:rosters"
18
- SocialStream::Presence::XmppServerOrder::synchronize_rosters
18
+ SocialStream::Presence::XmppServerOrder::synchronizeRosters
19
19
  puts "Rosters Synchronization complete"
20
20
  end
21
21
  end
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
22
22
  s.add_runtime_dependency('social_stream-base','~> 0.9.18')
23
23
 
24
24
  s.add_runtime_dependency "xmpp4r"
25
+
26
+ s.add_runtime_dependency "net-ssh"
25
27
 
26
28
  s.add_development_dependency "ruby-debug19"
27
29
 
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
11
11
  s.files = `git ls-files`.split("\n")
12
12
 
13
13
  # Gem dependencies
14
- s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.4.1')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.0.16')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.9.25')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.4.2')
16
+ s.add_runtime_dependency('social_stream-events', '~> 0.0.17')
17
17
 
18
18
  # Development Gem dependencies
19
19
  #
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream
3
3
  version: !ruby/object:Gem::Version
4
- hash: 45
4
+ hash: 43
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 12
9
- - 1
10
- version: 0.12.1
9
+ - 2
10
+ version: 0.12.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-10-31 00:00:00 +01:00
19
+ date: 2011-11-04 00:00:00 +01:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -27,12 +27,12 @@ dependencies:
27
27
  requirements:
28
28
  - - ~>
29
29
  - !ruby/object:Gem::Version
30
- hash: 11
30
+ hash: 9
31
31
  segments:
32
32
  - 0
33
33
  - 9
34
- - 24
35
- version: 0.9.24
34
+ - 25
35
+ version: 0.9.25
36
36
  type: :runtime
37
37
  version_requirements: *id001
38
38
  - !ruby/object:Gem::Dependency
@@ -43,12 +43,12 @@ dependencies:
43
43
  requirements:
44
44
  - - ~>
45
45
  - !ruby/object:Gem::Version
46
- hash: 13
46
+ hash: 11
47
47
  segments:
48
48
  - 0
49
49
  - 4
50
- - 1
51
- version: 0.4.1
50
+ - 2
51
+ version: 0.4.2
52
52
  type: :runtime
53
53
  version_requirements: *id002
54
54
  - !ruby/object:Gem::Dependency
@@ -59,12 +59,12 @@ dependencies:
59
59
  requirements:
60
60
  - - ~>
61
61
  - !ruby/object:Gem::Version
62
- hash: 63
62
+ hash: 61
63
63
  segments:
64
64
  - 0
65
65
  - 0
66
- - 16
67
- version: 0.0.16
66
+ - 17
67
+ version: 0.0.17
68
68
  type: :runtime
69
69
  version_requirements: *id003
70
70
  - !ruby/object:Gem::Dependency
@@ -782,6 +782,7 @@ files:
782
782
  - base/vendor/assets/javascripts/jquery.fcbkcomplete.js
783
783
  - base/vendor/assets/javascripts/jquery.lightbox-with-resize-plugin.js
784
784
  - base/vendor/assets/javascripts/jquery.livequery.js
785
+ - base/vendor/assets/javascripts/jquery.screw.js
785
786
  - base/vendor/assets/javascripts/jquery.scrollTo.min.js
786
787
  - base/vendor/assets/javascripts/jquery.tipsy.js
787
788
  - base/vendor/assets/javascripts/jquery.validate.js
@@ -883,6 +884,7 @@ files:
883
884
  - documents/app/views/audios/show.html.erb
884
885
  - documents/app/views/common/_document_info.html.erb
885
886
  - documents/app/views/common/_edit_form.html.erb
887
+ - documents/app/views/common/_headers.html.erb
886
888
  - documents/app/views/common/_index.html.erb
887
889
  - documents/app/views/common/_show.html.erb
888
890
  - documents/app/views/documents/_document.html.erb
@@ -1086,6 +1088,7 @@ files:
1086
1088
  - events/config/locales/es.yml
1087
1089
  - events/config/routes.rb
1088
1090
  - events/db/migrate/20110910161707_create_social_stream_events.rb
1091
+ - events/db/migrate/20111102145626_add_more_fields_to_events.rb
1089
1092
  - events/lib/generators/social_stream/events/install_generator.rb
1090
1093
  - events/lib/social_stream-events.rb
1091
1094
  - events/lib/social_stream/events/engine.rb
@@ -1132,7 +1135,7 @@ files:
1132
1135
  - presence/app/assets/javascripts/social_stream-presence.js
1133
1136
  - presence/app/assets/javascripts/store.js
1134
1137
  - presence/app/assets/javascripts/strophe.js
1135
- - presence/app/assets/javascripts/xmpp_client.js
1138
+ - presence/app/assets/javascripts/xmpp_client.js.erb
1136
1139
  - presence/app/assets/stylesheets/chat.css
1137
1140
  - presence/app/assets/stylesheets/jquery.ui.chatbox.css
1138
1141
  - presence/app/assets/stylesheets/social_stream-presence.css
@@ -1143,9 +1146,10 @@ files:
1143
1146
  - presence/app/views/xmpp/_chat_contacts.html.erb
1144
1147
  - presence/app/views/xmpp/_chat_off.html.erb
1145
1148
  - presence/app/views/xmpp/active_users.html.erb
1146
- - presence/app/views/xmpp/chat.html.erb
1147
1149
  - presence/app/views/xmpp/index.html
1148
1150
  - presence/app/views/xmpp/test.html.erb
1151
+ - presence/config/locales/en.yml
1152
+ - presence/config/locales/es.yml
1149
1153
  - presence/config/routes.rb
1150
1154
  - presence/db/migrate/20110711111408_add_connected_column_to_user.rb
1151
1155
  - presence/db/migrate/20110928135031_add_status_column_to_user.rb
@@ -1,13 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
- <html xmlns="http://www.w3.org/1999/xhtml">
3
- <head>
4
- <title>Chat</title>
5
- </head>
6
- <body>
7
- <script type="text/javascript">
8
- sessionStorage.setItem("ss_user_pass","demonstration")
9
- </script>
10
- <%= render :partial => 'xmpp/chat' %>
11
- <p> <a href="/test">Volver</a></p>
12
- </body>
13
- </html>