social_stream-base 0.18.1 → 0.19.0

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 (41) hide show
  1. data/app/assets/javascripts/social_stream.action.js +40 -0
  2. data/app/assets/javascripts/social_stream.comments.js +26 -1
  3. data/app/assets/javascripts/social_stream.timeline.js +15 -7
  4. data/app/assets/javascripts/social_stream.wall.js.erb +1 -0
  5. data/app/assets/stylesheets/social_stream-base.css.scss +13 -0
  6. data/app/models/activity.rb +5 -1
  7. data/app/models/activity_action.rb +6 -0
  8. data/app/models/activity_object.rb +131 -9
  9. data/app/models/actor.rb +2 -0
  10. data/app/models/channel.rb +0 -1
  11. data/app/models/comment.rb +0 -6
  12. data/app/views/activity_actions/_update.js.erb +11 -0
  13. data/app/views/activity_actions/create.js.erb +1 -1
  14. data/app/views/activity_actions/update.js.erb +1 -1
  15. data/app/views/comments/create.js.erb +1 -1
  16. data/app/views/posts/create.js.erb +1 -1
  17. data/db/migrate/20120111141717_create_social_stream.rb +265 -0
  18. data/db/migrate/20120326083509_object_channels_to_actions.rb +45 -0
  19. data/lib/social_stream/ability/base.rb +2 -2
  20. data/lib/social_stream/base/version.rb +1 -1
  21. data/lib/social_stream/controllers/cancan_devise_integration.rb +9 -5
  22. data/lib/social_stream/models/object.rb +0 -72
  23. data/lib/social_stream/models/subject.rb +2 -1
  24. data/lib/social_stream/models/subtype.rb +6 -1
  25. data/spec/controllers/groups_controller_spec.rb +6 -0
  26. data/spec/factories/post.rb +6 -0
  27. data/spec/models/activity_action_spec.rb +35 -0
  28. metadata +69 -77
  29. data/app/assets/stylesheets/social_stream-base.css +0 -5
  30. data/app/views/activity_actions/_update_form.js.erb +0 -2
  31. data/db/migrate/20110610112023_create_social_stream.rb +0 -319
  32. data/db/migrate/20110705103202_empty_ties_count.rb +0 -17
  33. data/db/migrate/20110712090343_remove_spheres.rb +0 -30
  34. data/db/migrate/20110712142140_remove_permission_function.rb +0 -26
  35. data/db/migrate/20110912074426_add_reject_relation.rb +0 -29
  36. data/db/migrate/20111124100618_object_actors.rb +0 -52
  37. data/db/migrate/20111221103509_add_language_field.rb +0 -13
  38. data/db/migrate/20120103103125_add_channels.rb +0 -88
  39. data/db/migrate/20120109081509_update_notify_permissions.rb +0 -15
  40. data/db/migrate/20120111120920_remove_language_default.rb +0 -9
  41. data/db/migrate/20120111141717_activity_channels.rb +0 -74
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-base
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.1
4
+ version: 0.19.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-03-27 00:00:00.000000000Z
13
+ date: 2012-04-02 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &81105280 !ruby/object:Gem::Requirement
17
+ requirement: &86758160 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.1.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *81105280
25
+ version_requirements: *86758160
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &81167130 !ruby/object:Gem::Requirement
28
+ requirement: &86757430 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 1.2.3
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *81167130
36
+ version_requirements: *86757430
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &81178110 !ruby/object:Gem::Requirement
39
+ requirement: &86757050 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 1.1.1
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *81178110
47
+ version_requirements: *86757050
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &81180870 !ruby/object:Gem::Requirement
50
+ requirement: &86756810 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 1.5.3
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *81180870
58
+ version_requirements: *86756810
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &81182840 !ruby/object:Gem::Requirement
61
+ requirement: &86756490 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 1.3.0
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *81182840
69
+ version_requirements: *86756490
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &81188880 !ruby/object:Gem::Requirement
72
+ requirement: &86756120 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 1.3.0
78
78
  type: :runtime
79
79
  prerelease: false
80
- version_requirements: *81188880
80
+ version_requirements: *86756120
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &81979870 !ruby/object:Gem::Requirement
83
+ requirement: &86755770 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: 0.2.5
89
89
  type: :runtime
90
90
  prerelease: false
91
- version_requirements: *81979870
91
+ version_requirements: *86755770
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &82713330 !ruby/object:Gem::Requirement
94
+ requirement: &86755180 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: 1.0.9
100
100
  type: :runtime
101
101
  prerelease: false
102
- version_requirements: *82713330
102
+ version_requirements: *86755180
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &84565720 !ruby/object:Gem::Requirement
105
+ requirement: &86754850 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: 1.6.4
111
111
  type: :runtime
112
112
  prerelease: false
113
- version_requirements: *84565720
113
+ version_requirements: *86754850
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &84705070 !ruby/object:Gem::Requirement
116
+ requirement: &86742010 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: 0.13.0
122
122
  type: :runtime
123
123
  prerelease: false
124
- version_requirements: *84705070
124
+ version_requirements: *86742010
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &84862990 !ruby/object:Gem::Requirement
127
+ requirement: &86741350 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ~>
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: 1.0.2
133
133
  type: :runtime
134
134
  prerelease: false
135
- version_requirements: *84862990
135
+ version_requirements: *86741350
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: omniauth-facebook
138
- requirement: &84980530 !ruby/object:Gem::Requirement
138
+ requirement: &86740750 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ~>
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: 1.2.0
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *84980530
146
+ version_requirements: *86740750
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: omniauth-linkedin
149
- requirement: &85091480 !ruby/object:Gem::Requirement
149
+ requirement: &86740230 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ~>
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: 0.0.6
155
155
  type: :runtime
156
156
  prerelease: false
157
- version_requirements: *85091480
157
+ version_requirements: *86740230
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: mailboxer
160
- requirement: &85213850 !ruby/object:Gem::Requirement
160
+ requirement: &86739800 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ~>
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: 0.6.5
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *85213850
168
+ version_requirements: *86739800
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: acts-as-taggable-on
171
- requirement: &85399700 !ruby/object:Gem::Requirement
171
+ requirement: &86739310 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ~>
@@ -176,10 +176,10 @@ dependencies:
176
176
  version: 2.2.2
177
177
  type: :runtime
178
178
  prerelease: false
179
- version_requirements: *85399700
179
+ version_requirements: *86739310
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: formtastic
182
- requirement: &85519010 !ruby/object:Gem::Requirement
182
+ requirement: &86738770 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
185
  - - ~>
@@ -187,10 +187,10 @@ dependencies:
187
187
  version: 1.2.3
188
188
  type: :runtime
189
189
  prerelease: false
190
- version_requirements: *85519010
190
+ version_requirements: *86738770
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: resque
193
- requirement: &85643510 !ruby/object:Gem::Requirement
193
+ requirement: &86738450 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ~>
@@ -198,10 +198,10 @@ dependencies:
198
198
  version: 1.20.0
199
199
  type: :runtime
200
200
  prerelease: false
201
- version_requirements: *85643510
201
+ version_requirements: *86738450
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: modernizr-rails
204
- requirement: &85751480 !ruby/object:Gem::Requirement
204
+ requirement: &86738180 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ~>
@@ -209,10 +209,10 @@ dependencies:
209
209
  version: 2.0.6
210
210
  type: :runtime
211
211
  prerelease: false
212
- version_requirements: *85751480
212
+ version_requirements: *86738180
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: thinking-sphinx
215
- requirement: &85860390 !ruby/object:Gem::Requirement
215
+ requirement: &86737860 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ~>
@@ -220,10 +220,10 @@ dependencies:
220
220
  version: 2.0.8
221
221
  type: :runtime
222
222
  prerelease: false
223
- version_requirements: *85860390
223
+ version_requirements: *86737860
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: sass-rails
226
- requirement: &85946460 !ruby/object:Gem::Requirement
226
+ requirement: &86737340 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ! '>='
@@ -231,10 +231,10 @@ dependencies:
231
231
  version: 3.1.0
232
232
  type: :runtime
233
233
  prerelease: false
234
- version_requirements: *85946460
234
+ version_requirements: *86737340
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: rails_autolink
237
- requirement: &85945940 !ruby/object:Gem::Requirement
237
+ requirement: &86736820 !ruby/object:Gem::Requirement
238
238
  none: false
239
239
  requirements:
240
240
  - - ~>
@@ -242,10 +242,10 @@ dependencies:
242
242
  version: 1.0.4
243
243
  type: :runtime
244
244
  prerelease: false
245
- version_requirements: *85945940
245
+ version_requirements: *86736820
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: social_cheesecake
248
- requirement: &85945580 !ruby/object:Gem::Requirement
248
+ requirement: &86736400 !ruby/object:Gem::Requirement
249
249
  none: false
250
250
  requirements:
251
251
  - - ~>
@@ -253,10 +253,10 @@ dependencies:
253
253
  version: 0.4.0
254
254
  type: :runtime
255
255
  prerelease: false
256
- version_requirements: *85945580
256
+ version_requirements: *86736400
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: i18n-js
259
- requirement: &85944980 !ruby/object:Gem::Requirement
259
+ requirement: &86736110 !ruby/object:Gem::Requirement
260
260
  none: false
261
261
  requirements:
262
262
  - - ~>
@@ -264,10 +264,10 @@ dependencies:
264
264
  version: 2.1.2
265
265
  type: :runtime
266
266
  prerelease: false
267
- version_requirements: *85944980
267
+ version_requirements: *86736110
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: capybara
270
- requirement: &85944380 !ruby/object:Gem::Requirement
270
+ requirement: &86735670 !ruby/object:Gem::Requirement
271
271
  none: false
272
272
  requirements:
273
273
  - - ~>
@@ -275,10 +275,10 @@ dependencies:
275
275
  version: 0.3.9
276
276
  type: :development
277
277
  prerelease: false
278
- version_requirements: *85944380
278
+ version_requirements: *86735670
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: sqlite3-ruby
281
- requirement: &85941690 !ruby/object:Gem::Requirement
281
+ requirement: &86735000 !ruby/object:Gem::Requirement
282
282
  none: false
283
283
  requirements:
284
284
  - - ! '>='
@@ -286,10 +286,10 @@ dependencies:
286
286
  version: '0'
287
287
  type: :development
288
288
  prerelease: false
289
- version_requirements: *85941690
289
+ version_requirements: *86735000
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: ruby-debug19
292
- requirement: &85941230 !ruby/object:Gem::Requirement
292
+ requirement: &86734620 !ruby/object:Gem::Requirement
293
293
  none: false
294
294
  requirements:
295
295
  - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
297
297
  version: '0'
298
298
  type: :development
299
299
  prerelease: false
300
- version_requirements: *85941230
300
+ version_requirements: *86734620
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: rspec-rails
303
- requirement: &85940580 !ruby/object:Gem::Requirement
303
+ requirement: &86724410 !ruby/object:Gem::Requirement
304
304
  none: false
305
305
  requirements:
306
306
  - - ~>
@@ -308,10 +308,10 @@ dependencies:
308
308
  version: 2.6.1
309
309
  type: :development
310
310
  prerelease: false
311
- version_requirements: *85940580
311
+ version_requirements: *86724410
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: factory_girl
314
- requirement: &85940190 !ruby/object:Gem::Requirement
314
+ requirement: &86724010 !ruby/object:Gem::Requirement
315
315
  none: false
316
316
  requirements:
317
317
  - - ~>
@@ -319,10 +319,10 @@ dependencies:
319
319
  version: 1.3.2
320
320
  type: :development
321
321
  prerelease: false
322
- version_requirements: *85940190
322
+ version_requirements: *86724010
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: forgery
325
- requirement: &85939830 !ruby/object:Gem::Requirement
325
+ requirement: &86723630 !ruby/object:Gem::Requirement
326
326
  none: false
327
327
  requirements:
328
328
  - - ~>
@@ -330,10 +330,10 @@ dependencies:
330
330
  version: 0.4.2
331
331
  type: :development
332
332
  prerelease: false
333
- version_requirements: *85939830
333
+ version_requirements: *86723630
334
334
  - !ruby/object:Gem::Dependency
335
335
  name: ci_reporter
336
- requirement: &85939420 !ruby/object:Gem::Requirement
336
+ requirement: &86723160 !ruby/object:Gem::Requirement
337
337
  none: false
338
338
  requirements:
339
339
  - - ~>
@@ -341,10 +341,10 @@ dependencies:
341
341
  version: 1.6.4
342
342
  type: :development
343
343
  prerelease: false
344
- version_requirements: *85939420
344
+ version_requirements: *86723160
345
345
  - !ruby/object:Gem::Dependency
346
346
  name: nifty-generators
347
- requirement: &85939050 !ruby/object:Gem::Requirement
347
+ requirement: &86722730 !ruby/object:Gem::Requirement
348
348
  none: false
349
349
  requirements:
350
350
  - - ~>
@@ -352,7 +352,7 @@ dependencies:
352
352
  version: 0.4.5
353
353
  type: :development
354
354
  prerelease: false
355
- version_requirements: *85939050
355
+ version_requirements: *86722730
356
356
  description: ! 'Social Stream is a Ruby on Rails engine providing your application
357
357
  with social networking features and activity streams.
358
358
 
@@ -545,6 +545,7 @@ files:
545
545
  - app/assets/javascripts/search.js.erb
546
546
  - app/assets/javascripts/settings.js
547
547
  - app/assets/javascripts/social_stream-base.js
548
+ - app/assets/javascripts/social_stream.action.js
548
549
  - app/assets/javascripts/social_stream.activity.js
549
550
  - app/assets/javascripts/social_stream.comments.js
550
551
  - app/assets/javascripts/social_stream.objects.js
@@ -590,7 +591,7 @@ files:
590
591
  - app/assets/stylesheets/relation_customs.css.scss
591
592
  - app/assets/stylesheets/search.css.scss
592
593
  - app/assets/stylesheets/settings.css
593
- - app/assets/stylesheets/social_stream-base.css
594
+ - app/assets/stylesheets/social_stream-base.css.scss
594
595
  - app/assets/stylesheets/ties.css.scss
595
596
  - app/assets/stylesheets/toolbar.css
596
597
  - app/assets/stylesheets/users.css
@@ -677,7 +678,7 @@ files:
677
678
  - app/views/activities/index.js.erb
678
679
  - app/views/activity_actions/_follow_form.html.erb
679
680
  - app/views/activity_actions/_follow_sentence.html.erb
680
- - app/views/activity_actions/_update_form.js.erb
681
+ - app/views/activity_actions/_update.js.erb
681
682
  - app/views/activity_actions/create.js.erb
682
683
  - app/views/activity_actions/update.js.erb
683
684
  - app/views/activity_objects/_activity_object.html.erb
@@ -869,22 +870,13 @@ files:
869
870
  - config/locales/rails.es.yml
870
871
  - config/locales/rails.pt.yml
871
872
  - config/routes.rb
872
- - db/migrate/20110610112023_create_social_stream.rb
873
- - db/migrate/20110705103202_empty_ties_count.rb
874
- - db/migrate/20110712090343_remove_spheres.rb
875
- - db/migrate/20110712142140_remove_permission_function.rb
876
- - db/migrate/20110912074426_add_reject_relation.rb
877
- - db/migrate/20111124100618_object_actors.rb
878
- - db/migrate/20111221103509_add_language_field.rb
879
- - db/migrate/20120103103125_add_channels.rb
880
- - db/migrate/20120109081509_update_notify_permissions.rb
881
- - db/migrate/20120111120920_remove_language_default.rb
882
- - db/migrate/20120111141717_activity_channels.rb
873
+ - db/migrate/20120111141717_create_social_stream.rb
883
874
  - db/migrate/20120201185454_singleton_single_relations.rb
884
875
  - db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
885
876
  - db/migrate/20120302215722_activity_object_properties.rb
886
877
  - db/migrate/20120316093946_create_activity_actions.rb
887
878
  - db/migrate/20120316113728_activity_action_follow.rb
879
+ - db/migrate/20120326083509_object_channels_to_actions.rb
888
880
  - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
889
881
  - lib/acts_as_taggable_on/social_stream.rb
890
882
  - lib/generators/social_stream/base/install_generator.rb
@@ -1,5 +0,0 @@
1
- /*
2
- *= require avatars_for_rails
3
- *
4
- *= require_tree .
5
- */
@@ -1,2 +0,0 @@
1
- $('.follow_form-<%= dom_id(activity_object) %>').replaceWith("<%= escape_javascript render(:partial => 'activity_actions/follow_form', :locals => { :activity_object => activity_object }) %>");
2
- $('.follow_sentence-<%= dom_id(activity_object) %>').replaceWith("<%= escape_javascript render(:partial => 'activity_actions/follow_sentence', :locals => { :activity_object => activity_object }) %>");