social_stream-base 0.16.1 → 0.16.2

data/app/assets/stylesheets/base.css.scss

@@ -237,7 +237,7 @@ div.chzn-container ul.chzn-choices li.search-field input{ cursor:pointer;}
   text-decoration: none;
 }
 .menu_plain_list li span {
-  padding: 5px 10px;
+  padding: 5px 7px;
   background-color: $secondary-color;
 }
 .menu_plain_list li span.selected {

data/app/assets/stylesheets/header.css.scss

@@ -1,7 +1,7 @@
 @import "colors";
 
 /****************** HEADER STRUCTURE ******/
-#headerFront {	width: 100%;	padding: 0;	background: $header-color;  padding: 0px 0px 0px 0px;}
+#headerFront {	width: 100%;	padding: 0px;	background: $header-color; }
 #header_left {	left: 0px;	float: left;	padding-left: 15px; padding-right: 5px; width:155px;}
 #header_right {	right: 0px;	float: right; padding-right: 10px;  }
 .banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 0px;

data/app/helpers/notifications_helper.rb

@@ -28,4 +28,10 @@ module NotificationsHelper
     end
   end
 
+  # Add notification_id param to URL in order to mark notification read
+  def notification_url_of(target, notification)
+    return polymorphic_url(target, :notification_id => notification.id) unless notification.nil?
+    polymorphic_url(target)
+  end
+
 end

data/app/models/activity.rb

@@ -17,6 +17,10 @@ class Activity < ActiveRecord::Base
   # See {SocialStream::Models::Channeled}
   channeled
 
+  # This has to be declared before 'has_ancestry' to work around rails issue #670
+  # See: https://github.com/rails/rails/issues/670
+  before_destroy :destroy_children_comments
+
   has_ancestry
 
   paginates_per 10
@@ -397,6 +401,15 @@ class Activity < ActiveRecord::Base
     direct_activity_object.increment!(:like_count)
   end
 
+  # before_destroy callback
+  #
+  # Destroy children comments when the activity is destroyed
+  def destroy_children_comments
+    comments.each do |c|
+      c.direct_object.destroy
+    end
+  end
+
   # after_destroy callback
   #
   # Decrement like counter in objects when like activity is destroyed

data/app/models/comment.rb

@@ -4,6 +4,13 @@ class Comment < ActiveRecord::Base
   alias_attribute :text, :description
   validates_presence_of :text
 
+  define_index do
+    indexes activity_object.description
+
+    has created_at
+  end
+
+
   def parent_post
     self.post_activity.parent.direct_object
   end

data/app/models/post.rb

@@ -5,7 +5,7 @@ class Post < ActiveRecord::Base
   validates_presence_of :text
 
   define_index do
-    indexes text
+    indexes activity_object.description
 
     has created_at
   end

data/app/views/comments/_comment_focus_search.html.erb

@@ -0,0 +1,37 @@
+<% activity = comment.post_activity %>
+<%= div_for activity, :class => 'super_activity' do %>
+<div class="actor_logo">
+  <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
+  :alt => activity.sender_subject.name),
+  activity.sender_subject %>
+</div>
+<div class="activity_content">
+  <div class="actor_name">
+    <%= activity.title(self) %>
+  </div>
+  <div class="activity_objects">
+    <%= link_to comment do%>
+      <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 180) || "" %>
+      <% if text.length < 400 %>
+        <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 540 - text.length) || "" %>
+      <% end %>
+      <%= highlight(text,get_search_query_words) %>
+      <% end %>
+  </div>
+  <div class="activity_options">
+    <div class="comment_time_ago">
+      <%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %>
+    </div>
+    <% if user_signed_in? %>
+    ·
+    <%= link_to activity.audience_in_words(current_subject, :details => :summary),
+    'javascript:;',
+    :class => 'activity_audience_summary' %>
+    <div class="activity_audience">
+      <%= activity.audience_in_words(current_subject) %>
+    </div>
+    <% end %>
+  </div>
+</div>
+<% end %> 
+

data/app/views/comments/_comment_global_search.html.erb

@@ -0,0 +1,18 @@
+<% author = comment.author_subject %>
+<div class="model_with_details">
+  <div class="logo">
+    <%= link_to (image_tag(author.logo.url , :size => "50x50", :alt => author.name )), author  %>
+  </div>
+  <div class="sub-block">
+    <div class="brief">
+    <%= link_to comment do%>
+      <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 25) || "" %>
+      <% if text.length < 60 %>
+        <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) || "" %>
+      <% end %>
+      <%= highlight(text,get_search_query_words) %>
+      <% end %>
+      <br>
+    </div>
+  </div>
+</div>

data/app/views/comments/_comment_with_details.html.erb

@@ -0,0 +1,3 @@
+<%= div_for comment, :class => 'content_size' do %>
+  <%= simple_format comment.text %>
+<% end %>

data/app/views/notifications/_index.html.erb

@@ -13,6 +13,7 @@
 
 <div class="conversations"> 
   <% @notifications.each do |notification|%>
+    <% @notification = notification %>
     <% read_class = notification.is_unread?(@actor) ? 'unread' : '' %>
     <%= render :partial => 'notification', :object => notification, :locals => {:read_class => read_class} %>
   <% end %>

data/app/views/notifications/activities/_like.html.erb

@@ -16,15 +16,15 @@
               :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
                         :receiver => truncate_name(activity.receiver.name)),
               :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.name'),
-                        polymorphic_url( activity.direct_object))) %>
+                        notification_url_of( activity.direct_object, @notification))) %>
   </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))%>"
+                  notification_url_of( activity.direct_object, @notification))%>"
     <% else%>
       <%= link_to(t('notification.watch_it'),
-                  polymorphic_url( activity.direct_object))%>
+                  notification_url_of( activity.direct_object, @notification))%>
     <%end%>
   </div>
-<% end %>
+<% end %>

data/app/views/notifications/activities/_like.text.erb

@@ -13,9 +13,9 @@
 
   <% if activity.direct_object.respond_to? :text %>
     "<%= sanitize(activity.direct_object.text.truncate(100, :separator =>' '))%>"
-  <%= raw t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+  <%= raw t('notification.all_text', :url => notification_url_of(activity.direct_object, @notification))%>
   <% else%>
---><%= raw t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+--><%= raw t('notification.watch', :url => notification_url_of( activity.direct_object, @notification))%>
   <%end%>  
 <% end %>
 

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

@@ -5,9 +5,9 @@
  :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))) %>
+                   notification_url_of(activity.direct_object, @notification))) %>
 </div>
 <div class="briefing">
-  "<%= link_to(description_of(activity.direct_object), polymorphic_url(activity.direct_object))%>"
+  "<%= link_to(description_of(activity.direct_object), notification_url_of(activity.direct_object, @notification))%>"
 </div>
  

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

@@ -6,7 +6,7 @@
            :title => title_of(activity.direct_object)) %>
 
 "<%= description_of(activity.direct_object) %>"
---><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+--><%= t('notification.all_text', :url => notification_url_of(activity.direct_object, @notification))%>
 
 <%= raw t('notification.look', 
           :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/app/views/notifications/activities/_update.html.erb

@@ -5,14 +5,14 @@
    :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
               :receiver => truncate_name(activity.receiver.name)),
    :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.one'),
-                     polymorphic_url( activity.direct_object))) %>
+                     notification_url_of( activity.direct_object, @notification))) %>
 </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))%>"
+                     notification_url_of(activity.direct_object, @notification))%>"
   <% else%>
     <%= link_to(t('notification.watch_it'),
-                polymorphic_url( activity.direct_object))%>
+                notification_url_of( activity.direct_object, @notification))%>
   <%end%>
 </div>

data/app/views/notifications/activities/_update.text.erb

@@ -6,10 +6,10 @@
 
 <% 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))%>
+--><%= t('notification.all_text', :url => notification_url_of(activity.direct_object, @notification))%>
 <% else%>
-  <%= t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+  <%= t('notification.watch', :url => notification_url_of( activity.direct_object, @notification))%>
 <% end%>
 
 <%= raw t('notification.look', 
-          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>
+          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/lib/social_stream-base.rb

@@ -10,6 +10,7 @@ module SocialStream
   autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
+    autoload :MarkNotificationsRead,   'social_stream/controllers/mark_notifications_read'
     autoload :I18nIntegration,         'social_stream/controllers/i18n_integration'
     autoload :CancanDeviseIntegration, 'social_stream/controllers/cancan_devise_integration'
     autoload :Helpers,  'social_stream/controllers/helpers'
@@ -62,7 +63,7 @@ module SocialStream
   @@quick_search_models = [ :user, :group, :post ]
   
   mattr_accessor :extended_search_models
-  @@extended_search_models = [ :user, :group, :post ]
+  @@extended_search_models = [ :user, :group, :post, :comment ]
 
   mattr_accessor :cleditor_controls
   @@cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"

data/lib/social_stream/base/engine.rb

@@ -31,6 +31,7 @@ module SocialStream
           include SocialStream::Controllers::Helpers
           include SocialStream::Controllers::CancanDeviseIntegration
           include SocialStream::Controllers::I18nIntegration
+          include SocialStream::Controllers::MarkNotificationsRead
         end
       end
 

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.1".freeze
+    VERSION = "0.16.2".freeze
   end
 end

data/lib/social_stream/controllers/mark_notifications_read.rb

@@ -0,0 +1,19 @@
+module SocialStream
+  module Controllers
+    # Common methods added to ApplicationController
+    module MarkNotificationsRead
+      extend ActiveSupport::Concern
+
+      included do
+         before_filter :mark_notifications_read
+      end
+
+      # Mark notifications read when following a link
+      def mark_notifications_read
+        return if params[:notification_id].blank? or !user_signed_in?
+        n = Notification.find(params[:notification_id])
+        current_subject.read n
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76633680 !ruby/object:Gem::Requirement
+  requirement: &81495330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76633680
+  version_requirements: *81495330
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &76633180 !ruby/object:Gem::Requirement
+  requirement: &81494920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *76633180
+  version_requirements: *81494920
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &76632640 !ruby/object:Gem::Requirement
+  requirement: &81494510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *76632640
+  version_requirements: *81494510
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &76632260 !ruby/object:Gem::Requirement
+  requirement: &81494270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *76632260
+  version_requirements: *81494270
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &76631820 !ruby/object:Gem::Requirement
+  requirement: &81494010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76631820
+  version_requirements: *81494010
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &76631280 !ruby/object:Gem::Requirement
+  requirement: &81493640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76631280
+  version_requirements: *81493640
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &76630910 !ruby/object:Gem::Requirement
+  requirement: &81486780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76630910
+  version_requirements: *81486780
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &76630540 !ruby/object:Gem::Requirement
+  requirement: &81486530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *76630540
+  version_requirements: *81486530
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &76630270 !ruby/object:Gem::Requirement
+  requirement: &81486210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *76630270
+  version_requirements: *81486210
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &76630020 !ruby/object:Gem::Requirement
+  requirement: &81485880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *76630020
+  version_requirements: *81485880
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &76629770 !ruby/object:Gem::Requirement
+  requirement: &81485550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *76629770
+  version_requirements: *81485550
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &76629530 !ruby/object:Gem::Requirement
+  requirement: &81485240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *76629530
+  version_requirements: *81485240
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &76629300 !ruby/object:Gem::Requirement
+  requirement: &81485000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *76629300
+  version_requirements: *81485000
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &76629060 !ruby/object:Gem::Requirement
+  requirement: &81484680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *76629060
+  version_requirements: *81484680
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &76628820 !ruby/object:Gem::Requirement
+  requirement: &81484350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76628820
+  version_requirements: *81484350
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &76628580 !ruby/object:Gem::Requirement
+  requirement: &81483950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *76628580
+  version_requirements: *81483950
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &76614470 !ruby/object:Gem::Requirement
+  requirement: &81483600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *76614470
+  version_requirements: *81483600
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &76614240 !ruby/object:Gem::Requirement
+  requirement: &81483120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *76614240
+  version_requirements: *81483120
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &76614000 !ruby/object:Gem::Requirement
+  requirement: &81482650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *76614000
+  version_requirements: *81482650
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &76613760 !ruby/object:Gem::Requirement
+  requirement: &81482050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *76613760
+  version_requirements: *81482050
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &76613510 !ruby/object:Gem::Requirement
+  requirement: &81481710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76613510
+  version_requirements: *81481710
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &76613270 !ruby/object:Gem::Requirement
+  requirement: &81481330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *76613270
+  version_requirements: *81481330
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &76613030 !ruby/object:Gem::Requirement
+  requirement: &81480840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76613030
+  version_requirements: *81480840
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &76612780 !ruby/object:Gem::Requirement
+  requirement: &81480340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *76612780
+  version_requirements: *81480340
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76612540 !ruby/object:Gem::Requirement
+  requirement: &81480000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *76612540
+  version_requirements: *81480000
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &76612350 !ruby/object:Gem::Requirement
+  requirement: &81479690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76612350
+  version_requirements: *81479690
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76612100 !ruby/object:Gem::Requirement
+  requirement: &81479310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76612100
+  version_requirements: *81479310
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76611850 !ruby/object:Gem::Requirement
+  requirement: &81478900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *76611850
+  version_requirements: *81478900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76611600 !ruby/object:Gem::Requirement
+  requirement: &81478590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *76611600
+  version_requirements: *81478590
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &76611370 !ruby/object:Gem::Requirement
+  requirement: &81478360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *76611370
+  version_requirements: *81478360
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &76611140 !ruby/object:Gem::Requirement
+  requirement: &81478110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *76611140
+  version_requirements: *81478110
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &76610910 !ruby/object:Gem::Requirement
+  requirement: &81477870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *76610910
+  version_requirements: *81477870
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -685,6 +685,9 @@ files:
 - app/views/cheesecake/index.html.erb
 - app/views/cheesecake/update.js.erb
 - app/views/comments/_comment.html.erb
+- app/views/comments/_comment_focus_search.html.erb
+- app/views/comments/_comment_global_search.html.erb
+- app/views/comments/_comment_with_details.html.erb
 - app/views/comments/_new.html.erb
 - app/views/comments/create.js.erb
 - app/views/comments/destroy.js.erb
@@ -888,6 +891,7 @@ files:
 - lib/social_stream/controllers/cancan_devise_integration.rb
 - lib/social_stream/controllers/helpers.rb
 - lib/social_stream/controllers/i18n_integration.rb
+- lib/social_stream/controllers/mark_notifications_read.rb
 - lib/social_stream/controllers/objects.rb
 - lib/social_stream/controllers/subjects.rb
 - lib/social_stream/d3.rb