social_stream-base 0.12.1 → 0.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (59) hide show
  1. data/app/assets/images/flags/en.png +0 -0
  2. data/app/assets/images/flags/es.png +0 -0
  3. data/app/assets/javascripts/toolbar.js +22 -1
  4. data/app/assets/stylesheets/activities.css.scss +1 -1
  5. data/app/assets/stylesheets/cheesecake.css.scss +46 -4
  6. data/app/assets/stylesheets/settings.css +11 -0
  7. data/app/controllers/cheesecake_controller.rb +15 -3
  8. data/app/controllers/contacts_controller.rb +2 -0
  9. data/app/controllers/conversations_controller.rb +5 -5
  10. data/app/controllers/likes_controller.rb +1 -1
  11. data/app/helpers/notifications_helper.rb +10 -0
  12. data/app/models/activity.rb +55 -36
  13. data/app/models/activity_object.rb +3 -23
  14. data/app/models/actor.rb +20 -4
  15. data/app/models/channel.rb +13 -1
  16. data/app/models/comment.rb +4 -0
  17. data/app/models/contact.rb +55 -19
  18. data/app/models/group.rb +5 -2
  19. data/app/models/like.rb +2 -2
  20. data/app/models/relation/custom.rb +1 -1
  21. data/app/models/tie.rb +4 -3
  22. data/app/views/cheesecake/_cheesecake.html.erb +63 -0
  23. data/app/views/cheesecake/_index.html.erb +43 -86
  24. data/app/views/cheesecake/index.html.erb +2 -0
  25. data/app/views/cheesecake/update.js.erb +3 -0
  26. data/app/views/devise/passwords/new.html.erb +1 -1
  27. data/app/views/devise/registrations/new.html.erb +1 -1
  28. data/app/views/devise/sessions/new.html.erb +1 -1
  29. data/app/{assets/stylesheets/0_devise_sign.css → views/layouts/_devise_style.html.erb} +3 -1
  30. data/app/views/layouts/_header_signed_in.erb +1 -1
  31. data/app/views/message_mailer/new_message_email.html.erb +2 -1
  32. data/app/views/message_mailer/new_message_email.text.erb +2 -1
  33. data/app/views/message_mailer/reply_message_email.html.erb +2 -1
  34. data/app/views/message_mailer/reply_message_email.text.erb +2 -1
  35. data/app/views/notification_mailer/new_notification_email.html.erb +2 -1
  36. data/app/views/notification_mailer/new_notification_email.text.erb +2 -1
  37. data/app/views/notifications/activities/_post.html.erb +24 -1
  38. data/app/views/notifications/activities/_post.text.erb +22 -3
  39. data/app/views/settings/_language.html.erb +1 -1
  40. data/config/locales/en.yml +3 -2
  41. data/config/locales/es.yml +4 -3
  42. data/config/routes.rb +1 -0
  43. data/db/migrate/20120111141717_activity_channels.rb +74 -0
  44. data/lib/social_stream-base.rb +1 -0
  45. data/lib/social_stream/base/engine.rb +2 -1
  46. data/lib/social_stream/base/version.rb +1 -1
  47. data/lib/social_stream/models/channeled.rb +50 -0
  48. data/lib/social_stream/models/object.rb +4 -13
  49. data/lib/social_stream/toolbar_config/base.rb +1 -1
  50. data/lib/tasks/db/populate.rake +1 -1
  51. data/social_stream-base.gemspec +2 -2
  52. data/spec/controllers/comments_controller_spec.rb +3 -3
  53. data/spec/factories/activity.rb +3 -3
  54. data/spec/factories/contact.rb +2 -0
  55. data/spec/models/activity_authorization_spec.rb +5 -1
  56. data/spec/models/like_spec.rb +3 -3
  57. data/spec/models/tie_spec.rb +4 -4
  58. metadata +70 -64
  59. data/vendor/assets/javascripts/menu.js +0 -25
@@ -76,7 +76,7 @@ module SocialStream
76
76
  :url => new_message_path,
77
77
  :options => {:link =>{:remote=> false}}}
78
78
  items << { :key => :message_inbox,
79
- :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
79
+ :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.unread_messages_count.to_s + ')',
80
80
  :url => conversations_path,
81
81
  :options => {:link =>{:remote=> false}}}
82
82
  items << { :key => :message_sentbox,
@@ -12,7 +12,7 @@ namespace :db do
12
12
  require 'forgery'
13
13
 
14
14
  LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
15
- LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i if ENV["LOGOS_TOTAL"].present?
15
+ LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
16
16
  USERS = (ENV["USERS"] || 9).to_i
17
17
  GROUPS = (ENV["GROUPS"] || 10).to_i
18
18
  CHEESECAKE = (ENV["CHEESECAKE"].present? || false)
@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
34
34
  # Authorization
35
35
  s.add_runtime_dependency('cancan', '~> 1.6.4')
36
36
  # Pagination
37
- s.add_runtime_dependency('kaminari', '~> 0.12.4')
37
+ s.add_runtime_dependency('kaminari', '~> 0.13.0')
38
38
  # OAuth client
39
39
  s.add_runtime_dependency('omniauth','~> 0.2.6')
40
40
  # Messages
41
- s.add_runtime_dependency('mailboxer','~> 0.5.4')
41
+ s.add_runtime_dependency('mailboxer','~> 0.6.0')
42
42
  # Tagging
43
43
  s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
44
44
  # HTML Forms
@@ -13,7 +13,7 @@ describe CommentsController do
13
13
 
14
14
  describe "comment from user" do
15
15
  before do
16
- activity = Factory(:self_activity, :contact => Factory(:self_contact, :sender => @user.actor))
16
+ activity = Factory(:self_activity, :channel => @user.self_channel)
17
17
 
18
18
  model_attributes[:author_id] = @user.actor_id
19
19
  model_attributes[:owner_id] = @user.actor_id
@@ -38,7 +38,7 @@ describe CommentsController do
38
38
  describe "comment to friend" do
39
39
  before do
40
40
  f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
41
- activity = Factory(:self_activity, :contact => f.contact_to!(f))
41
+ activity = Factory(:self_activity, :channel => f.contact_to!(f).channel)
42
42
 
43
43
  model_attributes[:author_id] = @user.actor_id
44
44
  model_attributes[:owner_id] = f.id
@@ -52,7 +52,7 @@ describe CommentsController do
52
52
  describe "post to acquaintance" do
53
53
  before do
54
54
  a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
55
- activity = Factory(:self_activity, :contact => a.contact_to!(a))
55
+ activity = Factory(:self_activity, :channel => a.self_channel)
56
56
 
57
57
  model_attributes[:author_id] = @user.actor_id
58
58
  model_attributes[:owner_id] = a.id
@@ -23,14 +23,14 @@ end
23
23
  ## End of helpers
24
24
 
25
25
  Factory.define :activity do |a|
26
- a.contact { Factory(:friend).contact }
26
+ a.channel { Factory(:friend).contact.channel }
27
27
  a.activity_verb { ActivityVerb["post"] }
28
28
  a.relation_ids { |b| Array(b.sender.relation_custom('friend').id) }
29
29
  a.activity_object_ids { Array(Factory(:post_spec_helper).activity_object_spec_helper.id) }
30
30
  end
31
31
 
32
32
  Factory.define :self_activity, :parent => :activity do |a|
33
- a.contact { Factory(:self_contact) }
33
+ a.channel { Factory(:self_contact).channel }
34
34
  a.relation_ids { |b| Array(b.sender.relation_custom('friend').id) }
35
35
  end
36
36
 
@@ -40,7 +40,7 @@ end
40
40
 
41
41
  Factory.define :like_activity, :class => 'Activity' do |a|
42
42
  a.association :parent, :factory => :activity
43
- a.contact { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender) }
43
+ a.channel { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender).channel }
44
44
  a.activity_verb { ActivityVerb["like"] }
45
45
  a.relation_ids { |b| b.parent.relation_ids }
46
46
  a.after_build{ |b| b.activity_object_ids = b.parent.activity_object_ids }
@@ -1,6 +1,7 @@
1
1
  Factory.define :contact do |c|
2
2
  c.sender { |s| Factory(:user).actor }
3
3
  c.receiver { |r| Factory(:user).actor }
4
+ c.user_author { |d| d.sender }
4
5
  end
5
6
 
6
7
  Factory.define :self_contact, :parent => :contact do |c|
@@ -9,6 +10,7 @@ end
9
10
 
10
11
  Factory.define :group_contact, :parent => :contact do |g|
11
12
  g.sender { |s| Factory(:group).actor }
13
+ g.after_build { |h| h.user_author = h.sender.user_author }
12
14
  end
13
15
 
14
16
  Factory.define :g2g_contact, :parent => :group_contact do |g|
@@ -281,7 +281,11 @@ describe Activity do
281
281
  describe "build to non replied contact" do
282
282
  before do
283
283
  @tie = Factory(:friend, :contact => Factory(:contact, :sender => @user.actor))
284
- @activity = Activity.new :contact_id => @tie.contact.id
284
+ partner = @tie.receiver
285
+ @activity = Activity.new :author => @user.actor,
286
+ :user_author => @user.author,
287
+ :owner => partner
288
+
285
289
  create_ability_accessed_by @tie.sender_subject
286
290
  end
287
291
 
@@ -20,7 +20,7 @@ describe Like do
20
20
  describe "actor" do
21
21
  shared_examples_for "creates activity" do
22
22
  it "should recognize the user who likes it" do
23
- Like.build(@sender, @receiver).save
23
+ Like.build(@sender, @sender, @receiver).save
24
24
 
25
25
  assert @receiver.liked_by?(@sender)
26
26
  end
@@ -28,13 +28,13 @@ describe Like do
28
28
  it "should increment like count" do
29
29
  count = @receiver.like_count
30
30
 
31
- Like.build(@sender, @receiver).save
31
+ Like.build(@sender, @sender, @receiver).save
32
32
 
33
33
  @receiver.like_count.should eq(count + 1)
34
34
  end
35
35
 
36
36
  it "should decrement like count" do
37
- @like = Like.build(@sender, @receiver)
37
+ @like = Like.build(@sender, @sender, @receiver)
38
38
  @like.save
39
39
 
40
40
  count = @receiver.like_count
@@ -41,8 +41,8 @@ describe Tie do
41
41
  end
42
42
 
43
43
  it "should create activity with follow verb" do
44
- @tie.contact.activities.should be_present
45
- @tie.contact.activities.first.verb.should eq('follow')
44
+ @tie.contact.channel.activities.should be_present
45
+ @tie.contact.channel.activities.first.verb.should eq('follow')
46
46
  end
47
47
 
48
48
  context "reciprocal" do
@@ -51,8 +51,8 @@ describe Tie do
51
51
  end
52
52
 
53
53
  it "should create activity with make-friend verb" do
54
- @reciprocal.contact.activities.should be_present
55
- @reciprocal.contact.activities.first.verb.should eq('make-friend')
54
+ @reciprocal.contact.channel.activities.should be_present
55
+ @reciprocal.contact.channel.activities.first.verb.should eq('make-friend')
56
56
  end
57
57
  end
58
58
 
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.12.1
4
+ version: 0.13.0
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-01-13 00:00:00.000000000Z
13
+ date: 2012-01-23 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &81513820 !ruby/object:Gem::Requirement
17
+ requirement: &87147360 !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: *81513820
25
+ version_requirements: *87147360
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ancestry
28
- requirement: &81511060 !ruby/object:Gem::Requirement
28
+ requirement: &87146580 !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: *81511060
36
+ version_requirements: *87146580
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: foreigner
39
- requirement: &81510560 !ruby/object:Gem::Requirement
39
+ requirement: &87146010 !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: *81510560
47
+ version_requirements: *87146010
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: devise
50
- requirement: &81510130 !ruby/object:Gem::Requirement
50
+ requirement: &87145600 !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: *81510130
58
+ version_requirements: *87145600
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: inherited_resources
61
- requirement: &81509650 !ruby/object:Gem::Requirement
61
+ requirement: &87145150 !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: *81509650
69
+ version_requirements: *87145150
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: stringex
72
- requirement: &81509240 !ruby/object:Gem::Requirement
72
+ requirement: &87144860 !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: *81509240
80
+ version_requirements: *87144860
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: avatars_for_rails
83
- requirement: &81508890 !ruby/object:Gem::Requirement
83
+ requirement: &87144600 !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: *81508890
91
+ version_requirements: *87144600
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: jquery-rails
94
- requirement: &81508570 !ruby/object:Gem::Requirement
94
+ requirement: &87144290 !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: *81508570
102
+ version_requirements: *87144290
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: cancan
105
- requirement: &81508100 !ruby/object:Gem::Requirement
105
+ requirement: &87144010 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,21 +110,21 @@ dependencies:
110
110
  version: 1.6.4
111
111
  type: :runtime
112
112
  prerelease: false
113
- version_requirements: *81508100
113
+ version_requirements: *87144010
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
- requirement: &81507680 !ruby/object:Gem::Requirement
116
+ requirement: &87143760 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
120
120
  - !ruby/object:Gem::Version
121
- version: 0.12.4
121
+ version: 0.13.0
122
122
  type: :runtime
123
123
  prerelease: false
124
- version_requirements: *81507680
124
+ version_requirements: *87143760
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth
127
- requirement: &81506890 !ruby/object:Gem::Requirement
127
+ requirement: &87143510 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ~>
@@ -132,21 +132,21 @@ dependencies:
132
132
  version: 0.2.6
133
133
  type: :runtime
134
134
  prerelease: false
135
- version_requirements: *81506890
135
+ version_requirements: *87143510
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: mailboxer
138
- requirement: &81491250 !ruby/object:Gem::Requirement
138
+ requirement: &87143260 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ~>
142
142
  - !ruby/object:Gem::Version
143
- version: 0.5.4
143
+ version: 0.6.0
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *81491250
146
+ version_requirements: *87143260
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: acts-as-taggable-on
149
- requirement: &81488420 !ruby/object:Gem::Requirement
149
+ requirement: &87142970 !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: *81488420
157
+ version_requirements: *87142970
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: formtastic
160
- requirement: &81484750 !ruby/object:Gem::Requirement
160
+ requirement: &87136950 !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: *81484750
168
+ version_requirements: *87136950
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: simple-navigation
171
- requirement: &81478410 !ruby/object:Gem::Requirement
171
+ requirement: &87136310 !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: *81478410
179
+ version_requirements: *87136310
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: resque
182
- requirement: &81476140 !ruby/object:Gem::Requirement
182
+ requirement: &87135970 !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: *81476140
190
+ version_requirements: *87135970
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: modernizr-rails
193
- requirement: &81472400 !ruby/object:Gem::Requirement
193
+ requirement: &87135410 !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: *81472400
201
+ version_requirements: *87135410
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: thinking-sphinx
204
- requirement: &82552000 !ruby/object:Gem::Requirement
204
+ requirement: &87134490 !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: *82552000
212
+ version_requirements: *87134490
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: sass-rails
215
- requirement: &82558110 !ruby/object:Gem::Requirement
215
+ requirement: &87133610 !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: *82558110
223
+ version_requirements: *87133610
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: rails_autolink
226
- requirement: &82566760 !ruby/object:Gem::Requirement
226
+ requirement: &87133290 !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: *82566760
234
+ version_requirements: *87133290
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: social_cheesecake
237
- requirement: &82569140 !ruby/object:Gem::Requirement
237
+ requirement: &87132800 !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: *82569140
245
+ version_requirements: *87132800
246
246
  - !ruby/object:Gem::Dependency
247
247
  name: capybara
248
- requirement: &82570980 !ruby/object:Gem::Requirement
248
+ requirement: &87132280 !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: *82570980
256
+ version_requirements: *87132280
257
257
  - !ruby/object:Gem::Dependency
258
258
  name: sqlite3-ruby
259
- requirement: &82584710 !ruby/object:Gem::Requirement
259
+ requirement: &87131910 !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: *82584710
267
+ version_requirements: *87131910
268
268
  - !ruby/object:Gem::Dependency
269
269
  name: ruby-debug19
270
- requirement: &83226840 !ruby/object:Gem::Requirement
270
+ requirement: &87131520 !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: *83226840
278
+ version_requirements: *87131520
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: rspec-rails
281
- requirement: &84254960 !ruby/object:Gem::Requirement
281
+ requirement: &87131120 !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: *84254960
289
+ version_requirements: *87131120
290
290
  - !ruby/object:Gem::Dependency
291
291
  name: factory_girl
292
- requirement: &84656010 !ruby/object:Gem::Requirement
292
+ requirement: &87130760 !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: *84656010
300
+ version_requirements: *87130760
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: forgery
303
- requirement: &84751720 !ruby/object:Gem::Requirement
303
+ requirement: &87130370 !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: *84751720
311
+ version_requirements: *87130370
312
312
  - !ruby/object:Gem::Dependency
313
313
  name: ci_reporter
314
- requirement: &84867950 !ruby/object:Gem::Requirement
314
+ requirement: &87129950 !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: *84867950
322
+ version_requirements: *87129950
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: nifty-generators
325
- requirement: &84959500 !ruby/object:Gem::Requirement
325
+ requirement: &87129440 !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: *84959500
333
+ version_requirements: *87129440
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
 
@@ -454,6 +454,8 @@ files:
454
454
  - app/assets/images/cancel.png
455
455
  - app/assets/images/cleditor/buttons.gif
456
456
  - app/assets/images/cleditor/toolbar.gif
457
+ - app/assets/images/flags/en.png
458
+ - app/assets/images/flags/es.png
457
459
  - app/assets/images/frontpage/collaborate.png
458
460
  - app/assets/images/frontpage/comments.png
459
461
  - app/assets/images/frontpage/green_sq.png
@@ -519,7 +521,6 @@ files:
519
521
  - app/assets/javascripts/ties.js
520
522
  - app/assets/javascripts/toolbar.js
521
523
  - app/assets/javascripts/users.js
522
- - app/assets/stylesheets/0_devise_sign.css
523
524
  - app/assets/stylesheets/_colors.scss
524
525
  - app/assets/stylesheets/activities.css.scss
525
526
  - app/assets/stylesheets/base.css.scss
@@ -589,6 +590,7 @@ files:
589
590
  - app/helpers/contacts_helper.rb
590
591
  - app/helpers/groups_helper.rb
591
592
  - app/helpers/location_helper.rb
593
+ - app/helpers/notifications_helper.rb
592
594
  - app/helpers/permissions_helper.rb
593
595
  - app/helpers/profiles_helper.rb
594
596
  - app/helpers/search_helper.rb
@@ -639,8 +641,10 @@ files:
639
641
  - app/views/api/activity_atom_feed.atom.builder
640
642
  - app/views/avatars/index.html.erb
641
643
  - app/views/avatars/update.js.erb
644
+ - app/views/cheesecake/_cheesecake.html.erb
642
645
  - app/views/cheesecake/_index.html.erb
643
646
  - app/views/cheesecake/index.html.erb
647
+ - app/views/cheesecake/update.js.erb
644
648
  - app/views/comments/_comment.html.erb
645
649
  - app/views/comments/_new.html.erb
646
650
  - app/views/comments/create.js.erb
@@ -704,6 +708,7 @@ files:
704
708
  - app/views/invitations/new.html.erb
705
709
  - app/views/invitations/new.js.erb
706
710
  - app/views/layouts/_account.html.erb
711
+ - app/views/layouts/_devise_style.html.erb
707
712
  - app/views/layouts/_flash.html.erb
708
713
  - app/views/layouts/_footer.html.erb
709
714
  - app/views/layouts/_header.erb
@@ -822,6 +827,7 @@ files:
822
827
  - db/migrate/20120103103125_add_channels.rb
823
828
  - db/migrate/20120109081509_update_notify_permissions.rb
824
829
  - db/migrate/20120111120920_remove_language_default.rb
830
+ - db/migrate/20120111141717_activity_channels.rb
825
831
  - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
826
832
  - lib/acts_as_taggable_on/social_stream.rb
827
833
  - lib/generators/social_stream/base/install_generator.rb
@@ -844,6 +850,7 @@ files:
844
850
  - lib/social_stream/d3.rb
845
851
  - lib/social_stream/migrations/base.rb
846
852
  - lib/social_stream/migrations/components.rb
853
+ - lib/social_stream/models/channeled.rb
847
854
  - lib/social_stream/models/object.rb
848
855
  - lib/social_stream/models/subject.rb
849
856
  - lib/social_stream/models/subtype.rb
@@ -952,7 +959,6 @@ files:
952
959
  - vendor/assets/javascripts/jquery.validate.js
953
960
  - vendor/assets/javascripts/jquery.validate.old.js
954
961
  - vendor/assets/javascripts/jquery.watermarkinput.js
955
- - vendor/assets/javascripts/menu.js
956
962
  - vendor/assets/javascripts/superfish.js
957
963
  - vendor/assets/stylesheets/carousel.css
958
964
  - vendor/assets/stylesheets/chosen-sprite.png