social_stream 0.18.0 → 0.18.1

data/base/app/models/activity.rb

@@ -348,7 +348,12 @@ class Activity < ActiveRecord::Base
               :sender => sender_name,
 	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
 	                       :receiver => receiver_name),
-	      :title => 'Re: ' + direct_object.parent_post.text.truncate(30, :separator => ' '))
+	      :title => if direct_object.parent_post.is_a? Post
+	                  'Re: ' + direct_object.parent_post.text.truncate(30, :separator => ' ')
+			elsif direct_object.parent_post.respond_to? :title
+	                  'Re: ' + direct_object.parent_post.title.truncate(30, :separator => ' ')
+			else t('notification.default')
+	                end)
 	elsif direct_object.is_a? Post
           I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
               :sender => sender_name,

data/base/app/views/notifications/activities/_post.html.erb

@@ -5,8 +5,14 @@
                       polymorphic_url(activity.sender.subject)),
    :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
               :receiver => truncate_name(activity.receiver.name)),
-   :title => link_to(activity.direct_object.parent_post.text.truncate(30, :separator => ' '),
-                     polymorphic_url(activity.direct_object))) %>
+   :title => if activity.direct_object.parent_post.is_a? Post
+               link_to(activity.direct_object.parent_post.text.truncate(30, :separator => ' '),
+                     polymorphic_url(activity.direct_object))
+	     elsif activity.direct_object.parent_post.respond_to? :title
+	       link_to(activity.direct_object.parent_post.title.truncate(30, :separator => ' '),
+	             polymorphic_url(activity.direct_object))
+	     else t('notification.default')
+             end) %>
 <% elsif activity.direct_object.is_a? Post %>
   <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
    :sender => link_to(truncate_name(activity.sender.name), 

data/base/app/views/notifications/activities/_post.text.erb

@@ -4,7 +4,12 @@
            :sender => truncate_name(activity.sender.name),
            :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
                      :receiver => truncate_name(activity.receiver.name)),
-           :title => activity.direct_object.parent_post.text.truncate(30, :separator => ' ')) %>
+           :title => if activity.direct_object.parent_post.is_a? Post
+	               activity.direct_object.parent_post.text.truncate(30, :separator => ' ')
+		     elsif activity.direct_object.parent_post.respond_to? :title
+	               activity.direct_object.parent_post.title.truncate(30, :separator => ' ')
+		     else t('notification.default')
+		     end) %>
 <% elsif activity.direct_object.is_a? Post %>
 <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
            :sender => truncate_name(activity.sender.name),

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.13.0".freeze
+    VERSION = "0.13.1".freeze
   end
 end

data/documents/app/views/audios/_audio.html.erb

@@ -25,3 +25,5 @@
 
 
 <% end %>
+
+<div class="clearfloat"></div>

data/documents/app/views/documents/_document.html.erb

@@ -13,3 +13,5 @@
   </div>
 
 <% end %>
+
+<div class="clearfloat"></div>

data/documents/app/views/pictures/_picture.html.erb

@@ -35,3 +35,5 @@
       imageBlank: 'assets/lightbox-blank.gif'});    
   })
 <% end %>
+
+<div class="clearfloat"></div>

data/documents/app/views/videos/_video.html.erb

@@ -27,3 +27,5 @@
   <% end %>
 
 <% end %>
+
+<div class="clearfloat"></div>

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.8.0".freeze
+    VERSION = "0.8.1".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.1')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   # Waiting for version > 2.4.5, which fixes:
   # https://github.com/thoughtbot/paperclip/issues/293

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.18.0".freeze
+  VERSION = "0.18.1".freeze
 end

data/social_stream.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.8.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.1')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.8.1')
   s.add_runtime_dependency('social_stream-events', '~> 0.5.0')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.3.0')
   s.add_runtime_dependency('social_stream-presence', '~> 0.4.0')

data/social_stream.thor

@@ -3,6 +3,11 @@ require File.expand_path('../lib/social_stream/release', __FILE__)
 # SocialStream release tasks
 class SocialStream < Thor
 
+  desc "create", "update dependencies and release SocialStream's gems"
+  def create(*args)
+    ::SocialStream::Release.create *args
+  end
+
   desc "release", "release SocialStream's gems"
   def release(*args)
     ::SocialStream::Release.release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,29 +14,29 @@ date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &86262010 !ruby/object:Gem::Requirement
+  requirement: &84213310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *86262010
+  version_requirements: *84213310
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &86261700 !ruby/object:Gem::Requirement
+  requirement: &84212550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *86261700
+  version_requirements: *84212550
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &86261400 !ruby/object:Gem::Requirement
+  requirement: &84210660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *86261400
+  version_requirements: *84210660
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &86260980 !ruby/object:Gem::Requirement
+  requirement: &84210210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *86260980
+  version_requirements: *84210210
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &86260180 !ruby/object:Gem::Requirement
+  requirement: &84209880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *86260180
+  version_requirements: *84209880
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &86259520 !ruby/object:Gem::Requirement
+  requirement: &84209470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *86259520
+  version_requirements: *84209470
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &86258730 !ruby/object:Gem::Requirement
+  requirement: &84209030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86258730
+  version_requirements: *84209030
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &86258330 !ruby/object:Gem::Requirement
+  requirement: &84208350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *86258330
+  version_requirements: *84208350
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &86257640 !ruby/object:Gem::Requirement
+  requirement: &84207660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *86257640
+  version_requirements: *84207660
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &86257150 !ruby/object:Gem::Requirement
+  requirement: &84206820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *86257150
+  version_requirements: *84206820
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &86256680 !ruby/object:Gem::Requirement
+  requirement: &84205720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *86256680
+  version_requirements: *84205720
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: