social_stream-base 0.13.0 → 0.13.1

data/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/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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &87147360 !ruby/object:Gem::Requirement
+  requirement: &85797150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *87147360
+  version_requirements: *85797150
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &87146580 !ruby/object:Gem::Requirement
+  requirement: &85796390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *87146580
+  version_requirements: *85796390
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &87146010 !ruby/object:Gem::Requirement
+  requirement: &85793790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *87146010
+  version_requirements: *85793790
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &87145600 !ruby/object:Gem::Requirement
+  requirement: &85793140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *87145600
+  version_requirements: *85793140
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &87145150 !ruby/object:Gem::Requirement
+  requirement: &85792090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *87145150
+  version_requirements: *85792090
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &87144860 !ruby/object:Gem::Requirement
+  requirement: &85791330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *87144860
+  version_requirements: *85791330
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &87144600 !ruby/object:Gem::Requirement
+  requirement: &85790690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *87144600
+  version_requirements: *85790690
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &87144290 !ruby/object:Gem::Requirement
+  requirement: &85789870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *87144290
+  version_requirements: *85789870
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &87144010 !ruby/object:Gem::Requirement
+  requirement: &85789320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *87144010
+  version_requirements: *85789320
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &87143760 !ruby/object:Gem::Requirement
+  requirement: &85788160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *87143760
+  version_requirements: *85788160
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &87143510 !ruby/object:Gem::Requirement
+  requirement: &85787550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *87143510
+  version_requirements: *85787550
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &87143260 !ruby/object:Gem::Requirement
+  requirement: &85786960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *87143260
+  version_requirements: *85786960
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &87142970 !ruby/object:Gem::Requirement
+  requirement: &85786640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *87142970
+  version_requirements: *85786640
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &87136950 !ruby/object:Gem::Requirement
+  requirement: &85785220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *87136950
+  version_requirements: *85785220
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &87136310 !ruby/object:Gem::Requirement
+  requirement: &85784190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *87136310
+  version_requirements: *85784190
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &87135970 !ruby/object:Gem::Requirement
+  requirement: &85783560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *87135970
+  version_requirements: *85783560
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &87135410 !ruby/object:Gem::Requirement
+  requirement: &85783020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *87135410
+  version_requirements: *85783020
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &87134490 !ruby/object:Gem::Requirement
+  requirement: &85782420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *87134490
+  version_requirements: *85782420
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &87133610 !ruby/object:Gem::Requirement
+  requirement: &85781690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *87133610
+  version_requirements: *85781690
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &87133290 !ruby/object:Gem::Requirement
+  requirement: &85780650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *87133290
+  version_requirements: *85780650
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &87132800 !ruby/object:Gem::Requirement
+  requirement: &85779560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *87132800
+  version_requirements: *85779560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &87132280 !ruby/object:Gem::Requirement
+  requirement: &85775610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *87132280
+  version_requirements: *85775610
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &87131910 !ruby/object:Gem::Requirement
+  requirement: &85774270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -264,10 +264,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87131910
+  version_requirements: *85774270
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &87131520 !ruby/object:Gem::Requirement
+  requirement: &85773320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -275,10 +275,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87131520
+  version_requirements: *85773320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &87131120 !ruby/object:Gem::Requirement
+  requirement: &85772320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *87131120
+  version_requirements: *85772320
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &87130760 !ruby/object:Gem::Requirement
+  requirement: &85771400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -297,10 +297,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *87130760
+  version_requirements: *85771400
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &87130370 !ruby/object:Gem::Requirement
+  requirement: &85770840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +308,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *87130370
+  version_requirements: *85770840
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &87129950 !ruby/object:Gem::Requirement
+  requirement: &85770330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *87129950
+  version_requirements: *85770330
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &87129440 !ruby/object:Gem::Requirement
+  requirement: &85769900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,7 +330,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *87129440
+  version_requirements: *85769900
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.