social_stream 0.18.0 → 0.18.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 (14) hide show
  1. data/base/app/models/activity.rb +6 -1
  2. data/base/app/views/notifications/activities/_post.html.erb +8 -2
  3. data/base/app/views/notifications/activities/_post.text.erb +6 -1
  4. data/base/lib/social_stream/base/version.rb +1 -1
  5. data/documents/app/views/audios/_audio.html.erb +2 -0
  6. data/documents/app/views/documents/_document.html.erb +2 -0
  7. data/documents/app/views/pictures/_picture.html.erb +2 -0
  8. data/documents/app/views/videos/_video.html.erb +2 -0
  9. data/documents/lib/social_stream/documents/version.rb +1 -1
  10. data/documents/social_stream-documents.gemspec +1 -1
  11. data/lib/social_stream/version.rb +1 -1
  12. data/social_stream.gemspec +2 -2
  13. data/social_stream.thor +5 -0
  14. metadata +25 -25
data/base/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/base/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/base/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/base/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
data/documents/app/views/audios/_audio.html.erb CHANGED
@@ -25,3 +25,5 @@
25
25
 
26
26
 
27
27
  <% end %>
28
+
29
+ <div class="clearfloat"></div>
data/documents/app/views/documents/_document.html.erb CHANGED
@@ -13,3 +13,5 @@
13
13
  </div>
14
14
 
15
15
  <% end %>
16
+
17
+ <div class="clearfloat"></div>
data/documents/app/views/pictures/_picture.html.erb CHANGED
@@ -35,3 +35,5 @@
35
35
  imageBlank: 'assets/lightbox-blank.gif'});
36
36
  })
37
37
  <% end %>
38
+
39
+ <div class="clearfloat"></div>
data/documents/app/views/videos/_video.html.erb CHANGED
@@ -27,3 +27,5 @@
27
27
  <% end %>
28
28
 
29
29
  <% end %>
30
+
31
+ <div class="clearfloat"></div>
data/documents/lib/social_stream/documents/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Documents
3
- VERSION = "0.8.0".freeze
3
+ VERSION = "0.8.1".freeze
4
4
  end
5
5
  end
data/documents/social_stream-documents.gemspec CHANGED
@@ -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.13.0')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.13.1')
16
16
  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
17
17
  # Waiting for version > 2.4.5, which fixes:
18
18
  # https://github.com/thoughtbot/paperclip/issues/293
data/lib/social_stream/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SocialStream
2
- VERSION = "0.18.0".freeze
2
+ VERSION = "0.18.1".freeze
3
3
  end
data/social_stream.gemspec CHANGED
@@ -11,8 +11,8 @@ 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.13.0')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.8.0')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.13.1')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.8.1')
16
16
  s.add_runtime_dependency('social_stream-events', '~> 0.5.0')
17
17
  s.add_runtime_dependency('social_stream-linkser', '~> 0.3.0')
18
18
  s.add_runtime_dependency('social_stream-presence', '~> 0.4.0')
data/social_stream.thor CHANGED
@@ -3,6 +3,11 @@ require File.expand_path('../lib/social_stream/release', __FILE__)
3
3
  # SocialStream release tasks
4
4
  class SocialStream < Thor
5
5
 
6
+ desc "create", "update dependencies and release SocialStream's gems"
7
+ def create(*args)
8
+ ::SocialStream::Release.create *args
9
+ end
10
+
6
11
  desc "release", "release SocialStream's gems"
7
12
  def release(*args)
8
13
  ::SocialStream::Release.release
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.18.0
4
+ version: 0.18.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,29 +14,29 @@ date: 2012-01-23 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &86262010 !ruby/object:Gem::Requirement
17
+ requirement: &84213310 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.13.0
22
+ version: 0.13.1
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *86262010
25
+ version_requirements: *84213310
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: social_stream-documents
28
- requirement: &86261700 !ruby/object:Gem::Requirement
28
+ requirement: &84212550 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.8.0
33
+ version: 0.8.1
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *86261700
36
+ version_requirements: *84212550
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: social_stream-events
39
- requirement: &86261400 !ruby/object:Gem::Requirement
39
+ requirement: &84210660 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 0.5.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *86261400
47
+ version_requirements: *84210660
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: social_stream-linkser
50
- requirement: &86260980 !ruby/object:Gem::Requirement
50
+ requirement: &84210210 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 0.3.0
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *86260980
58
+ version_requirements: *84210210
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: social_stream-presence
61
- requirement: &86260180 !ruby/object:Gem::Requirement
61
+ requirement: &84209880 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 0.4.0
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *86260180
69
+ version_requirements: *84209880
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: capybara
72
- requirement: &86259520 !ruby/object:Gem::Requirement
72
+ requirement: &84209470 !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: *86259520
80
+ version_requirements: *84209470
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: sqlite3
83
- requirement: &86258730 !ruby/object:Gem::Requirement
83
+ requirement: &84209030 !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: *86258730
91
+ version_requirements: *84209030
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: rspec-rails
94
- requirement: &86258330 !ruby/object:Gem::Requirement
94
+ requirement: &84208350 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ~>
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: 2.5.0
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *86258330
102
+ version_requirements: *84208350
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: factory_girl
105
- requirement: &86257640 !ruby/object:Gem::Requirement
105
+ requirement: &84207660 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: 1.3.2
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *86257640
113
+ version_requirements: *84207660
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: forgery
116
- requirement: &86257150 !ruby/object:Gem::Requirement
116
+ requirement: &84206820 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: 0.4.2
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *86257150
124
+ version_requirements: *84206820
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: ci_reporter
127
- requirement: &86256680 !ruby/object:Gem::Requirement
127
+ requirement: &84205720 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ~>
@@ -132,7 +132,7 @@ dependencies:
132
132
  version: 1.6.4
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *86256680
135
+ version_requirements: *84205720
136
136
  description: Social Stream is a Ruby on Rails engine for building social network websites.
137
137
  It supports contacts, posts, file uploads, private messages and many more.
138
138
  email: