social_stream-base 0.19.0 → 0.19.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -52,7 +52,8 @@ class ActivityObject < ActiveRecord::Base
52
52
  # after_create :create_post_activity, :unless => :acts_as_actor?
53
53
 
54
54
  scope :authored_by, lambda { |subject|
55
- joins(:received_author_action).merge(ActivityAction.sent_by(subject))
55
+ joins(:received_actions).
56
+ merge(ActivityAction.sent_by(subject).where(:author => true))
56
57
  }
57
58
 
58
59
  scope :followed, order("activity_objects.follower_count DESC")
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "0.19.0".freeze
3
+ VERSION = "0.19.1".freeze
4
4
  end
5
5
  end
@@ -8,6 +8,9 @@ module SocialStream
8
8
  subtype_of :activity_object,
9
9
  :build => { :object_type => to_s }
10
10
 
11
+ has_many :received_actions,
12
+ :through => :activity_object
13
+
11
14
  unless self == Actor
12
15
  validates_presence_of :author_id, :owner_id, :user_author_id
13
16
 
@@ -60,4 +60,12 @@ describe Post do
60
60
  post.post_activity.relations.should include(tie.relation)
61
61
  end
62
62
  end
63
+
64
+ describe "authored_by" do
65
+ it "should work" do
66
+ post = Factory(:post)
67
+
68
+ Post.authored_by(post.author).should include(post)
69
+ end
70
+ end
63
71
  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.19.0
4
+ version: 0.19.1
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-04-02 00:00:00.000000000Z
13
+ date: 2012-04-03 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &86758160 !ruby/object:Gem::Requirement
17
+ requirement: &82053200 !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: *86758160
25
+ version_requirements: *82053200
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &86757430 !ruby/object:Gem::Requirement
28
+ requirement: &82052710 !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: *86757430
36
+ version_requirements: *82052710
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &86757050 !ruby/object:Gem::Requirement
39
+ requirement: &82052290 !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: *86757050
47
+ version_requirements: *82052290
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &86756810 !ruby/object:Gem::Requirement
50
+ requirement: &82051510 !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: *86756810
58
+ version_requirements: *82051510
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &86756490 !ruby/object:Gem::Requirement
61
+ requirement: &82051160 !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: *86756490
69
+ version_requirements: *82051160
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &86756120 !ruby/object:Gem::Requirement
72
+ requirement: &82050870 !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: *86756120
80
+ version_requirements: *82050870
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &86755770 !ruby/object:Gem::Requirement
83
+ requirement: &82050490 !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: *86755770
91
+ version_requirements: *82050490
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &86755180 !ruby/object:Gem::Requirement
94
+ requirement: &82050240 !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: *86755180
102
+ version_requirements: *82050240
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &86754850 !ruby/object:Gem::Requirement
105
+ requirement: &82049940 !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: *86754850
113
+ version_requirements: *82049940
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &86742010 !ruby/object:Gem::Requirement
116
+ requirement: &82049530 !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: *86742010
124
+ version_requirements: *82049530
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &86741350 !ruby/object:Gem::Requirement
127
+ requirement: &82049140 !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: *86741350
135
+ version_requirements: *82049140
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: omniauth-facebook
138
- requirement: &86740750 !ruby/object:Gem::Requirement
138
+ requirement: &82048660 !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: *86740750
146
+ version_requirements: *82048660
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: omniauth-linkedin
149
- requirement: &86740230 !ruby/object:Gem::Requirement
149
+ requirement: &82048060 !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: *86740230
157
+ version_requirements: *82048060
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: mailboxer
160
- requirement: &86739800 !ruby/object:Gem::Requirement
160
+ requirement: &80850010 !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: *86739800
168
+ version_requirements: *80850010
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: acts-as-taggable-on
171
- requirement: &86739310 !ruby/object:Gem::Requirement
171
+ requirement: &80847300 !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: *86739310
179
+ version_requirements: *80847300
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: formtastic
182
- requirement: &86738770 !ruby/object:Gem::Requirement
182
+ requirement: &80845980 !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: *86738770
190
+ version_requirements: *80845980
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: resque
193
- requirement: &86738450 !ruby/object:Gem::Requirement
193
+ requirement: &80836730 !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: *86738450
201
+ version_requirements: *80836730
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: modernizr-rails
204
- requirement: &86738180 !ruby/object:Gem::Requirement
204
+ requirement: &80834710 !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: *86738180
212
+ version_requirements: *80834710
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: thinking-sphinx
215
- requirement: &86737860 !ruby/object:Gem::Requirement
215
+ requirement: &80832000 !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: *86737860
223
+ version_requirements: *80832000
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: sass-rails
226
- requirement: &86737340 !ruby/object:Gem::Requirement
226
+ requirement: &80830520 !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: *86737340
234
+ version_requirements: *80830520
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: rails_autolink
237
- requirement: &86736820 !ruby/object:Gem::Requirement
237
+ requirement: &80827690 !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: *86736820
245
+ version_requirements: *80827690
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: social_cheesecake
248
- requirement: &86736400 !ruby/object:Gem::Requirement
248
+ requirement: &80826760 !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: *86736400
256
+ version_requirements: *80826760
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: i18n-js
259
- requirement: &86736110 !ruby/object:Gem::Requirement
259
+ requirement: &80824260 !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: *86736110
267
+ version_requirements: *80824260
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: capybara
270
- requirement: &86735670 !ruby/object:Gem::Requirement
270
+ requirement: &80822270 !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: *86735670
278
+ version_requirements: *80822270
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: sqlite3-ruby
281
- requirement: &86735000 !ruby/object:Gem::Requirement
281
+ requirement: &80820130 !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: *86735000
289
+ version_requirements: *80820130
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: ruby-debug19
292
- requirement: &86734620 !ruby/object:Gem::Requirement
292
+ requirement: &80802380 !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: *86734620
300
+ version_requirements: *80802380
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: rspec-rails
303
- requirement: &86724410 !ruby/object:Gem::Requirement
303
+ requirement: &80800060 !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: *86724410
311
+ version_requirements: *80800060
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: factory_girl
314
- requirement: &86724010 !ruby/object:Gem::Requirement
314
+ requirement: &80798980 !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: *86724010
322
+ version_requirements: *80798980
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: forgery
325
- requirement: &86723630 !ruby/object:Gem::Requirement
325
+ requirement: &80796760 !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: *86723630
333
+ version_requirements: *80796760
334
334
  - !ruby/object:Gem::Dependency
335
335
  name: ci_reporter
336
- requirement: &86723160 !ruby/object:Gem::Requirement
336
+ requirement: &80788160 !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: *86723160
344
+ version_requirements: *80788160
345
345
  - !ruby/object:Gem::Dependency
346
346
  name: nifty-generators
347
- requirement: &86722730 !ruby/object:Gem::Requirement
347
+ requirement: &80783760 !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: *86722730
355
+ version_requirements: *80783760
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