social_stream 0.3.5 → 0.3.6
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +2 -0
- data/app/controllers/authentications_controller.rb +17 -0
- data/app/controllers/omniauth_callbacks_controller.rb +17 -0
- data/app/models/actor.rb +11 -1
- data/app/models/authentication.rb +3 -0
- data/app/models/permission.rb +81 -18
- data/app/models/relation.rb +21 -3
- data/app/models/tie.rb +38 -20
- data/app/models/user.rb +29 -0
- data/app/views/frontpage/_sponsor.html.erb +6 -6
- data/app/views/groups/index.html.erb +1 -1
- data/app/views/layouts/_header.erb +1 -1
- data/app/views/layouts/application.html.erb +3 -3
- data/app/views/users/_profile.html.erb +5 -3
- data/app/views/users/edit.html.erb +105 -114
- data/app/views/users/index.html.erb +7 -6
- data/bin/social_stream +0 -0
- data/bin/social_stream_heroku +76 -0
- data/config/locales/en.yml +1 -0
- data/config/routes.rb +1 -2
- data/lib/generators/social_stream/install_generator.rb +8 -0
- data/lib/generators/social_stream/templates/initializer.rb +2 -2
- data/lib/generators/social_stream/templates/migration.rb +15 -0
- data/lib/generators/social_stream/templates/public/stylesheets/browse.css +47 -5
- data/lib/generators/social_stream/templates/public/stylesheets/edit_user.css +32 -19
- data/lib/generators/social_stream/templates/public/stylesheets/index.css +25 -13
- data/lib/generators/social_stream/templates/public/stylesheets/jqcloud.css +2 -2
- data/lib/generators/social_stream/templates/public/stylesheets/users.css +0 -22
- data/lib/generators/social_stream/templates/relations.yml +25 -20
- data/lib/social_stream.rb +1 -1
- data/lib/social_stream/models/subject.rb +9 -1
- data/lib/social_stream/rails.rb +2 -0
- data/lib/social_stream/version.rb +1 -1
- data/social_stream.gemspec +4 -1
- data/spec/dummy/config/initializers/devise.rb +71 -40
- data/spec/dummy/config/initializers/social_stream.rb +2 -2
- data/spec/dummy/config/relations.yml +25 -20
- data/spec/dummy/script/rails +0 -0
- data/spec/models/activity_spec.rb +3 -3
- data/spec/models/tie_spec.rb +1 -1
- metadata +78 -24
data/spec/models/tie_spec.rb
CHANGED
@@ -40,7 +40,7 @@ describe Tie do
|
|
40
40
|
|
41
41
|
it "creates activity" do
|
42
42
|
Tie.allowing(@s, 'create', 'activity').should include(@tie)
|
43
|
-
Tie.allowing(@s, 'create', 'activity').
|
43
|
+
Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
|
44
44
|
end
|
45
45
|
|
46
46
|
it "reads activity" do
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: social_stream
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 31
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 3
|
9
|
-
-
|
10
|
-
version: 0.3.
|
9
|
+
- 6
|
10
|
+
version: 0.3.6
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- GING - DIT - UPM
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-03-
|
19
|
+
date: 2011-03-09 00:00:00 +01:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
@@ -75,12 +75,12 @@ dependencies:
|
|
75
75
|
requirements:
|
76
76
|
- - ~>
|
77
77
|
- !ruby/object:Gem::Version
|
78
|
-
hash:
|
78
|
+
hash: 7712074
|
79
79
|
segments:
|
80
80
|
- 1
|
81
|
-
-
|
82
|
-
-
|
83
|
-
version: 1.
|
81
|
+
- 2
|
82
|
+
- rc
|
83
|
+
version: 1.2.rc
|
84
84
|
type: :runtime
|
85
85
|
version_requirements: *id004
|
86
86
|
- !ruby/object:Gem::Dependency
|
@@ -180,9 +180,43 @@ dependencies:
|
|
180
180
|
type: :runtime
|
181
181
|
version_requirements: *id010
|
182
182
|
- !ruby/object:Gem::Dependency
|
183
|
-
name:
|
183
|
+
name: omniauth
|
184
184
|
prerelease: false
|
185
185
|
requirement: &id011 !ruby/object:Gem::Requirement
|
186
|
+
none: false
|
187
|
+
requirements:
|
188
|
+
- - ~>
|
189
|
+
- !ruby/object:Gem::Version
|
190
|
+
hash: 299253593
|
191
|
+
segments:
|
192
|
+
- 0
|
193
|
+
- 2
|
194
|
+
- 0
|
195
|
+
- beta5
|
196
|
+
version: 0.2.0.beta5
|
197
|
+
type: :runtime
|
198
|
+
version_requirements: *id011
|
199
|
+
- !ruby/object:Gem::Dependency
|
200
|
+
name: oauth-plugin
|
201
|
+
prerelease: false
|
202
|
+
requirement: &id012 !ruby/object:Gem::Requirement
|
203
|
+
none: false
|
204
|
+
requirements:
|
205
|
+
- - ~>
|
206
|
+
- !ruby/object:Gem::Version
|
207
|
+
hash: 270495424
|
208
|
+
segments:
|
209
|
+
- 0
|
210
|
+
- 4
|
211
|
+
- 0
|
212
|
+
- pre1
|
213
|
+
version: 0.4.0.pre1
|
214
|
+
type: :runtime
|
215
|
+
version_requirements: *id012
|
216
|
+
- !ruby/object:Gem::Dependency
|
217
|
+
name: rails
|
218
|
+
prerelease: false
|
219
|
+
requirement: &id013 !ruby/object:Gem::Requirement
|
186
220
|
none: false
|
187
221
|
requirements:
|
188
222
|
- - ~>
|
@@ -194,11 +228,11 @@ dependencies:
|
|
194
228
|
- 5
|
195
229
|
version: 3.0.5
|
196
230
|
type: :development
|
197
|
-
version_requirements: *
|
231
|
+
version_requirements: *id013
|
198
232
|
- !ruby/object:Gem::Dependency
|
199
233
|
name: capybara
|
200
234
|
prerelease: false
|
201
|
-
requirement: &
|
235
|
+
requirement: &id014 !ruby/object:Gem::Requirement
|
202
236
|
none: false
|
203
237
|
requirements:
|
204
238
|
- - ~>
|
@@ -210,11 +244,11 @@ dependencies:
|
|
210
244
|
- 9
|
211
245
|
version: 0.3.9
|
212
246
|
type: :development
|
213
|
-
version_requirements: *
|
247
|
+
version_requirements: *id014
|
214
248
|
- !ruby/object:Gem::Dependency
|
215
249
|
name: sqlite3-ruby
|
216
250
|
prerelease: false
|
217
|
-
requirement: &
|
251
|
+
requirement: &id015 !ruby/object:Gem::Requirement
|
218
252
|
none: false
|
219
253
|
requirements:
|
220
254
|
- - ">="
|
@@ -224,11 +258,11 @@ dependencies:
|
|
224
258
|
- 0
|
225
259
|
version: "0"
|
226
260
|
type: :development
|
227
|
-
version_requirements: *
|
261
|
+
version_requirements: *id015
|
228
262
|
- !ruby/object:Gem::Dependency
|
229
263
|
name: ruby-debug
|
230
264
|
prerelease: false
|
231
|
-
requirement: &
|
265
|
+
requirement: &id016 !ruby/object:Gem::Requirement
|
232
266
|
none: false
|
233
267
|
requirements:
|
234
268
|
- - ~>
|
@@ -240,11 +274,11 @@ dependencies:
|
|
240
274
|
- 3
|
241
275
|
version: 0.10.3
|
242
276
|
type: :development
|
243
|
-
version_requirements: *
|
277
|
+
version_requirements: *id016
|
244
278
|
- !ruby/object:Gem::Dependency
|
245
279
|
name: rspec-rails
|
246
280
|
prerelease: false
|
247
|
-
requirement: &
|
281
|
+
requirement: &id017 !ruby/object:Gem::Requirement
|
248
282
|
none: false
|
249
283
|
requirements:
|
250
284
|
- - ~>
|
@@ -256,11 +290,11 @@ dependencies:
|
|
256
290
|
- 0
|
257
291
|
version: 2.5.0
|
258
292
|
type: :development
|
259
|
-
version_requirements: *
|
293
|
+
version_requirements: *id017
|
260
294
|
- !ruby/object:Gem::Dependency
|
261
295
|
name: factory_girl
|
262
296
|
prerelease: false
|
263
|
-
requirement: &
|
297
|
+
requirement: &id018 !ruby/object:Gem::Requirement
|
264
298
|
none: false
|
265
299
|
requirements:
|
266
300
|
- - ~>
|
@@ -272,11 +306,11 @@ dependencies:
|
|
272
306
|
- 2
|
273
307
|
version: 1.3.2
|
274
308
|
type: :development
|
275
|
-
version_requirements: *
|
309
|
+
version_requirements: *id018
|
276
310
|
- !ruby/object:Gem::Dependency
|
277
311
|
name: forgery
|
278
312
|
prerelease: false
|
279
|
-
requirement: &
|
313
|
+
requirement: &id019 !ruby/object:Gem::Requirement
|
280
314
|
none: false
|
281
315
|
requirements:
|
282
316
|
- - ~>
|
@@ -288,11 +322,11 @@ dependencies:
|
|
288
322
|
- 6
|
289
323
|
version: 0.3.6
|
290
324
|
type: :development
|
291
|
-
version_requirements: *
|
325
|
+
version_requirements: *id019
|
292
326
|
- !ruby/object:Gem::Dependency
|
293
327
|
name: ci_reporter
|
294
328
|
prerelease: false
|
295
|
-
requirement: &
|
329
|
+
requirement: &id020 !ruby/object:Gem::Requirement
|
296
330
|
none: false
|
297
331
|
requirements:
|
298
332
|
- - ~>
|
@@ -304,7 +338,23 @@ dependencies:
|
|
304
338
|
- 4
|
305
339
|
version: 1.6.4
|
306
340
|
type: :development
|
307
|
-
version_requirements: *
|
341
|
+
version_requirements: *id020
|
342
|
+
- !ruby/object:Gem::Dependency
|
343
|
+
name: nifty-generators
|
344
|
+
prerelease: false
|
345
|
+
requirement: &id021 !ruby/object:Gem::Requirement
|
346
|
+
none: false
|
347
|
+
requirements:
|
348
|
+
- - ~>
|
349
|
+
- !ruby/object:Gem::Version
|
350
|
+
hash: 5
|
351
|
+
segments:
|
352
|
+
- 0
|
353
|
+
- 4
|
354
|
+
- 5
|
355
|
+
version: 0.4.5
|
356
|
+
type: :development
|
357
|
+
version_requirements: *id021
|
308
358
|
description: Ruby on Rails engine supporting social networking features and activity streams.
|
309
359
|
email:
|
310
360
|
executables: []
|
@@ -322,6 +372,7 @@ files:
|
|
322
372
|
- README.rdoc
|
323
373
|
- Rakefile
|
324
374
|
- app/controllers/activities_controller.rb
|
375
|
+
- app/controllers/authentications_controller.rb
|
325
376
|
- app/controllers/comments_controller.rb
|
326
377
|
- app/controllers/contacts_controller.rb
|
327
378
|
- app/controllers/frontpage_controller.rb
|
@@ -329,6 +380,7 @@ files:
|
|
329
380
|
- app/controllers/home_controller.rb
|
330
381
|
- app/controllers/likes_controller.rb
|
331
382
|
- app/controllers/messages_controller.rb
|
383
|
+
- app/controllers/omniauth_callbacks_controller.rb
|
332
384
|
- app/controllers/posts_controller.rb
|
333
385
|
- app/controllers/representations_controller.rb
|
334
386
|
- app/controllers/ties_controller.rb
|
@@ -344,6 +396,7 @@ files:
|
|
344
396
|
- app/models/activity_object_activity.rb
|
345
397
|
- app/models/activity_verb.rb
|
346
398
|
- app/models/actor.rb
|
399
|
+
- app/models/authentication.rb
|
347
400
|
- app/models/comment.rb
|
348
401
|
- app/models/group.rb
|
349
402
|
- app/models/message.rb
|
@@ -442,6 +495,7 @@ files:
|
|
442
495
|
- app/views/users/show.html.erb
|
443
496
|
- app/views/users/update.js.erb
|
444
497
|
- bin/social_stream
|
498
|
+
- bin/social_stream_heroku
|
445
499
|
- config/locales/en.yml
|
446
500
|
- config/routes.rb
|
447
501
|
- lib/generators/social_stream/USAGE
|