social_stream-base 0.13.0 → 0.13.1

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 (5) hide show
  1. data/app/models/activity.rb +6 -1
  2. data/app/views/notifications/activities/_post.html.erb +8 -2
  3. data/app/views/notifications/activities/_post.text.erb +6 -1
  4. data/lib/social_stream/base/version.rb +1 -1
  5. metadata +59 -59
data/app/models/activity.rb CHANGED
@@ -348,7 +348,12 @@ class Activity < ActiveRecord::Base
348
348
  :sender => sender_name,
349
349
  :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
350
350
  :receiver => receiver_name),
351
- :title => 'Re: ' + direct_object.parent_post.text.truncate(30, :separator => ' '))
351
+ :title => if direct_object.parent_post.is_a? Post
352
+ 'Re: ' + direct_object.parent_post.text.truncate(30, :separator => ' ')
353
+ elsif direct_object.parent_post.respond_to? :title
354
+ 'Re: ' + direct_object.parent_post.title.truncate(30, :separator => ' ')
355
+ else t('notification.default')
356
+ end)
352
357
  elsif direct_object.is_a? Post
353
358
  I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore,
354
359
  :sender => sender_name,
data/app/views/notifications/activities/_post.html.erb CHANGED
@@ -5,8 +5,14 @@
5
5
  polymorphic_url(activity.sender.subject)),
6
6
  :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
7
7
  :receiver => truncate_name(activity.receiver.name)),
8
- :title => link_to(activity.direct_object.parent_post.text.truncate(30, :separator => ' '),
9
- polymorphic_url(activity.direct_object))) %>
8
+ :title => if activity.direct_object.parent_post.is_a? Post
9
+ link_to(activity.direct_object.parent_post.text.truncate(30, :separator => ' '),
10
+ polymorphic_url(activity.direct_object))
11
+ elsif activity.direct_object.parent_post.respond_to? :title
12
+ link_to(activity.direct_object.parent_post.title.truncate(30, :separator => ' '),
13
+ polymorphic_url(activity.direct_object))
14
+ else t('notification.default')
15
+ end) %>
10
16
  <% elsif activity.direct_object.is_a? Post %>
11
17
  <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore,
12
18
  :sender => link_to(truncate_name(activity.sender.name),
data/app/views/notifications/activities/_post.text.erb CHANGED
@@ -4,7 +4,12 @@
4
4
  :sender => truncate_name(activity.sender.name),
5
5
  :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
6
6
  :receiver => truncate_name(activity.receiver.name)),
7
- :title => activity.direct_object.parent_post.text.truncate(30, :separator => ' ')) %>
7
+ :title => if activity.direct_object.parent_post.is_a? Post
8
+ activity.direct_object.parent_post.text.truncate(30, :separator => ' ')
9
+ elsif activity.direct_object.parent_post.respond_to? :title
10
+ activity.direct_object.parent_post.title.truncate(30, :separator => ' ')
11
+ else t('notification.default')
12
+ end) %>
8
13
  <% elsif activity.direct_object.is_a? Post %>
9
14
  <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore,
10
15
  :sender => truncate_name(activity.sender.name),
data/lib/social_stream/base/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "0.13.0".freeze
3
+ VERSION = "0.13.1".freeze
4
4
  end
5
5
  end
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.13.0
4
+ version: 0.13.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2012-01-23 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &87147360 !ruby/object:Gem::Requirement
17
+ requirement: &85797150 !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: *87147360
25
+ version_requirements: *85797150
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &87146580 !ruby/object:Gem::Requirement
28
+ requirement: &85796390 !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: *87146580
36
+ version_requirements: *85796390
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &87146010 !ruby/object:Gem::Requirement
39
+ requirement: &85793790 !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: *87146010
47
+ version_requirements: *85793790
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &87145600 !ruby/object:Gem::Requirement
50
+ requirement: &85793140 !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: *87145600
58
+ version_requirements: *85793140
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &87145150 !ruby/object:Gem::Requirement
61
+ requirement: &85792090 !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: *87145150
69
+ version_requirements: *85792090
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &87144860 !ruby/object:Gem::Requirement
72
+ requirement: &85791330 !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: *87144860
80
+ version_requirements: *85791330
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &87144600 !ruby/object:Gem::Requirement
83
+ requirement: &85790690 !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: *87144600
91
+ version_requirements: *85790690
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &87144290 !ruby/object:Gem::Requirement
94
+ requirement: &85789870 !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: *87144290
102
+ version_requirements: *85789870
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &87144010 !ruby/object:Gem::Requirement
105
+ requirement: &85789320 !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: *87144010
113
+ version_requirements: *85789320
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &87143760 !ruby/object:Gem::Requirement
116
+ requirement: &85788160 !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: *87143760
124
+ version_requirements: *85788160
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &87143510 !ruby/object:Gem::Requirement
127
+ requirement: &85787550 !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: *87143510
135
+ version_requirements: *85787550
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: mailboxer
138
- requirement: &87143260 !ruby/object:Gem::Requirement
138
+ requirement: &85786960 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ~>
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: 0.6.0
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *87143260
146
+ version_requirements: *85786960
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: acts-as-taggable-on
149
- requirement: &87142970 !ruby/object:Gem::Requirement
149
+ requirement: &85786640 !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: *87142970
157
+ version_requirements: *85786640
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: formtastic
160
- requirement: &87136950 !ruby/object:Gem::Requirement
160
+ requirement: &85785220 !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: *87136950
168
+ version_requirements: *85785220
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: simple-navigation
171
- requirement: &87136310 !ruby/object:Gem::Requirement
171
+ requirement: &85784190 !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: *87136310
179
+ version_requirements: *85784190
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: resque
182
- requirement: &87135970 !ruby/object:Gem::Requirement
182
+ requirement: &85783560 !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: *87135970
190
+ version_requirements: *85783560
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: modernizr-rails
193
- requirement: &87135410 !ruby/object:Gem::Requirement
193
+ requirement: &85783020 !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: *87135410
201
+ version_requirements: *85783020
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: thinking-sphinx
204
- requirement: &87134490 !ruby/object:Gem::Requirement
204
+ requirement: &85782420 !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: *87134490
212
+ version_requirements: *85782420
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: sass-rails
215
- requirement: &87133610 !ruby/object:Gem::Requirement
215
+ requirement: &85781690 !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: *87133610
223
+ version_requirements: *85781690
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: rails_autolink
226
- requirement: &87133290 !ruby/object:Gem::Requirement
226
+ requirement: &85780650 !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: *87133290
234
+ version_requirements: *85780650
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: social_cheesecake
237
- requirement: &87132800 !ruby/object:Gem::Requirement
237
+ requirement: &85779560 !ruby/object:Gem::Requirement
238
238
  none: false
239
239
  requirements:
240
240
  - - ~>
@@ -242,10 +242,10 @@ dependencies:
242
242
  version: 0.2.0
243
243
  type: :runtime
244
244
  prerelease: false
245
- version_requirements: *87132800
245
+ version_requirements: *85779560
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: capybara
248
- requirement: &87132280 !ruby/object:Gem::Requirement
248
+ requirement: &85775610 !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: *87132280
256
+ version_requirements: *85775610
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: sqlite3-ruby
259
- requirement: &87131910 !ruby/object:Gem::Requirement
259
+ requirement: &85774270 !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: *87131910
267
+ version_requirements: *85774270
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: ruby-debug19
270
- requirement: &87131520 !ruby/object:Gem::Requirement
270
+ requirement: &85773320 !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: *87131520
278
+ version_requirements: *85773320
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: rspec-rails
281
- requirement: &87131120 !ruby/object:Gem::Requirement
281
+ requirement: &85772320 !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: *87131120
289
+ version_requirements: *85772320
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: factory_girl
292
- requirement: &87130760 !ruby/object:Gem::Requirement
292
+ requirement: &85771400 !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: *87130760
300
+ version_requirements: *85771400
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: forgery
303
- requirement: &87130370 !ruby/object:Gem::Requirement
303
+ requirement: &85770840 !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: *87130370
311
+ version_requirements: *85770840
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: ci_reporter
314
- requirement: &87129950 !ruby/object:Gem::Requirement
314
+ requirement: &85770330 !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: *87129950
322
+ version_requirements: *85770330
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: nifty-generators
325
- requirement: &87129440 !ruby/object:Gem::Requirement
325
+ requirement: &85769900 !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: *87129440
333
+ version_requirements: *85769900
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