social_stream 0.26.1 → 0.26.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 (37) hide show
  1. data/README.rdoc +10 -0
  2. data/base/lib/social_stream/base/version.rb +1 -1
  3. data/base/social_stream-base.gemspec +1 -1
  4. data/lib/social_stream/release/component.rb +5 -0
  5. data/lib/social_stream/release/global.rb +8 -7
  6. data/lib/social_stream/release/kernel.rb +24 -0
  7. data/lib/social_stream/version.rb +1 -1
  8. data/presence/app/assets/javascripts/jquery.flexselect.sstreampresence.js +2 -2
  9. data/presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js +5 -5
  10. data/presence/app/assets/javascripts/presence.js.erb +6 -4
  11. data/presence/app/assets/javascripts/presence_XmppClient.js.erb +1146 -996
  12. data/presence/app/assets/javascripts/presence_audio.js.erb +74 -60
  13. data/presence/app/assets/javascripts/presence_game.js.erb +35 -22
  14. data/presence/app/assets/javascripts/presence_game_comunication.js.erb +22 -5
  15. data/presence/app/assets/javascripts/presence_game_factory.js.erb +1 -1
  16. data/presence/app/assets/javascripts/presence_game_interface.js.erb +33 -13
  17. data/presence/app/assets/javascripts/presence_notifications.js +206 -183
  18. data/presence/app/assets/javascripts/presence_parser.js +265 -247
  19. data/presence/app/assets/javascripts/presence_persistence.js +199 -188
  20. data/presence/app/assets/javascripts/presence_store.js +22 -11
  21. data/presence/app/assets/javascripts/presence_uiManager.js.erb +553 -530
  22. data/presence/app/assets/javascripts/presence_utilities.js +244 -219
  23. data/presence/app/assets/javascripts/presence_videochat.js.erb +436 -409
  24. data/presence/app/assets/javascripts/presence_windowManager.js +586 -532
  25. data/presence/app/views/chat/_index.html.erb +7 -13
  26. data/presence/config/locales/en.yml +2 -1
  27. data/presence/config/locales/es.yml +2 -1
  28. data/presence/ejabberd/ejabberd_files.zip +0 -0
  29. data/presence/ejabberd/ejabberd_scripts/authentication_script +9 -2
  30. data/presence/ejabberd/mod_sspresence/mod_sspresence.beam +0 -0
  31. data/presence/lib/generators/social_stream/presence/templates/initializer.rb +4 -0
  32. data/presence/lib/social_stream-presence.rb +3 -0
  33. data/presence/lib/social_stream/presence/version.rb +1 -1
  34. data/presence/lib/social_stream/presence/xmpp_server_order.rb +1 -0
  35. data/release.thor +33 -13
  36. data/social_stream.gemspec +2 -2
  37. metadata +90 -29
@@ -82,25 +82,19 @@
82
82
  var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
83
83
  var user_name = '<%=current_user.name%>';
84
84
  var user_slug = '<%=current_user.slug%>';
85
- var user_jid = '<%=current_user.slug%>'+"@"+domain;
85
+ var user_jid = PRESENCE.XMPPClient.getJidFromSlug('<%=current_user.slug%>');
86
86
 
87
87
 
88
-
89
88
  $(document).ready(function () {
90
89
 
91
90
  //Inicial field
92
91
  $("#chat_partial").html($("#chat_connecting").html())
93
92
 
94
- if(getRestoreUserChatStatus()!="offline"){
95
- if (authByCookie()){
96
- connectToChat(user_jid,cookie,null);
97
- } else {
98
- //Auth by password
99
- connectToChat(user_jid,null,null);
100
- }
101
- initialTimer = setTimeout("updateChatWindow()", 10000);
93
+ if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
94
+ PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
95
+ initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
102
96
  } else {
103
- updateChatWindow();
97
+ PRESENCE.UIMANAGER.updateChatWindow();
104
98
  }
105
99
 
106
100
  PRESENCE.CORE.init();
@@ -111,8 +105,8 @@
111
105
  <% if defined?(flow)!=nil and flow %>
112
106
  <script type="text/javascript">
113
107
  $(document).ready(function () {
114
- createMainChatBox();
115
- addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
108
+ PRESENCE.WINDOW.createMainChatBox();
109
+ PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
116
110
  $("#chat_wrapper").find("#chat_partial").remove();
117
111
  });
118
112
  </script>
@@ -63,4 +63,5 @@ en:
63
63
  cancel: "{{name}} cancel the invitation"
64
64
  finish: "{{name}} close the game"
65
65
  waiting: Waiting for response...
66
- unknown: Unknown response
66
+ unknown: Unknown response
67
+ clientIssue: "{{name}}'s client not support games"
@@ -63,4 +63,5 @@ es:
63
63
  cancel: "{{name}} canceló la partida"
64
64
  finish: "{{name}} ha cerrado el juego"
65
65
  waiting: Esperando respuesta...
66
- unknown: Respuesta desconocida
66
+ unknown: Respuesta desconocida
67
+ clientIssue: "El cliente de {{name}} no tiene juegos"
Binary file
@@ -32,6 +32,13 @@ def getOption(option)
32
32
  end
33
33
 
34
34
  $cookie_name = getOption("cookie_name=")
35
+ $force_ssl = getOption("force_ssl=")
36
+
37
+ if $force_ssl=="true"
38
+ $http="https"
39
+ else
40
+ $http="http"
41
+ end
35
42
 
36
43
 
37
44
  def auth(username,domain,password)
@@ -44,7 +51,7 @@ def auth(username,domain,password)
44
51
  # return true
45
52
  #end
46
53
 
47
- accessByPasswordUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
54
+ accessByPasswordUrl = $http + "://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
48
55
 
49
56
  begin
50
57
  response = RestClient.post accessByPasswordUrl, :user => { :email => username , :password => password }
@@ -70,7 +77,7 @@ end
70
77
 
71
78
  def authByCookie(username, domain, cookie)
72
79
  begin
73
- accessByCookieUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/api/me"
80
+ accessByCookieUrl = $http + "://" + getWebDomainUrlFromDomain(domain) + "/api/me"
74
81
  response = RestClient.get accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
75
82
  doc = REXML::Document.new(response.body)
76
83
 
@@ -36,5 +36,9 @@ SocialStream::Presence.setup do |config|
36
36
  #config.opentok_api_key = ""
37
37
  #Replace with your OpenTok API secret.
38
38
  #config.opentok_api_secret = ""
39
+
40
+ #Multiplayer Games Service
41
+ #Uncomment to enable Multiplayer Games Service
42
+ #config.games = true
39
43
 
40
44
  end
@@ -40,6 +40,8 @@ module SocialStream
40
40
 
41
41
  mattr_accessor :opentok_api_key
42
42
  mattr_accessor :opentok_api_secret
43
+
44
+ mattr_accessor :games
43
45
 
44
46
  @@auth_method = "cookie"
45
47
  @@remote_xmpp_server = false
@@ -47,6 +49,7 @@ module SocialStream
47
49
  @@enable = false
48
50
  @@social_stream_presence_username = "social_stream_presence"
49
51
  @@opentok_api_key = "default"
52
+ @@games = false
50
53
 
51
54
  class << self
52
55
  def setup
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Presence
3
- VERSION = "0.13.1"
3
+ VERSION = "0.13.3"
4
4
  end
5
5
  end
@@ -269,6 +269,7 @@ module SocialStream
269
269
  autoconf.push("secure_rest_api=" + SocialStream::Presence.secure_rest_api.to_s)
270
270
  autoconf.push("cookie_name=" + Rails.application.config.session_options[:key])
271
271
  autoconf.push("web_domains=[" + SocialStream::Presence.domain + "]")
272
+ autoconf.push("force_ssl=" + Rails.application.config.force_ssl.to_s())
272
273
 
273
274
  #Param options
274
275
  if options
data/release.thor CHANGED
@@ -5,46 +5,66 @@ class Release < Thor
5
5
 
6
6
  default_task :bump_and_publish
7
7
 
8
- method_option :test => false,
9
- :desc => "Do nothing",
10
- :aliases => "-t"
11
-
12
8
  desc "bump_and_publish", "Bump gem versions and release them"
9
+
10
+ method_options :test => false
11
+
13
12
  def bump_and_publish(*args)
14
13
  bump *args
15
14
  publish *args
16
15
  end
17
16
 
18
17
  desc "bump", "Bump gem versions and set SocialStream's dependencies"
18
+
19
+ method_options :test => false
20
+
19
21
  def bump(*args)
20
22
  # First of all, update gems
21
23
  system "bundle"
22
24
 
23
- parse_args(args)
25
+ parse_args_and_opts(args)
24
26
 
25
27
  all.each(&:bump)
26
28
 
27
- system("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }") ||
28
- raise(RuntimeError.new)
29
+ release_cmd("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }")
29
30
  end
30
31
 
31
32
  desc "publish", "push SocialStream's gems to rubygems and create git tags"
33
+
34
+ method_options :test => false
35
+
32
36
  def publish(*args)
33
- parse_args(args)
37
+ parse_args_and_opts(args)
34
38
 
35
39
  all.each(&:publish)
36
40
  end
37
41
 
38
42
  private
39
43
 
40
- def parse_args(args)
41
- if args.empty?
42
- args = global_dependencies
44
+ def parse_args_and_opts(args)
45
+ if options[:test]
46
+ SocialStream::Release::Kernel.release_action = :test
43
47
  end
44
48
 
49
+ releases =
50
+ if args.empty?
51
+ # base documents events ...
52
+ global_dependencies.select{ |c|
53
+ ::SocialStream::Release::Component.new(c).dirty?
54
+ }
55
+ elsif args.size == 1 && [ "major", "minor" ].include?(args.first)
56
+ # base:minor documents:minor ... minor
57
+ global_dependencies.map{ |c|
58
+ "#{ c }:#{ args.first }"
59
+ } + args
60
+ else
61
+ # custom
62
+ args
63
+ end
64
+
45
65
  @components = []
46
66
 
47
- args.each do |a|
67
+ releases.each do |a|
48
68
  name, version = a.split(":")
49
69
 
50
70
  if global_dependencies.include?(name)
@@ -54,7 +74,7 @@ class Release < Thor
54
74
  end
55
75
  end
56
76
 
57
- @global = ::SocialStream::Release::Global.new(@target, options)
77
+ @global = ::SocialStream::Release::Global.new(@target)
58
78
  end
59
79
 
60
80
  def global_dependencies
@@ -11,11 +11,11 @@ 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.20.1')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.20.2')
15
15
  s.add_runtime_dependency('social_stream-documents', '~> 0.14.1')
16
16
  s.add_runtime_dependency('social_stream-events', '~> 0.12.1')
17
17
  s.add_runtime_dependency('social_stream-linkser', '~> 0.11.1')
18
- s.add_runtime_dependency('social_stream-presence', '~> 0.13.1')
18
+ s.add_runtime_dependency('social_stream-presence', '~> 0.13.3')
19
19
 
20
20
  # Development Gem dependencies
21
21
  #
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.1
4
+ version: 0.26.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,22 +10,27 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-05-11 00:00:00.000000000 Z
13
+ date: 2012-05-17 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &70220240 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.20.1
22
+ version: 0.20.2
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70220240
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ~>
29
+ - !ruby/object:Gem::Version
30
+ version: 0.20.2
26
31
  - !ruby/object:Gem::Dependency
27
32
  name: social_stream-documents
28
- requirement: &70219960 !ruby/object:Gem::Requirement
33
+ requirement: !ruby/object:Gem::Requirement
29
34
  none: false
30
35
  requirements:
31
36
  - - ~>
@@ -33,10 +38,15 @@ dependencies:
33
38
  version: 0.14.1
34
39
  type: :runtime
35
40
  prerelease: false
36
- version_requirements: *70219960
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ~>
45
+ - !ruby/object:Gem::Version
46
+ version: 0.14.1
37
47
  - !ruby/object:Gem::Dependency
38
48
  name: social_stream-events
39
- requirement: &70219710 !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
40
50
  none: false
41
51
  requirements:
42
52
  - - ~>
@@ -44,10 +54,15 @@ dependencies:
44
54
  version: 0.12.1
45
55
  type: :runtime
46
56
  prerelease: false
47
- version_requirements: *70219710
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ~>
61
+ - !ruby/object:Gem::Version
62
+ version: 0.12.1
48
63
  - !ruby/object:Gem::Dependency
49
64
  name: social_stream-linkser
50
- requirement: &70219440 !ruby/object:Gem::Requirement
65
+ requirement: !ruby/object:Gem::Requirement
51
66
  none: false
52
67
  requirements:
53
68
  - - ~>
@@ -55,21 +70,31 @@ dependencies:
55
70
  version: 0.11.1
56
71
  type: :runtime
57
72
  prerelease: false
58
- version_requirements: *70219440
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ~>
77
+ - !ruby/object:Gem::Version
78
+ version: 0.11.1
59
79
  - !ruby/object:Gem::Dependency
60
80
  name: social_stream-presence
61
- requirement: &70219180 !ruby/object:Gem::Requirement
81
+ requirement: !ruby/object:Gem::Requirement
62
82
  none: false
63
83
  requirements:
64
84
  - - ~>
65
85
  - !ruby/object:Gem::Version
66
- version: 0.13.1
86
+ version: 0.13.3
67
87
  type: :runtime
68
88
  prerelease: false
69
- version_requirements: *70219180
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ~>
93
+ - !ruby/object:Gem::Version
94
+ version: 0.13.3
70
95
  - !ruby/object:Gem::Dependency
71
96
  name: capybara
72
- requirement: &70218920 !ruby/object:Gem::Requirement
97
+ requirement: !ruby/object:Gem::Requirement
73
98
  none: false
74
99
  requirements:
75
100
  - - ~>
@@ -77,10 +102,15 @@ dependencies:
77
102
  version: 0.3.9
78
103
  type: :development
79
104
  prerelease: false
80
- version_requirements: *70218920
105
+ version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
107
+ requirements:
108
+ - - ~>
109
+ - !ruby/object:Gem::Version
110
+ version: 0.3.9
81
111
  - !ruby/object:Gem::Dependency
82
112
  name: sqlite3
83
- requirement: &70218710 !ruby/object:Gem::Requirement
113
+ requirement: !ruby/object:Gem::Requirement
84
114
  none: false
85
115
  requirements:
86
116
  - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
88
118
  version: '0'
89
119
  type: :development
90
120
  prerelease: false
91
- version_requirements: *70218710
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ! '>='
125
+ - !ruby/object:Gem::Version
126
+ version: '0'
92
127
  - !ruby/object:Gem::Dependency
93
128
  name: debugger
94
- requirement: &70218430 !ruby/object:Gem::Requirement
129
+ requirement: !ruby/object:Gem::Requirement
95
130
  none: false
96
131
  requirements:
97
132
  - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
99
134
  version: '0'
100
135
  type: :development
101
136
  prerelease: false
102
- version_requirements: *70218430
137
+ version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ! '>='
141
+ - !ruby/object:Gem::Version
142
+ version: '0'
103
143
  - !ruby/object:Gem::Dependency
104
144
  name: rspec-rails
105
- requirement: &70218160 !ruby/object:Gem::Requirement
145
+ requirement: !ruby/object:Gem::Requirement
106
146
  none: false
107
147
  requirements:
108
148
  - - ~>
@@ -110,10 +150,15 @@ dependencies:
110
150
  version: 2.8.0
111
151
  type: :development
112
152
  prerelease: false
113
- version_requirements: *70218160
153
+ version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
155
+ requirements:
156
+ - - ~>
157
+ - !ruby/object:Gem::Version
158
+ version: 2.8.0
114
159
  - !ruby/object:Gem::Dependency
115
160
  name: factory_girl
116
- requirement: &70217820 !ruby/object:Gem::Requirement
161
+ requirement: !ruby/object:Gem::Requirement
117
162
  none: false
118
163
  requirements:
119
164
  - - ~>
@@ -121,10 +166,15 @@ dependencies:
121
166
  version: 1.3.2
122
167
  type: :development
123
168
  prerelease: false
124
- version_requirements: *70217820
169
+ version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
171
+ requirements:
172
+ - - ~>
173
+ - !ruby/object:Gem::Version
174
+ version: 1.3.2
125
175
  - !ruby/object:Gem::Dependency
126
176
  name: forgery
127
- requirement: &70216950 !ruby/object:Gem::Requirement
177
+ requirement: !ruby/object:Gem::Requirement
128
178
  none: false
129
179
  requirements:
130
180
  - - ~>
@@ -132,10 +182,15 @@ dependencies:
132
182
  version: 0.4.2
133
183
  type: :development
134
184
  prerelease: false
135
- version_requirements: *70216950
185
+ version_requirements: !ruby/object:Gem::Requirement
186
+ none: false
187
+ requirements:
188
+ - - ~>
189
+ - !ruby/object:Gem::Version
190
+ version: 0.4.2
136
191
  - !ruby/object:Gem::Dependency
137
192
  name: ci_reporter
138
- requirement: &70216340 !ruby/object:Gem::Requirement
193
+ requirement: !ruby/object:Gem::Requirement
139
194
  none: false
140
195
  requirements:
141
196
  - - ~>
@@ -143,7 +198,12 @@ dependencies:
143
198
  version: 1.6.4
144
199
  type: :development
145
200
  prerelease: false
146
- version_requirements: *70216340
201
+ version_requirements: !ruby/object:Gem::Requirement
202
+ none: false
203
+ requirements:
204
+ - - ~>
205
+ - !ruby/object:Gem::Version
206
+ version: 1.6.4
147
207
  description: Social Stream is a Ruby on Rails engine for building social network websites.
148
208
  It supports contacts, posts, file uploads, private messages and many more.
149
209
  email:
@@ -1145,6 +1205,7 @@ files:
1145
1205
  - lib/social_stream/release/dependency_update.rb
1146
1206
  - lib/social_stream/release/global.rb
1147
1207
  - lib/social_stream/release/global/version_file.rb
1208
+ - lib/social_stream/release/kernel.rb
1148
1209
  - lib/social_stream/version.rb
1149
1210
  - lib/tasks/migrations.rake
1150
1211
  - linkser/.gitignore
@@ -1537,7 +1598,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1537
1598
  version: '0'
1538
1599
  requirements: []
1539
1600
  rubyforge_project:
1540
- rubygems_version: 1.8.15
1601
+ rubygems_version: 1.8.24
1541
1602
  signing_key:
1542
1603
  specification_version: 3
1543
1604
  summary: A core for building social network websites