social_stream 0.21.4 → 0.22.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (56) hide show
  1. data/README.rdoc +11 -5
  2. data/base/app/assets/stylesheets/cheesecake.css.scss +1 -0
  3. data/base/app/views/cheesecake/_cheesecake.html.erb +3 -0
  4. data/base/app/views/cheesecake/_index.html.erb +88 -41
  5. data/base/app/views/cheesecake/_sector_form.html.erb +12 -12
  6. data/base/lib/social_stream/base/version.rb +1 -1
  7. data/base/lib/social_stream/test_helpers/controllers.rb +19 -2
  8. data/base/lib/tasks/db/populate.rake +190 -165
  9. data/base/social_stream-base.gemspec +1 -1
  10. data/base/spec/controllers/posts_controller_spec.rb +19 -1
  11. data/lib/social_stream/version.rb +1 -1
  12. data/presence/app/assets/images/status/chat.png +0 -0
  13. data/presence/app/assets/javascripts/chat_interface_manager.js.erb +42 -45
  14. data/presence/app/assets/javascripts/chat_parser.js +5 -5
  15. data/presence/app/assets/javascripts/chat_persistence.js +25 -26
  16. data/presence/app/assets/javascripts/chat_utilities.js +15 -11
  17. data/presence/app/assets/javascripts/chat_window_manager.js +129 -26
  18. data/presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js +22 -3
  19. data/presence/app/assets/javascripts/social_stream-presence.js +1 -0
  20. data/presence/app/assets/javascripts/videochat.js.erb +459 -0
  21. data/presence/app/assets/javascripts/xmpp_client_management.js.erb +303 -65
  22. data/presence/app/assets/stylesheets/chat.css.scss +42 -1
  23. data/presence/app/controllers/xmpp_controller.rb +20 -3
  24. data/presence/app/views/chat/_index.html.erb +7 -2
  25. data/presence/app/views/xmpp/getOpenTokSessionIDAndToken.xml.builder +6 -0
  26. data/presence/config/locales/en.yml +22 -1
  27. data/presence/config/locales/es.yml +23 -2
  28. data/presence/config/routes.rb +2 -0
  29. data/presence/ejabberd/conf/ssconfig_example.cfg +4 -3
  30. data/presence/ejabberd/ejabberd_files.zip +0 -0
  31. data/presence/ejabberd/ejabberd_scripts/authentication_script +22 -12
  32. data/presence/ejabberd/ejabberd_scripts/development_scripts/show_config.sh +9 -10
  33. data/presence/ejabberd/ejabberd_scripts/emanagement +275 -178
  34. data/presence/ejabberd/ejabberd_scripts/manageWebDomains +164 -0
  35. data/presence/ejabberd/ejabberd_scripts/rest_api_client_script +75 -32
  36. data/presence/ejabberd/ejabberd_scripts/synchronize_presence_script +81 -34
  37. data/presence/ejabberd/mod_sspresence/mod_sspresence.beam +0 -0
  38. data/presence/ejabberd/mod_sspresence/mod_sspresence.erl +27 -23
  39. data/presence/lib/OpenTok/Exceptions.rb +11 -0
  40. data/presence/lib/OpenTok/OpenTokSDK.rb +184 -0
  41. data/presence/lib/OpenTok/Session.rb +27 -0
  42. data/presence/lib/generators/social_stream/presence/templates/initializer.rb +8 -2
  43. data/presence/lib/open_tok.rb +31 -0
  44. data/presence/lib/opentok.rb +29 -0
  45. data/presence/lib/social_stream-presence.rb +4 -0
  46. data/presence/lib/social_stream/presence/models/buddy_manager.rb +1 -1
  47. data/presence/lib/social_stream/presence/version.rb +1 -1
  48. data/presence/lib/social_stream/presence/xmpp_server_order.rb +96 -76
  49. data/presence/lib/social_stream/presence/xmpp_ssclient.rb +54 -0
  50. data/presence/lib/tasks/presence/multidomain.rake +45 -0
  51. data/presence/lib/tasks/presence/synchronize.rake +18 -4
  52. data/presence/vendor/assets/javascripts/TB.min.js +4329 -0
  53. data/social_stream.gemspec +2 -2
  54. metadata +40 -30
  55. data/presence/ejabberd/ejabberd_scripts/reset_connection_script +0 -300
  56. data/presence/ejabberd/ejabberd_scripts/set_script_header.sh +0 -112
@@ -1,112 +0,0 @@
1
- #!/bin/bash
2
- #Script header edition
3
- #@author Aldo
4
-
5
- #Constants
6
- installer_file_path=$(readlink -f $0)
7
- installer_folder_path=`dirname "$installer_file_path"`
8
-
9
-
10
- #Functions
11
-
12
-
13
- msg () {
14
- echo "#################################"
15
- echo $1
16
- }
17
-
18
-
19
- #Main Program
20
-
21
- msg "Starting set scripts header"
22
-
23
- echo "Installer path:" $installer_file_path
24
-
25
-
26
- #Look for params
27
-
28
- msg "Detecting ruby enviroment"
29
-
30
- if [ $1 ]
31
- then {
32
- echo "Ruby enviromet specified by param"
33
- ruby_env=$1
34
- } else {
35
- ruby_env=`which ruby`
36
- }
37
- fi
38
-
39
- echo "Ruby enviroment:" $ruby_env
40
-
41
-
42
- msg "Writing scripts header"
43
- echo ""
44
- for file in `ls $installer_folder_path/` ; do
45
-
46
-
47
- if [ ! -f $installer_folder_path/$file ];
48
- then
49
- continue
50
- fi
51
-
52
- if [[ $file =~ .sh$ ]]
53
- then
54
- continue
55
- fi
56
-
57
- if [ $installer_folder_path/$file == $installer_file_path ];
58
- then
59
- continue
60
- fi
61
-
62
-
63
- printf $file"\n"
64
-
65
- #Create temporal file
66
- temporal_path=$installer_folder_path/$file"_temp"
67
-
68
- if [ -f $temporal_path ];
69
- then
70
- echo "File $temporal_path exists."
71
- rm $temporal_path
72
- fi
73
-
74
- touch $temporal_path
75
-
76
- #Read file
77
- file_path=$installer_folder_path/$file
78
-
79
- SAVEIFS=$IFS
80
- IFS=$(echo -en "\n\b")
81
-
82
- while read line
83
- do
84
- #Look for Pattern !/usr/bin/env ruby
85
- if [[ $line =~ ^#!/usr/bin/env ]]
86
- then
87
- scriptheader="#!/usr/bin/env"
88
- line="${scriptheader} ${ruby_env}"
89
- fi
90
- echo $line >> $temporal_path
91
- done < $file_path
92
-
93
- IFS=$SAVEIFS
94
-
95
- #Replace original file
96
- cp $temporal_path $file_path
97
-
98
- #Remove temporal file
99
- rm $temporal_path
100
-
101
- done
102
-
103
-
104
- msg "Complete"
105
- exit 0
106
-
107
-
108
-
109
-
110
-
111
-
112
-