social_stream 0.18.1 → 0.18.2

data/base/app/helpers/notifications_helper.rb

@@ -1,5 +1,30 @@
 module NotificationsHelper
 
+  # An activity object title
+  def title_of(act_obj)
+    if act_obj.is_a? Comment
+      'Re: ' + title_of(act_obj.parent_post)
+    elsif act_obj.is_a? Post and (not act_obj.text.nil?)
+      act_obj.text.truncate(30, :separator => ' ')
+    elsif act_obj.respond_to? :title and (not act_obj.title.nil?)
+      act_obj.title.truncate(30, :separator => ' ')
+    elsif act_obj.respond_to? :url and (not act_obj.url.nil?)
+      act_obj.url.truncate(30, :separator => ' ')
+    else t('notification.default')
+    end
+  end
+
+  # An activity object description
+  def description_of(act_obj)
+    if act_obj.respond_to? :text and (not act_obj.text.nil?)
+      sanitize(act_obj.text.truncate(100, :separator =>' '))
+    elsif act_obj.respond_to? :description and (not act_obj.description.nil?)
+      sanitize(act_obj.description.truncate(100, :separator =>' '))
+    else
+      t('notification.watch_it')
+    end
+  end
+
   # Set locale as per subject preference
   def locale_as(subject)
     if subject.respond_to? :language

data/base/app/models/activity.rb

@@ -11,6 +11,8 @@
 #
 # There are two types of wall, :home and :profile. Check {Actor#wall} for more information
 #
+include NotificationsHelper
+
 class Activity < ActiveRecord::Base
   # See {SocialStream::Models::Channeled}
   channeled
@@ -343,32 +345,11 @@ class Activity < ActiveRecord::Base
               :who => I18n.t('notification.who.'+ receiver.subject.class.to_s.underscore,
                               :name => receiver_name))
       when 'post'
-        if direct_object.is_a? Comment
-          I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
-              :sender => sender_name,
-	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
-	                       :receiver => receiver_name),
-	      :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,
-	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
-	                       :receiver => receiver_name),
-	      :title => direct_object.text.truncate(30, :separator => ' '))
-	elsif direct_object.respond_to? :title
-          I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
-              :sender => sender_name,
-	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
-	                       :receiver => receiver_name),
-	      :title => direct_object.title.truncate(30, :separator => ' '))
-	else
-	  I18n.t('notification.default')
-	end
+        I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
+            :sender => sender_name,
+            :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+                              :receiver => receiver_name),
+	    :title => title_of(direct_object))
       when 'update'
         I18n.t('notification.update.'+ receiver.subject.class.to_s.underscore, 
               :sender => sender_name,

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

@@ -1,49 +1,14 @@
 <div class="subject">
-<% if activity.direct_object.is_a? Comment %>
-  <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
-   :sender => link_to(truncate_name(activity.sender.name), 
-                      polymorphic_url(activity.sender.subject)),
-   :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
-              :receiver => truncate_name(activity.receiver.name)),
-   :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), 
-                      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.text.truncate(30, :separator => ' '),
-                     polymorphic_url(activity.direct_object))) %>
-<% elsif activity.direct_object.respond_to? :title %>
-  <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
-   :sender => link_to(truncate_name(activity.sender.name), 
-                      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.title.truncate(30, :separator => ' '),
-                     polymorphic_url(activity.direct_object))) %>
-<% else %>
-  <%= raw t('notification.default') %>
-<% end %>
+<%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
+ :sender => link_to(truncate_name(activity.sender.name), 
+                    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(title_of(activity.direct_object),
+                   polymorphic_url(activity.direct_object))) %>
 </div>
 <div class="briefing">
-  <% if activity.direct_object.respond_to? :text %>
-    "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
-                     polymorphic_url(activity.direct_object))%>"
-  <% elsif activity.direct_object.respond_to? :description and not activity.direct_object.description.blank? %>
-    "<%= link_to(sanitize(activity.direct_object.description.truncate(100, :separator =>' ')),
-                     polymorphic_url(activity.direct_object))%>"
-  <% else%>
-    <%= link_to(t('notification.watch_it'),
-                polymorphic_url( activity.direct_object))%>
-  <%end%>
+  "<%= link_to(description_of(activity.direct_object), polymorphic_url(activity.direct_object))%>"
   <% if SocialStream.activity_forms.include? :document and activity.direct_object.is_a? Document %>
     
   <% end%>

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

@@ -1,41 +1,12 @@
 
-<% if activity.direct_object.is_a? Comment %>
 <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
            :sender => truncate_name(activity.sender.name),
            :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
                      :receiver => truncate_name(activity.receiver.name)),
-           :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),
-           :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
-                     :receiver => truncate_name(activity.receiver.name)),
-           :title => activity.direct_object.text.truncate(30, :separator => ' ')) %>
-<% elsif activity.direct_object.respond_to? :title %>
-<%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
-           :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.title.truncate(30, :separator => ' ')) %>
-<% else %>
-  <%= raw t('notification.default') %>
-<% end %>
+           :title => title_of(activity.direct_object)) %>
 
-
-<% if activity.direct_object.respond_to? :text %>
-  "<%= sanitize(activity.direct_object.text.truncate(100, :separator =>' '))%>"
---><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
-<% elsif activity.direct_object.respond_to? :description and not activity.direct_object.description.blank? %>
-  "<%= sanitize(activity.direct_object.description.truncate(100, :separator =>' '))%>"
+"<%= description_of(activity.direct_object) %>"
 --><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
-<% else%>
-  <%= t('notification.watch', :url => polymorphic_url(activity.direct_object))%>
-<% end%>
 
 <%= raw t('notification.look', 
           :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

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

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

data/base/social_stream-base.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   # Do not forget to require the file at lib/social_stream/base/dependencies !
   #
   # Rails
-  s.add_runtime_dependency('rails', '>= 3.1.0')
+  s.add_runtime_dependency('rails', '~> 3.1.0')
   # Activity and Relation hierarchies
   s.add_runtime_dependency('ancestry', '~> 1.2.3')
   # SQL foreign keys

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.8.1".freeze
+    VERSION = "0.8.2".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.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.2')
   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.1".freeze
+  VERSION = "0.18.2".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.1')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.8.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.2')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.8.2')
   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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &84213310 !ruby/object:Gem::Requirement
+  requirement: &78562910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
-  version_requirements: *84213310
+  version_requirements: *78562910
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &84212550 !ruby/object:Gem::Requirement
+  requirement: &78562660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *84212550
+  version_requirements: *78562660
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &84210660 !ruby/object:Gem::Requirement
+  requirement: &78562430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *84210660
+  version_requirements: *78562430
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &84210210 !ruby/object:Gem::Requirement
+  requirement: &78562200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *84210210
+  version_requirements: *78562200
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &84209880 !ruby/object:Gem::Requirement
+  requirement: &78561970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *84209880
+  version_requirements: *78561970
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &84209470 !ruby/object:Gem::Requirement
+  requirement: &78561740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *84209470
+  version_requirements: *78561740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &84209030 !ruby/object:Gem::Requirement
+  requirement: &78561540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84209030
+  version_requirements: *78561540
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84208350 !ruby/object:Gem::Requirement
+  requirement: &78561250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *84208350
+  version_requirements: *78561250
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &84207660 !ruby/object:Gem::Requirement
+  requirement: &78561000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *84207660
+  version_requirements: *78561000
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &84206820 !ruby/object:Gem::Requirement
+  requirement: &78560770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *84206820
+  version_requirements: *78560770
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &84205720 !ruby/object:Gem::Requirement
+  requirement: &78560540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *84205720
+  version_requirements: *78560540
 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: