social_stream-base 0.14.2 → 0.14.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. data/app/assets/stylesheets/cheesecake.css.scss +43 -12
  2. data/app/controllers/contacts_controller.rb +1 -1
  3. data/app/models/activity.rb +4 -1
  4. data/app/models/actor.rb +2 -14
  5. data/app/models/relation/single.rb +2 -7
  6. data/app/models/relation.rb +2 -4
  7. data/app/models/tie.rb +2 -1
  8. data/app/views/activities/_new.html.erb +1 -1
  9. data/app/views/cheesecake/_cheesecake.html.erb +170 -105
  10. data/app/views/cheesecake/_index.html.erb +45 -47
  11. data/app/views/cheesecake/_sector_form.html.erb +1 -0
  12. data/app/views/toolbar/_home.html.erb +1 -1
  13. data/config/locales/en.yml +2 -0
  14. data/config/locales/es.yml +2 -0
  15. data/config/locales/rails.es.yml +192 -0
  16. data/db/migrate/20110912074426_add_reject_relation.rb +2 -2
  17. data/db/migrate/20120201185454_singleton_single_relations.rb +46 -0
  18. data/lib/social_stream/base/version.rb +1 -1
  19. data/lib/tasks/db/populate.rake +1 -1
  20. data/spec/controllers/posts_controller_spec.rb +2 -2
  21. data/spec/factories/activity.rb +1 -1
  22. data/spec/factories/post.rb +1 -1
  23. data/spec/factories/tie.rb +3 -3
  24. data/spec/models/activity_authorization_spec.rb +3 -3
  25. data/spec/support/db.rb +3 -1
  26. metadata +69 -66
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.14.2
4
+ version: 0.14.3
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-02-01 00:00:00.000000000Z
13
+ date: 2012-02-03 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &80469090 !ruby/object:Gem::Requirement
17
+ requirement: &72404110 !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: *80469090
25
+ version_requirements: *72404110
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &80468840 !ruby/object:Gem::Requirement
28
+ requirement: &72403860 !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: *80468840
36
+ version_requirements: *72403860
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &80468610 !ruby/object:Gem::Requirement
39
+ requirement: &72403600 !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: *80468610
47
+ version_requirements: *72403600
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &80468380 !ruby/object:Gem::Requirement
50
+ requirement: &72403350 !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: *80468380
58
+ version_requirements: *72403350
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &80468150 !ruby/object:Gem::Requirement
61
+ requirement: &72403070 !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: *80468150
69
+ version_requirements: *72403070
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &80467920 !ruby/object:Gem::Requirement
72
+ requirement: &72402760 !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: *80467920
80
+ version_requirements: *72402760
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &80467690 !ruby/object:Gem::Requirement
83
+ requirement: &72402220 !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: *80467690
91
+ version_requirements: *72402220
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &80467440 !ruby/object:Gem::Requirement
94
+ requirement: &72401970 !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: *80467440
102
+ version_requirements: *72401970
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &80467200 !ruby/object:Gem::Requirement
105
+ requirement: &72401740 !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: *80467200
113
+ version_requirements: *72401740
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &80466920 !ruby/object:Gem::Requirement
116
+ requirement: &72391510 !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: *80466920
124
+ version_requirements: *72391510
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &80466650 !ruby/object:Gem::Requirement
127
+ requirement: &72391260 !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: *80466650
135
+ version_requirements: *72391260
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: omniauth-facebook
138
- requirement: &80466300 !ruby/object:Gem::Requirement
138
+ requirement: &72390990 !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: *80466300
146
+ version_requirements: *72390990
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: omniauth-linkedin
149
- requirement: &80465900 !ruby/object:Gem::Requirement
149
+ requirement: &72390680 !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: *80465900
157
+ version_requirements: *72390680
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: mailboxer
160
- requirement: &80465670 !ruby/object:Gem::Requirement
160
+ requirement: &72390360 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ~>
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: 0.6.0
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *80465670
168
+ version_requirements: *72390360
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: acts-as-taggable-on
171
- requirement: &80465400 !ruby/object:Gem::Requirement
171
+ requirement: &72390120 !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: *80465400
179
+ version_requirements: *72390120
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: formtastic
182
- requirement: &80465040 !ruby/object:Gem::Requirement
182
+ requirement: &72389890 !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: *80465040
190
+ version_requirements: *72389890
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: simple-navigation
193
- requirement: &80464700 !ruby/object:Gem::Requirement
193
+ requirement: &72389660 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ~>
@@ -198,10 +198,10 @@ dependencies:
198
198
  version: 3.5.1
199
199
  type: :runtime
200
200
  prerelease: false
201
- version_requirements: *80464700
201
+ version_requirements: *72389660
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: resque
204
- requirement: &80464340 !ruby/object:Gem::Requirement
204
+ requirement: &72389420 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ~>
@@ -209,10 +209,10 @@ dependencies:
209
209
  version: 1.19.0
210
210
  type: :runtime
211
211
  prerelease: false
212
- version_requirements: *80464340
212
+ version_requirements: *72389420
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: modernizr-rails
215
- requirement: &80464010 !ruby/object:Gem::Requirement
215
+ requirement: &72389180 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ~>
@@ -220,10 +220,10 @@ dependencies:
220
220
  version: 2.0.6
221
221
  type: :runtime
222
222
  prerelease: false
223
- version_requirements: *80464010
223
+ version_requirements: *72389180
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: thinking-sphinx
226
- requirement: &80463660 !ruby/object:Gem::Requirement
226
+ requirement: &72388950 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ~>
@@ -231,10 +231,10 @@ dependencies:
231
231
  version: 2.0.8
232
232
  type: :runtime
233
233
  prerelease: false
234
- version_requirements: *80463660
234
+ version_requirements: *72388950
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: sass-rails
237
- requirement: &80463320 !ruby/object:Gem::Requirement
237
+ requirement: &72388720 !ruby/object:Gem::Requirement
238
238
  none: false
239
239
  requirements:
240
240
  - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
242
242
  version: 3.1.0
243
243
  type: :runtime
244
244
  prerelease: false
245
- version_requirements: *80463320
245
+ version_requirements: *72388720
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: rails_autolink
248
- requirement: &80462960 !ruby/object:Gem::Requirement
248
+ requirement: &72388490 !ruby/object:Gem::Requirement
249
249
  none: false
250
250
  requirements:
251
251
  - - ~>
@@ -253,10 +253,10 @@ dependencies:
253
253
  version: 1.0.4
254
254
  type: :runtime
255
255
  prerelease: false
256
- version_requirements: *80462960
256
+ version_requirements: *72388490
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: social_cheesecake
259
- requirement: &80462650 !ruby/object:Gem::Requirement
259
+ requirement: &72388230 !ruby/object:Gem::Requirement
260
260
  none: false
261
261
  requirements:
262
262
  - - ~>
@@ -264,10 +264,10 @@ dependencies:
264
264
  version: 0.3.0
265
265
  type: :runtime
266
266
  prerelease: false
267
- version_requirements: *80462650
267
+ version_requirements: *72388230
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: i18n-js
270
- requirement: &80462420 !ruby/object:Gem::Requirement
270
+ requirement: &72387990 !ruby/object:Gem::Requirement
271
271
  none: false
272
272
  requirements:
273
273
  - - ~>
@@ -275,10 +275,10 @@ dependencies:
275
275
  version: 2.1.2
276
276
  type: :runtime
277
277
  prerelease: false
278
- version_requirements: *80462420
278
+ version_requirements: *72387990
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: capybara
281
- requirement: &80462170 !ruby/object:Gem::Requirement
281
+ requirement: &72387710 !ruby/object:Gem::Requirement
282
282
  none: false
283
283
  requirements:
284
284
  - - ~>
@@ -286,10 +286,10 @@ dependencies:
286
286
  version: 0.3.9
287
287
  type: :development
288
288
  prerelease: false
289
- version_requirements: *80462170
289
+ version_requirements: *72387710
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: sqlite3-ruby
292
- requirement: &80461970 !ruby/object:Gem::Requirement
292
+ requirement: &72387500 !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: *80461970
300
+ version_requirements: *72387500
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: ruby-debug19
303
- requirement: &80461720 !ruby/object:Gem::Requirement
303
+ requirement: &72387130 !ruby/object:Gem::Requirement
304
304
  none: false
305
305
  requirements:
306
306
  - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
308
308
  version: '0'
309
309
  type: :development
310
310
  prerelease: false
311
- version_requirements: *80461720
311
+ version_requirements: *72387130
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: rspec-rails
314
- requirement: &80461470 !ruby/object:Gem::Requirement
314
+ requirement: &72386430 !ruby/object:Gem::Requirement
315
315
  none: false
316
316
  requirements:
317
317
  - - ~>
@@ -319,10 +319,10 @@ dependencies:
319
319
  version: 2.6.1
320
320
  type: :development
321
321
  prerelease: false
322
- version_requirements: *80461470
322
+ version_requirements: *72386430
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: factory_girl
325
- requirement: &80461220 !ruby/object:Gem::Requirement
325
+ requirement: &72386180 !ruby/object:Gem::Requirement
326
326
  none: false
327
327
  requirements:
328
328
  - - ~>
@@ -330,10 +330,10 @@ dependencies:
330
330
  version: 1.3.2
331
331
  type: :development
332
332
  prerelease: false
333
- version_requirements: *80461220
333
+ version_requirements: *72386180
334
334
  - !ruby/object:Gem::Dependency
335
335
  name: forgery
336
- requirement: &80458470 !ruby/object:Gem::Requirement
336
+ requirement: &72385910 !ruby/object:Gem::Requirement
337
337
  none: false
338
338
  requirements:
339
339
  - - ~>
@@ -341,10 +341,10 @@ dependencies:
341
341
  version: 0.4.2
342
342
  type: :development
343
343
  prerelease: false
344
- version_requirements: *80458470
344
+ version_requirements: *72385910
345
345
  - !ruby/object:Gem::Dependency
346
346
  name: ci_reporter
347
- requirement: &80458110 !ruby/object:Gem::Requirement
347
+ requirement: &72385550 !ruby/object:Gem::Requirement
348
348
  none: false
349
349
  requirements:
350
350
  - - ~>
@@ -352,10 +352,10 @@ dependencies:
352
352
  version: 1.6.4
353
353
  type: :development
354
354
  prerelease: false
355
- version_requirements: *80458110
355
+ version_requirements: *72385550
356
356
  - !ruby/object:Gem::Dependency
357
357
  name: nifty-generators
358
- requirement: &80457780 !ruby/object:Gem::Requirement
358
+ requirement: &72385190 !ruby/object:Gem::Requirement
359
359
  none: false
360
360
  requirements:
361
361
  - - ~>
@@ -363,7 +363,7 @@ dependencies:
363
363
  version: 0.4.5
364
364
  type: :development
365
365
  prerelease: false
366
- version_requirements: *80457780
366
+ version_requirements: *72385190
367
367
  description: ! 'Social Stream is a Ruby on Rails engine providing your application
368
368
  with social networking features and activity streams.
369
369
 
@@ -676,6 +676,7 @@ files:
676
676
  - app/views/avatars/update.js.erb
677
677
  - app/views/cheesecake/_cheesecake.html.erb
678
678
  - app/views/cheesecake/_index.html.erb
679
+ - app/views/cheesecake/_sector_form.html.erb
679
680
  - app/views/cheesecake/index.html.erb
680
681
  - app/views/cheesecake/update.js.erb
681
682
  - app/views/comments/_comment.html.erb
@@ -849,6 +850,7 @@ files:
849
850
  - app/views/users/show.xml.builder
850
851
  - config/locales/en.yml
851
852
  - config/locales/es.yml
853
+ - config/locales/rails.es.yml
852
854
  - config/routes.rb
853
855
  - db/migrate/20110610112023_create_social_stream.rb
854
856
  - db/migrate/20110705103202_empty_ties_count.rb
@@ -861,6 +863,7 @@ files:
861
863
  - db/migrate/20120109081509_update_notify_permissions.rb
862
864
  - db/migrate/20120111120920_remove_language_default.rb
863
865
  - db/migrate/20120111141717_activity_channels.rb
866
+ - db/migrate/20120201185454_singleton_single_relations.rb
864
867
  - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
865
868
  - lib/acts_as_taggable_on/social_stream.rb
866
869
  - lib/generators/social_stream/base/install_generator.rb