social_stream-base 0.11.2 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (36) hide show
  1. data/LICENSE +1 -1
  2. data/README.rdoc +1 -1
  3. data/app/assets/stylesheets/header.css.scss +9 -7
  4. data/app/controllers/groups_controller.rb +3 -4
  5. data/app/controllers/settings_controller.rb +14 -3
  6. data/app/controllers/users_controller.rb +3 -4
  7. data/app/helpers/permissions_helper.rb +2 -1
  8. data/app/models/activity_object.rb +29 -28
  9. data/app/models/actor.rb +27 -19
  10. data/app/models/channel.rb +48 -0
  11. data/app/views/contacts/_pendings.html.erb +1 -1
  12. data/app/views/devise/registrations/_edit_user.html.erb +0 -25
  13. data/app/views/devise/registrations/edit.html.erb +1 -0
  14. data/app/views/layouts/_footer.html.erb +1 -1
  15. data/app/views/layouts/_header_dropdown_menu_sessions.html.erb +5 -2
  16. data/app/views/settings/_language.html.erb +32 -0
  17. data/app/views/settings/_notifications.html.erb +1 -1
  18. data/config/locales/en.yml +5 -0
  19. data/config/locales/es.yml +7 -0
  20. data/db/migrate/20120103103125_add_channels.rb +88 -0
  21. data/db/migrate/20120109081509_update_notify_permissions.rb +15 -0
  22. data/lib/social_stream/base/engine.rb +10 -2
  23. data/lib/social_stream/base/version.rb +1 -1
  24. data/lib/social_stream/controllers/i18n_integration.rb +29 -0
  25. data/lib/social_stream/controllers/subjects.rb +19 -0
  26. data/lib/social_stream/models/object.rb +12 -26
  27. data/lib/social_stream/models/subject.rb +2 -24
  28. data/lib/social_stream/models/subtype.rb +80 -0
  29. data/lib/social_stream/models/supertype.rb +16 -3
  30. data/lib/social_stream/views/settings/base.rb +5 -0
  31. data/lib/social_stream-base.rb +7 -4
  32. data/lib/tasks/db/populate.rake +1 -0
  33. data/spec/controllers/settings_controller_spec.rb +1 -1
  34. data/spec/spec_helper.rb +3 -0
  35. metadata +67 -61
  36. data/spec/dummy/app/helpers/application_helper.rb +0 -2
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.11.2
4
+ version: 0.12.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: 2011-12-23 00:00:00.000000000Z
13
+ date: 2012-01-11 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &73089080 !ruby/object:Gem::Requirement
17
+ requirement: &78052420 !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: *73089080
25
+ version_requirements: *78052420
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &73088720 !ruby/object:Gem::Requirement
28
+ requirement: &78051310 !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: *73088720
36
+ version_requirements: *78051310
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &73088410 !ruby/object:Gem::Requirement
39
+ requirement: &78050950 !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: *73088410
47
+ version_requirements: *78050950
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &73088110 !ruby/object:Gem::Requirement
50
+ requirement: &78039570 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 1.4.5
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *73088110
58
+ version_requirements: *78039570
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &73087810 !ruby/object:Gem::Requirement
61
+ requirement: &78039190 !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: *73087810
69
+ version_requirements: *78039190
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &73087510 !ruby/object:Gem::Requirement
72
+ requirement: &78038950 !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: *73087510
80
+ version_requirements: *78038950
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &73087200 !ruby/object:Gem::Requirement
83
+ requirement: &78038690 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: 0.2.2
89
89
  type: :runtime
90
90
  prerelease: false
91
- version_requirements: *73087200
91
+ version_requirements: *78038690
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &73086890 !ruby/object:Gem::Requirement
94
+ requirement: &78038410 !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: *73086890
102
+ version_requirements: *78038410
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &73086590 !ruby/object:Gem::Requirement
105
+ requirement: &78038110 !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: *73086590
113
+ version_requirements: *78038110
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &73086310 !ruby/object:Gem::Requirement
116
+ requirement: &78037810 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: 0.12.4
122
122
  type: :runtime
123
123
  prerelease: false
124
- version_requirements: *73086310
124
+ version_requirements: *78037810
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &73086040 !ruby/object:Gem::Requirement
127
+ requirement: &78037490 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ~>
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: 0.2.6
133
133
  type: :runtime
134
134
  prerelease: false
135
- version_requirements: *73086040
135
+ version_requirements: *78037490
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: mailboxer
138
- requirement: &72439240 !ruby/object:Gem::Requirement
138
+ requirement: &78037040 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ~>
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: 0.5.4
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *72439240
146
+ version_requirements: *78037040
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: acts-as-taggable-on
149
- requirement: &72437820 !ruby/object:Gem::Requirement
149
+ requirement: &78036800 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ~>
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: 2.0.6
155
155
  type: :runtime
156
156
  prerelease: false
157
- version_requirements: *72437820
157
+ version_requirements: *78036800
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: formtastic
160
- requirement: &72436390 !ruby/object:Gem::Requirement
160
+ requirement: &78036540 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ~>
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: 1.2.3
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *72436390
168
+ version_requirements: *78036540
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: simple-navigation
171
- requirement: &72435360 !ruby/object:Gem::Requirement
171
+ requirement: &78036300 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ~>
@@ -176,10 +176,10 @@ dependencies:
176
176
  version: 3.5.1
177
177
  type: :runtime
178
178
  prerelease: false
179
- version_requirements: *72435360
179
+ version_requirements: *78036300
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: resque
182
- requirement: &72434780 !ruby/object:Gem::Requirement
182
+ requirement: &78036060 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
185
  - - ~>
@@ -187,10 +187,10 @@ dependencies:
187
187
  version: 1.19.0
188
188
  type: :runtime
189
189
  prerelease: false
190
- version_requirements: *72434780
190
+ version_requirements: *78036060
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: modernizr-rails
193
- requirement: &72434070 !ruby/object:Gem::Requirement
193
+ requirement: &78035800 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ~>
@@ -198,10 +198,10 @@ dependencies:
198
198
  version: 2.0.6
199
199
  type: :runtime
200
200
  prerelease: false
201
- version_requirements: *72434070
201
+ version_requirements: *78035800
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: thinking-sphinx
204
- requirement: &72432350 !ruby/object:Gem::Requirement
204
+ requirement: &78035520 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ~>
@@ -209,10 +209,10 @@ dependencies:
209
209
  version: 2.0.8
210
210
  type: :runtime
211
211
  prerelease: false
212
- version_requirements: *72432350
212
+ version_requirements: *78035520
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: sass-rails
215
- requirement: &72428620 !ruby/object:Gem::Requirement
215
+ requirement: &78035180 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ~>
@@ -220,10 +220,10 @@ dependencies:
220
220
  version: 3.1.0
221
221
  type: :runtime
222
222
  prerelease: false
223
- version_requirements: *72428620
223
+ version_requirements: *78035180
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: rails_autolink
226
- requirement: &72427840 !ruby/object:Gem::Requirement
226
+ requirement: &78034770 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ~>
@@ -231,10 +231,10 @@ dependencies:
231
231
  version: 1.0.4
232
232
  type: :runtime
233
233
  prerelease: false
234
- version_requirements: *72427840
234
+ version_requirements: *78034770
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: social_cheesecake
237
- requirement: &72427300 !ruby/object:Gem::Requirement
237
+ requirement: &78034320 !ruby/object:Gem::Requirement
238
238
  none: false
239
239
  requirements:
240
240
  - - ~>
@@ -242,10 +242,10 @@ dependencies:
242
242
  version: 0.1.0
243
243
  type: :runtime
244
244
  prerelease: false
245
- version_requirements: *72427300
245
+ version_requirements: *78034320
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: capybara
248
- requirement: &72426400 !ruby/object:Gem::Requirement
248
+ requirement: &78033600 !ruby/object:Gem::Requirement
249
249
  none: false
250
250
  requirements:
251
251
  - - ~>
@@ -253,10 +253,10 @@ dependencies:
253
253
  version: 0.3.9
254
254
  type: :development
255
255
  prerelease: false
256
- version_requirements: *72426400
256
+ version_requirements: *78033600
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: sqlite3-ruby
259
- requirement: &72424940 !ruby/object:Gem::Requirement
259
+ requirement: &78032940 !ruby/object:Gem::Requirement
260
260
  none: false
261
261
  requirements:
262
262
  - - ! '>='
@@ -264,10 +264,10 @@ dependencies:
264
264
  version: '0'
265
265
  type: :development
266
266
  prerelease: false
267
- version_requirements: *72424940
267
+ version_requirements: *78032940
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: ruby-debug19
270
- requirement: &72423390 !ruby/object:Gem::Requirement
270
+ requirement: &78032570 !ruby/object:Gem::Requirement
271
271
  none: false
272
272
  requirements:
273
273
  - - ! '>='
@@ -275,10 +275,10 @@ dependencies:
275
275
  version: '0'
276
276
  type: :development
277
277
  prerelease: false
278
- version_requirements: *72423390
278
+ version_requirements: *78032570
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: rspec-rails
281
- requirement: &72422260 !ruby/object:Gem::Requirement
281
+ requirement: &78032160 !ruby/object:Gem::Requirement
282
282
  none: false
283
283
  requirements:
284
284
  - - ~>
@@ -286,10 +286,10 @@ dependencies:
286
286
  version: 2.6.1
287
287
  type: :development
288
288
  prerelease: false
289
- version_requirements: *72422260
289
+ version_requirements: *78032160
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: factory_girl
292
- requirement: &72420910 !ruby/object:Gem::Requirement
292
+ requirement: &78031470 !ruby/object:Gem::Requirement
293
293
  none: false
294
294
  requirements:
295
295
  - - ~>
@@ -297,10 +297,10 @@ dependencies:
297
297
  version: 1.3.2
298
298
  type: :development
299
299
  prerelease: false
300
- version_requirements: *72420910
300
+ version_requirements: *78031470
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: forgery
303
- requirement: &72414720 !ruby/object:Gem::Requirement
303
+ requirement: &78022650 !ruby/object:Gem::Requirement
304
304
  none: false
305
305
  requirements:
306
306
  - - ~>
@@ -308,10 +308,10 @@ dependencies:
308
308
  version: 0.4.2
309
309
  type: :development
310
310
  prerelease: false
311
- version_requirements: *72414720
311
+ version_requirements: *78022650
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: ci_reporter
314
- requirement: &72413490 !ruby/object:Gem::Requirement
314
+ requirement: &78022020 !ruby/object:Gem::Requirement
315
315
  none: false
316
316
  requirements:
317
317
  - - ~>
@@ -319,10 +319,10 @@ dependencies:
319
319
  version: 1.6.4
320
320
  type: :development
321
321
  prerelease: false
322
- version_requirements: *72413490
322
+ version_requirements: *78022020
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: nifty-generators
325
- requirement: &72412310 !ruby/object:Gem::Requirement
325
+ requirement: &78021770 !ruby/object:Gem::Requirement
326
326
  none: false
327
327
  requirements:
328
328
  - - ~>
@@ -330,7 +330,7 @@ dependencies:
330
330
  version: 0.4.5
331
331
  type: :development
332
332
  prerelease: false
333
- version_requirements: *72412310
333
+ version_requirements: *78021770
334
334
  description: ! 'Social Stream is a Ruby on Rails engine providing your application
335
335
  with social networking features and activity streams.
336
336
 
@@ -606,6 +606,7 @@ files:
606
606
  - app/models/actor.rb
607
607
  - app/models/audience.rb
608
608
  - app/models/authentication.rb
609
+ - app/models/channel.rb
609
610
  - app/models/comment.rb
610
611
  - app/models/contact.rb
611
612
  - app/models/group.rb
@@ -781,6 +782,7 @@ files:
781
782
  - app/views/settings/_api_key.html.erb
782
783
  - app/views/settings/_destroy.html.erb
783
784
  - app/views/settings/_index.html.erb
785
+ - app/views/settings/_language.html.erb
784
786
  - app/views/settings/_notifications.html.erb
785
787
  - app/views/settings/index.html.erb
786
788
  - app/views/settings/index.js.erb
@@ -817,6 +819,8 @@ files:
817
819
  - db/migrate/20110912074426_add_reject_relation.rb
818
820
  - db/migrate/20111124100618_object_actors.rb
819
821
  - db/migrate/20111221103509_add_language_field.rb
822
+ - db/migrate/20120103103125_add_channels.rb
823
+ - db/migrate/20120109081509_update_notify_permissions.rb
820
824
  - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
821
825
  - lib/acts_as_taggable_on/social_stream.rb
822
826
  - lib/generators/social_stream/base/install_generator.rb
@@ -833,12 +837,15 @@ files:
833
837
  - lib/social_stream/base/version.rb
834
838
  - lib/social_stream/controllers/cancan_devise_integration.rb
835
839
  - lib/social_stream/controllers/helpers.rb
840
+ - lib/social_stream/controllers/i18n_integration.rb
836
841
  - lib/social_stream/controllers/objects.rb
842
+ - lib/social_stream/controllers/subjects.rb
837
843
  - lib/social_stream/d3.rb
838
844
  - lib/social_stream/migrations/base.rb
839
845
  - lib/social_stream/migrations/components.rb
840
846
  - lib/social_stream/models/object.rb
841
847
  - lib/social_stream/models/subject.rb
848
+ - lib/social_stream/models/subtype.rb
842
849
  - lib/social_stream/models/supertype.rb
843
850
  - lib/social_stream/populate.rb
844
851
  - lib/social_stream/test_helpers.rb
@@ -871,7 +878,6 @@ files:
871
878
  - spec/dummy/app/assets/javascripts/application.js
872
879
  - spec/dummy/app/assets/stylesheets/application.css
873
880
  - spec/dummy/app/controllers/application_controller.rb
874
- - spec/dummy/app/helpers/application_helper.rb
875
881
  - spec/dummy/config.ru
876
882
  - spec/dummy/config/application.rb
877
883
  - spec/dummy/config/boot.rb
data/spec/dummy/app/helpers/application_helper.rb DELETED
@@ -1,2 +0,0 @@
1
- module ApplicationHelper
2
- end