social_stream 0.25.2 → 0.26.0
Sign up to get free protection for your applications and to get access to all the features.
- data/base/app/assets/javascripts/social_stream.follow.js +23 -0
- data/base/app/assets/javascripts/social_stream.wall.js.erb +3 -3
- data/base/app/controllers/search_controller.rb +30 -16
- data/base/app/helpers/location_helper.rb +1 -44
- data/base/app/helpers/search_helper.rb +7 -7
- data/base/app/models/activity.rb +0 -21
- data/base/app/models/activity_action.rb +8 -0
- data/base/app/models/activity_object.rb +55 -25
- data/base/app/models/activity_object_audience.rb +8 -0
- data/base/app/models/actor.rb +9 -0
- data/base/app/models/comment.rb +1 -3
- data/base/app/models/group.rb +3 -0
- data/base/app/models/post.rb +1 -3
- data/base/app/models/relation.rb +5 -0
- data/base/app/models/relation/follow.rb +6 -7
- data/base/app/models/relation/public.rb +5 -0
- data/base/app/models/relation/single.rb +11 -1
- data/base/app/views/activities/_new.html.erb +1 -1
- data/base/app/views/contacts/_link_follow.html.erb +8 -4
- data/base/app/views/followers/update.js.erb +2 -0
- data/base/app/views/layouts/_search.html.erb +2 -2
- data/base/app/views/search/_extended_search.html.erb +17 -17
- data/base/app/views/search/_form.html.erb +4 -4
- data/base/app/views/search/_header_search.html.erb +2 -2
- data/base/app/views/search/index.html.erb +1 -1
- data/base/app/views/search/index.js.erb +4 -4
- data/base/db/migrate/20120403175913_create_activity_object_audiences.rb +34 -0
- data/base/db/migrate/20120411132550_add_visit_count_to_activity_object.rb +9 -0
- data/base/db/migrate/20120411151413_relation_public_permissions.rb +8 -0
- data/base/lib/generators/social_stream/base/templates/initializer.rb +3 -0
- data/base/lib/social_stream-base.rb +2 -1
- data/base/lib/social_stream/ability/base.rb +14 -8
- data/base/lib/social_stream/base/dependencies.rb +1 -0
- data/base/lib/social_stream/base/thinking-sphinx.rb +18 -0
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/social_stream/controllers/objects.rb +6 -0
- data/base/lib/social_stream/test_helpers/controllers.rb +1 -1
- data/base/lib/social_stream/views/location.rb +48 -0
- data/base/lib/tasks/db/populate.rake +1 -1
- data/base/lib/thinking-sphinx/social_stream.rb +3 -0
- data/base/spec/controllers/groups_controller_spec.rb +6 -6
- data/base/spec/controllers/posts_controller_spec.rb +6 -6
- data/base/spec/controllers/users_controller_spec.rb +4 -4
- data/base/spec/dummy/config/initializers/social_stream.rb +3 -0
- data/base/spec/factories/activity.rb +24 -1
- data/base/spec/factories/post.rb +1 -1
- data/base/spec/models/activity_authorization_spec.rb +1 -1
- data/base/spec/models/post_spec.rb +0 -4
- data/base/spec/models/relation_follow_spec.rb +8 -0
- data/documents/app/controllers/documents_controller.rb +1 -1
- data/documents/app/models/audio.rb +2 -5
- data/documents/app/models/document.rb +5 -8
- data/documents/app/models/picture.rb +2 -5
- data/documents/app/models/video.rb +6 -8
- data/documents/app/views/audios/_audio_processing.html.erb +3 -1
- data/documents/app/views/documents/_document.html.erb +12 -3
- data/documents/app/views/pictures/_picture.html.erb +2 -2
- data/documents/app/views/videos/_video_processed.html.erb +2 -2
- data/documents/app/views/videos/_video_processing.html.erb +3 -1
- data/documents/config/locales/en.yml +2 -5
- data/documents/config/locales/es.yml +2 -5
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/lib/tasks/db/populate_documents.rake +1 -1
- data/documents/social_stream-documents.gemspec +1 -1
- data/documents/spec/factories/document.rb +2 -2
- data/documents/spec/factories/picture.rb +2 -2
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +1 -1
- data/lib/social_stream/version.rb +1 -1
- data/linkser/app/models/link.rb +2 -4
- data/linkser/lib/social_stream/linkser/version.rb +1 -1
- data/linkser/lib/tasks/db/populate_links.rake +35 -0
- data/linkser/social_stream-linkser.gemspec +1 -1
- data/presence/lib/social_stream/presence/version.rb +1 -1
- data/presence/social_stream-presence.gemspec +1 -1
- data/social_stream.gemspec +5 -5
- metadata +41 -31
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 0.
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
|
16
16
|
s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
|
17
17
|
s.add_runtime_dependency('paperclip','= 2.4.5')
|
18
18
|
s.add_runtime_dependency('delayed_paperclip','2.4.5.1')
|
@@ -10,12 +10,12 @@ end
|
|
10
10
|
|
11
11
|
Factory.define :public_document, :parent => :document do |d|
|
12
12
|
d.owner_id { |q| q.author_id }
|
13
|
-
d.
|
13
|
+
d.relation_ids { |q| Array(Relation::Public.instance.id) }
|
14
14
|
end
|
15
15
|
|
16
16
|
Factory.define :private_document, :parent => :document do |d|
|
17
17
|
d.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'small.pdf'),
|
18
18
|
'application/pdf') }
|
19
19
|
d.owner_id { |q| q.author_id }
|
20
|
-
d.
|
20
|
+
d.relation_ids { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
|
21
21
|
end
|
@@ -10,13 +10,13 @@ end
|
|
10
10
|
|
11
11
|
Factory.define :public_picture, :parent => :picture do |p|
|
12
12
|
p.owner_id { |q| q.author_id }
|
13
|
-
p.
|
13
|
+
p.relation_ids { |q| Array(Relation::Public.instance.id) }
|
14
14
|
end
|
15
15
|
|
16
16
|
Factory.define :private_picture, :parent => :picture do |p|
|
17
17
|
p.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'privado.png'),
|
18
18
|
'image/png') }
|
19
19
|
p.owner_id { |q| q.author_id }
|
20
|
-
p.
|
20
|
+
p.relation_ids { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
|
21
21
|
end
|
22
22
|
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 0.
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
|
16
16
|
s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
|
17
17
|
s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
|
18
18
|
|
data/linkser/app/models/link.rb
CHANGED
@@ -8,11 +8,9 @@ class Link < ActiveRecord::Base
|
|
8
8
|
before_create :check_loaded
|
9
9
|
|
10
10
|
define_index do
|
11
|
-
|
12
|
-
indexes activity_object.description
|
13
|
-
indexes url
|
11
|
+
activity_object_index
|
14
12
|
|
15
|
-
|
13
|
+
indexes url
|
16
14
|
end
|
17
15
|
|
18
16
|
def fill linkser_object
|
@@ -0,0 +1,35 @@
|
|
1
|
+
namespace :db do
|
2
|
+
namespace :populate do
|
3
|
+
|
4
|
+
desc "Create populate data with documents"
|
5
|
+
task :create => :create_links
|
6
|
+
|
7
|
+
desc "Add links to populate data"
|
8
|
+
task :create_links => :read_environment do
|
9
|
+
puts 'Links population'
|
10
|
+
links_start = Time.now
|
11
|
+
|
12
|
+
50.times do
|
13
|
+
updated = Time.at(rand(Time.now.to_i))
|
14
|
+
author = Actor.all[rand(Actor.all.size)]
|
15
|
+
owner = author
|
16
|
+
user_author = ( author.subject_type == "User" ? author : author.user_author )
|
17
|
+
|
18
|
+
d = Link.create! :title => Forgery::LoremIpsum.words(1+rand(4),:random => true),
|
19
|
+
:description => Forgery::LoremIpsum.sentences(1+rand(4), :random => true),
|
20
|
+
:url => "http://#{ Forgery::Internet.domain_name }",
|
21
|
+
:created_at => Time.at(rand(updated.to_i)),
|
22
|
+
:updated_at => updated,
|
23
|
+
:author_id => author.id,
|
24
|
+
:owner_id => owner.id,
|
25
|
+
:user_author_id => user_author.id,
|
26
|
+
:_relation_ids => [Relation::Public.instance.id]
|
27
|
+
d.save!
|
28
|
+
end
|
29
|
+
|
30
|
+
links_end = Time.now
|
31
|
+
puts ' -> ' + (links_end - links_start).round(4).to_s + 's'
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 0.
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
|
16
16
|
s.add_runtime_dependency('linkser', '~> 0.0.10')
|
17
17
|
# Development Gem dependencies
|
18
18
|
s.add_development_dependency('sqlite3-ruby')
|
data/social_stream.gemspec
CHANGED
@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
|
|
11
11
|
s.files = `git ls-files`.split("\n")
|
12
12
|
|
13
13
|
# Gem dependencies
|
14
|
-
s.add_runtime_dependency('social_stream-base', '~> 0.
|
15
|
-
s.add_runtime_dependency('social_stream-documents', '~> 0.
|
16
|
-
s.add_runtime_dependency('social_stream-events', '~> 0.
|
17
|
-
s.add_runtime_dependency('social_stream-linkser', '~> 0.
|
18
|
-
s.add_runtime_dependency('social_stream-presence', '~> 0.
|
14
|
+
s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
|
15
|
+
s.add_runtime_dependency('social_stream-documents', '~> 0.14.0')
|
16
|
+
s.add_runtime_dependency('social_stream-events', '~> 0.12.0')
|
17
|
+
s.add_runtime_dependency('social_stream-linkser', '~> 0.11.0')
|
18
|
+
s.add_runtime_dependency('social_stream-presence', '~> 0.13.0')
|
19
19
|
|
20
20
|
# Development Gem dependencies
|
21
21
|
#
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: social_stream
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.26.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,66 +10,66 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2012-04-
|
13
|
+
date: 2012-04-23 00:00:00.000000000Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: social_stream-base
|
17
|
-
requirement: &
|
17
|
+
requirement: &75833100 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ~>
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 0.
|
22
|
+
version: 0.20.0
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *75833100
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: social_stream-documents
|
28
|
-
requirement: &
|
28
|
+
requirement: &75832850 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ~>
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.
|
33
|
+
version: 0.14.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *75832850
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: social_stream-events
|
39
|
-
requirement: &
|
39
|
+
requirement: &75832620 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ~>
|
43
43
|
- !ruby/object:Gem::Version
|
44
|
-
version: 0.
|
44
|
+
version: 0.12.0
|
45
45
|
type: :runtime
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *75832620
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: social_stream-linkser
|
50
|
-
requirement: &
|
50
|
+
requirement: &75832390 !ruby/object:Gem::Requirement
|
51
51
|
none: false
|
52
52
|
requirements:
|
53
53
|
- - ~>
|
54
54
|
- !ruby/object:Gem::Version
|
55
|
-
version: 0.
|
55
|
+
version: 0.11.0
|
56
56
|
type: :runtime
|
57
57
|
prerelease: false
|
58
|
-
version_requirements: *
|
58
|
+
version_requirements: *75832390
|
59
59
|
- !ruby/object:Gem::Dependency
|
60
60
|
name: social_stream-presence
|
61
|
-
requirement: &
|
61
|
+
requirement: &75832160 !ruby/object:Gem::Requirement
|
62
62
|
none: false
|
63
63
|
requirements:
|
64
64
|
- - ~>
|
65
65
|
- !ruby/object:Gem::Version
|
66
|
-
version: 0.
|
66
|
+
version: 0.13.0
|
67
67
|
type: :runtime
|
68
68
|
prerelease: false
|
69
|
-
version_requirements: *
|
69
|
+
version_requirements: *75832160
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: capybara
|
72
|
-
requirement: &
|
72
|
+
requirement: &75831930 !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
74
74
|
requirements:
|
75
75
|
- - ~>
|
@@ -77,10 +77,10 @@ dependencies:
|
|
77
77
|
version: 0.3.9
|
78
78
|
type: :development
|
79
79
|
prerelease: false
|
80
|
-
version_requirements: *
|
80
|
+
version_requirements: *75831930
|
81
81
|
- !ruby/object:Gem::Dependency
|
82
82
|
name: sqlite3
|
83
|
-
requirement: &
|
83
|
+
requirement: &75831730 !ruby/object:Gem::Requirement
|
84
84
|
none: false
|
85
85
|
requirements:
|
86
86
|
- - ! '>='
|
@@ -88,10 +88,10 @@ dependencies:
|
|
88
88
|
version: '0'
|
89
89
|
type: :development
|
90
90
|
prerelease: false
|
91
|
-
version_requirements: *
|
91
|
+
version_requirements: *75831730
|
92
92
|
- !ruby/object:Gem::Dependency
|
93
93
|
name: ruby-debug19
|
94
|
-
requirement: &
|
94
|
+
requirement: &75831480 !ruby/object:Gem::Requirement
|
95
95
|
none: false
|
96
96
|
requirements:
|
97
97
|
- - ! '>='
|
@@ -99,10 +99,10 @@ dependencies:
|
|
99
99
|
version: '0'
|
100
100
|
type: :development
|
101
101
|
prerelease: false
|
102
|
-
version_requirements: *
|
102
|
+
version_requirements: *75831480
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
name: rspec-rails
|
105
|
-
requirement: &
|
105
|
+
requirement: &75831230 !ruby/object:Gem::Requirement
|
106
106
|
none: false
|
107
107
|
requirements:
|
108
108
|
- - ~>
|
@@ -110,10 +110,10 @@ dependencies:
|
|
110
110
|
version: 2.8.0
|
111
111
|
type: :development
|
112
112
|
prerelease: false
|
113
|
-
version_requirements: *
|
113
|
+
version_requirements: *75831230
|
114
114
|
- !ruby/object:Gem::Dependency
|
115
115
|
name: factory_girl
|
116
|
-
requirement: &
|
116
|
+
requirement: &75830980 !ruby/object:Gem::Requirement
|
117
117
|
none: false
|
118
118
|
requirements:
|
119
119
|
- - ~>
|
@@ -121,10 +121,10 @@ dependencies:
|
|
121
121
|
version: 1.3.2
|
122
122
|
type: :development
|
123
123
|
prerelease: false
|
124
|
-
version_requirements: *
|
124
|
+
version_requirements: *75830980
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: forgery
|
127
|
-
requirement: &
|
127
|
+
requirement: &75830750 !ruby/object:Gem::Requirement
|
128
128
|
none: false
|
129
129
|
requirements:
|
130
130
|
- - ~>
|
@@ -132,10 +132,10 @@ dependencies:
|
|
132
132
|
version: 0.4.2
|
133
133
|
type: :development
|
134
134
|
prerelease: false
|
135
|
-
version_requirements: *
|
135
|
+
version_requirements: *75830750
|
136
136
|
- !ruby/object:Gem::Dependency
|
137
137
|
name: ci_reporter
|
138
|
-
requirement: &
|
138
|
+
requirement: &75830520 !ruby/object:Gem::Requirement
|
139
139
|
none: false
|
140
140
|
requirements:
|
141
141
|
- - ~>
|
@@ -143,7 +143,7 @@ dependencies:
|
|
143
143
|
version: 1.6.4
|
144
144
|
type: :development
|
145
145
|
prerelease: false
|
146
|
-
version_requirements: *
|
146
|
+
version_requirements: *75830520
|
147
147
|
description: Social Stream is a Ruby on Rails engine for building social network websites.
|
148
148
|
It supports contacts, posts, file uploads, private messages and many more.
|
149
149
|
email:
|
@@ -343,6 +343,7 @@ files:
|
|
343
343
|
- base/app/assets/javascripts/social_stream.action.js
|
344
344
|
- base/app/assets/javascripts/social_stream.activity.js
|
345
345
|
- base/app/assets/javascripts/social_stream.comments.js
|
346
|
+
- base/app/assets/javascripts/social_stream.follow.js
|
346
347
|
- base/app/assets/javascripts/social_stream.objects.js
|
347
348
|
- base/app/assets/javascripts/social_stream.search.js.erb
|
348
349
|
- base/app/assets/javascripts/social_stream.timeline.js
|
@@ -438,6 +439,7 @@ files:
|
|
438
439
|
- base/app/models/activity_action.rb
|
439
440
|
- base/app/models/activity_object.rb
|
440
441
|
- base/app/models/activity_object_activity.rb
|
442
|
+
- base/app/models/activity_object_audience.rb
|
441
443
|
- base/app/models/activity_object_property.rb
|
442
444
|
- base/app/models/activity_verb.rb
|
443
445
|
- base/app/models/actor.rb
|
@@ -673,6 +675,9 @@ files:
|
|
673
675
|
- base/db/migrate/20120316093946_create_activity_actions.rb
|
674
676
|
- base/db/migrate/20120316113728_activity_action_follow.rb
|
675
677
|
- base/db/migrate/20120326083509_object_channels_to_actions.rb
|
678
|
+
- base/db/migrate/20120403175913_create_activity_object_audiences.rb
|
679
|
+
- base/db/migrate/20120411132550_add_visit_count_to_activity_object.rb
|
680
|
+
- base/db/migrate/20120411151413_relation_public_permissions.rb
|
676
681
|
- base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
|
677
682
|
- base/lib/acts_as_taggable_on/social_stream.rb
|
678
683
|
- base/lib/generators/social_stream/base/install_generator.rb
|
@@ -688,6 +693,7 @@ files:
|
|
688
693
|
- base/lib/social_stream/ability/base.rb
|
689
694
|
- base/lib/social_stream/base/dependencies.rb
|
690
695
|
- base/lib/social_stream/base/engine.rb
|
696
|
+
- base/lib/social_stream/base/thinking-sphinx.rb
|
691
697
|
- base/lib/social_stream/base/version.rb
|
692
698
|
- base/lib/social_stream/controllers/cancan_devise_integration.rb
|
693
699
|
- base/lib/social_stream/controllers/helpers.rb
|
@@ -710,11 +716,13 @@ files:
|
|
710
716
|
- base/lib/social_stream/test_helpers.rb
|
711
717
|
- base/lib/social_stream/test_helpers/controllers.rb
|
712
718
|
- base/lib/social_stream/views/list.rb
|
719
|
+
- base/lib/social_stream/views/location.rb
|
713
720
|
- base/lib/social_stream/views/settings/base.rb
|
714
721
|
- base/lib/social_stream/views/sidebar/base.rb
|
715
722
|
- base/lib/social_stream/views/toolbar/base.rb
|
716
723
|
- base/lib/tasks/db/populate.rake
|
717
724
|
- base/lib/tasks/workers.rake
|
725
|
+
- base/lib/thinking-sphinx/social_stream.rb
|
718
726
|
- base/social_stream-base.gemspec
|
719
727
|
- base/spec/controllers/comments_controller_spec.rb
|
720
728
|
- base/spec/controllers/contacts_controller_spec.rb
|
@@ -786,6 +794,7 @@ files:
|
|
786
794
|
- base/spec/models/like_spec.rb
|
787
795
|
- base/spec/models/post_spec.rb
|
788
796
|
- base/spec/models/profile_spec.rb
|
797
|
+
- base/spec/models/relation_follow_spec.rb
|
789
798
|
- base/spec/models/relation_spec.rb
|
790
799
|
- base/spec/models/tie_spec.rb
|
791
800
|
- base/spec/models/user_spec.rb
|
@@ -1131,6 +1140,7 @@ files:
|
|
1131
1140
|
- linkser/lib/social_stream/linkser/engine.rb
|
1132
1141
|
- linkser/lib/social_stream/linkser/version.rb
|
1133
1142
|
- linkser/lib/social_stream/migrations/linkser.rb
|
1143
|
+
- linkser/lib/tasks/db/populate_links.rake
|
1134
1144
|
- linkser/social_stream-linkser.gemspec
|
1135
1145
|
- linkser/spec/dummy/Rakefile
|
1136
1146
|
- linkser/spec/dummy/app/controllers/application_controller.rb
|