RubyGems - social_stream - Versions diffs - 0.12.6 → 0.12.7 - Mend

social_stream 0.12.6 → 0.12.7

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 (29) hide show

data/base/app/models/activity.rb CHANGED Viewed

@@ -206,7 +206,7 @@ class Activity < ActiveRecord::Base
     #Avaible verbs: follow, like, make-friend, post, update
     if ['like','follow','make-friend','post','update'].include? verb and !contact.reflexive?
-      receiver.notify("You have a new notification", "Youre not supposed to see this", self)
+      receiver.notify(notification_subject, "Youre not supposed to see this", self)
     end
     true
   end
@@ -307,6 +307,53 @@ class Activity < ActiveRecord::Base
       end
   end
+  #
+  # Get the email subject for the activity's notification
+  #
+  def notification_subject
+    sender_name= sender.name.truncate(30, :separator => ' ')
+    receiver_name= receiver.name.truncate(30, :separator => ' ')
+    case verb
+      when 'like'
+        if direct_object.is_a? Actor or direct_object.respond_to? :actor
+          I18n.t('notification.fan',
+                :sender => sender_name,
+                :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+                            :receiver => receiver_name))
+        else
+          I18n.t('notification.like.'+ receiver.subject.class.to_s.underscore,
+                :sender => sender_name,
+                :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+                            :receiver => receiver_name),
+                :thing => I18n.t(direct_object.class.to_s.underscore+'.name'))
+        end
+      when 'follow'
+        I18n.t('notification.follow.'+ receiver.subject.class.to_s.underscore,
+              :sender => sender_name,
+              :who => I18n.t('notification.who.'+ receiver.subject.class.to_s.underscore,
+                             :name => receiver_name))
+      when 'make-friend'
+        I18n.t('notification.makefriend.'+ receiver.subject.class.to_s.underscore,
+              :sender => sender_name,
+              :who => I18n.t('notification.who.'+ receiver.subject.class.to_s.underscore,
+                              :name => receiver_name))
+      when '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),
+              :thing => I18n.t(direct_object.class.to_s.underscore+'.one'))
+      when 'update'
+        I18n.t('notification.update.'+ receiver.subject.class.to_s.underscore,
+              :sender => sender_name,
+              :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+                               :receiver => receiver_name),
+              :thing => I18n.t(direct_object.class.to_s.underscore+'.one'))
+      else
+        t('notification.default')
+      end
+  end
   #Send notifications to actors based on proximity, interest and permissions
   def send_notifications
     notify

data/base/app/views/comments/_comment.html.erb CHANGED Viewed

	@@ -1 +1 @@
1	- <%= comment.text %>
1	+ <%= simple_format auto_link(comment.text) %>

data/base/app/views/notification_mailer/new_notification_email.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<% self.class.send :include, Mailboxer::NotificationDecoder  %>
+<% self.class.send :include, SubjectsHelper, ActionView::Helpers::TextHelper  %>
 <!DOCTYPE html>
 <html>
   <head>
@@ -6,7 +6,9 @@
   </head>
   <body>
     <div>
+      <div >
+        <%= t('notification.hello', :receiver => @receiver.name)%>
+      </div>
       <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
         <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
           <img src="<%= root_url + @notification.notified_object.sender.logo.url(:profile)%>" alt="<%=@notification.notified_object.sender.name%>">
@@ -25,7 +27,7 @@
       </div>
       <div style="padding: 10px 5px 5px 5px;">
         <p>
-          Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
+          <%= raw t('notification.visit', :url=> link_to(notifications_url,notifications_url))%>
         </p>
       </div>
     </div>

data/base/app/views/notification_mailer/new_notification_email.text.erb CHANGED Viewed

@@ -1,7 +1,9 @@
-<% self.class.send :include, Mailboxer::NotificationDecoder %>
+<% self.class.send :include, SubjectsHelper, ActionView::Helpers::TextHelper %>
+<%= t('notification.hello', :receiver => @receiver.name)%>
------------------------------------------------
 <%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }",
                      :locals =>{:activity => @notification.notified_object}%>
 -----------------------------------------------
-Visit <%= notifications_url %> and check all your notifications.
+<%= raw t('notification.visit', :url=> notifications_url)%>

data/base/app/views/notifications/activities/_follow.html.erb CHANGED Viewed

@@ -1,10 +1,10 @@
 <div class="subject">
   <%= raw t('notification.follow.'+ activity.receiver.subject.class.to_s.underscore,
-   :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),
-   :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
-              :name => truncate_name(activity.receiver.name))) %>
+           :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),
+           :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+                      :name => truncate_name(activity.receiver.name))) %>
 </div>
 <div class="briefing">
-  <%= link_to(t('notification.confirm', :sender => truncate_name(activity.sender.name)),
+  <%= raw link_to(t('notification.confirm', :sender => truncate_name(activity.sender.name)),
               edit_contact_url(activity.receiver.contact_to!(activity.sender),:s => activity.receiver.slug)) %>
 </div>

data/base/app/views/notifications/activities/_follow.text.erb CHANGED Viewed

@@ -1,8 +1,8 @@
 <%= raw t('notification.follow.'+ activity.receiver.subject.class.to_s.underscore,
- :sender => truncate_name(activity.sender.name),
- :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
-            :name => truncate_name(activity.receiver.name))) %>
------------------------------------------------
-<%= t('notification.look', :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>
-<%= t('notification.confirm', :sender => truncate_name(activity.sender.name)) %> <%= edit_contact_url(activity.receiver.contact_to!(activity.sender),
-                                                                                      :s => activity.receiver.slug)%>
+          :sender => truncate_name(activity.sender.name),
+          :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+                    :name => truncate_name(activity.receiver.name))) %>
+<%= raw t('notification.look', :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>
+<%= raw t('notification.confirm', :sender => truncate_name(activity.sender.name)) %> <%= edit_contact_url(activity.receiver.contact_to!(activity.sender),
+                                                                                      :s => activity.receiver.slug)%>

data/base/app/views/notifications/activities/_like.html.erb CHANGED Viewed

@@ -20,7 +20,7 @@
   </div>
   <div class="briefing">
     <% if activity.direct_object.respond_to? :text %>
-      "<%= link_to(activity.direct_object.text.truncate(100, :separator =>' '),
+      "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
                   polymorphic_url( activity.direct_object))%>"
     <% else%>
       <%= link_to(t('notification.watch_it'),

data/base/app/views/notifications/activities/_like.text.erb CHANGED Viewed

@@ -3,19 +3,19 @@
         :sender => truncate_name(activity.sender.name),
         :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
                   :receiver => truncate_name(activity.receiver.name)))%>
------------------------------------------------
 <% else %>
   <%= raw t('notification.like.'+ 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)),
             :thing => t(activity.direct_object.class.to_s.underscore+'.name')) %>
------------------------------------------------
   <% if activity.direct_object.respond_to? :text %>
-    "<%= activity.direct_object.text.truncate(100, :separator =>' ')%>"
-    <%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+    "<%= sanitize(activity.direct_object.text.truncate(100, :separator =>' '))%>"
+  <%= raw t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
   <% else%>
---><%= t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+--><%= raw t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
   <%end%>
 <% end %>

data/base/app/views/notifications/activities/_make-friend.text.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <%= raw t('notification.makefriend.'+ activity.receiver.subject.class.to_s.underscore,
- :sender => truncate_name(activity.sender.name),
- :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
-            :name => truncate_name(activity.receiver.name))) %>
------------------------------------------------
+         :sender => truncate_name(activity.sender.name),
+         :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+                    :name => truncate_name(activity.receiver.name))) %>
 <%= raw t('notification.look',
- :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject))) %>
+          :sender => truncate_name(activity.sender.name)) %>: <%=polymorphic_url(activity.sender.subject)%>

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

@@ -9,7 +9,7 @@
 </div>
 <div class="briefing">
   <% if activity.direct_object.respond_to? :text %>
-    "<%= link_to(activity.direct_object.text.truncate(100, :separator =>' '),
+    "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
                      polymorphic_url(activity.direct_object))%>"
   <% else%>
     <%= link_to(t('notification.watch_it'),

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

@@ -1,13 +1,13 @@
 <%= 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)),
- :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
------------------------------------------------
+           :sender => truncate_name(activity.sender.name),
+           :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+                      :receiver => truncate_name(activity.receiver.name)),
+           :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
 <% if activity.direct_object.respond_to? :text %>
-  "<%=activity.direct_object.text.truncate(100, :separator =>' ')%>"
+  "<%= sanitize(activity.direct_object.text.truncate(100, :separator =>' '))%>"
 --><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
 <% else%>
   <%= t('notification.watch', :url => polymorphic_url(activity.direct_object))%>

data/base/app/views/notifications/activities/_update.html.erb CHANGED Viewed

@@ -9,7 +9,7 @@
 </div>
 <div class="briefing">
   <% if activity.direct_object.respond_to? :text %>
-    "<%= link_to(activity.direct_object.text.truncate(100, :separator =>' '),
+    "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
                      polymorphic_url(activity.direct_object))%>"
   <% else%>
     <%= link_to(t('notification.watch_it'),

data/base/app/views/notifications/activities/_update.text.erb CHANGED Viewed

@@ -1,11 +1,11 @@
 <%= raw t('notification.update.'+ 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)),
- :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
------------------------------------------------
+           :sender => truncate_name(activity.sender.name),
+           :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+                      :receiver => truncate_name(activity.receiver.name)),
+           :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
 <% if activity.direct_object.respond_to? :text %>
-  "<%=activity.direct_object.text.truncate(100, :separator =>' ')%>"
+  "<%= sanitize activity.direct_object.text.truncate(100, :separator =>' ')%>"
 --><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
 <% else%>
   <%= t('notification.watch', :url => polymorphic_url( activity.direct_object))%>

data/base/app/views/posts/_post.html.erb CHANGED Viewed

@@ -1,3 +1,3 @@
 <%= div_for post, :class => 'content_size' do %>
-  <%= simple_format post.text %>
+  <%= simple_format auto_link(post.text) %>
 <% end %>

data/base/config/locales/en.yml CHANGED Viewed

@@ -276,11 +276,13 @@ en:
   notification:
     all_text: "Read the whole text at %{url}"
     confirm: "Confirm %{sender} as contact?"
+    default: "You have a new notification"
     destroy_sure: "Do you want to delete this notification?"
     fan: "%{sender} is now %{whose} fan."
     follow:
       group: "%{sender} added %{who} as contact."
       user: "%{sender} added %{who} as contact."
+    hello: "Hi %{receiver},"
     like:
       group: "%{sender} likes %{whose} %{thing}."
       user: "%{sender} likes %{whose} %{thing}."
@@ -299,6 +301,7 @@ en:
     update:
       group: "%{sender} updated %{thing} in %{whose} wall."
       user: "%{sender} updated %{thing} in %{whose} wall."
+    visit: "Visit %{url} and check all your notifications."
     watch: "Watch it at %{url}"
     watch_it: "Watch it!"
     who:

data/base/config/locales/es.yml CHANGED Viewed

@@ -85,6 +85,7 @@ es:
   browse: "Descubrir"
   button:
     cancel: "Cancelar"
+    create: "Crear"
     save: "Guardar"
     update: "Actualizar"
   comment:
@@ -158,9 +159,11 @@ es:
     collaborate:
       default: "Colabora"
       sentence1: "Organice sus proyectos y actividades"
-      sentence2: "Crea tus propios grupos"
+      sentence2: "Participe en grupos y conferencias"
+      sentence3: "Cree sus propios grupos y conferencias"
     elements:
       comments: "Comentarios"
+      conferences: "Conferencias"
       networks: "Redes sociales"
       organizers: "Organizadores"
       participants: "Participantes"
@@ -241,13 +244,13 @@ es:
     mark_as_read: "Marcar como leido"
     message_mailer:
       has_sent_new:
-        event: "ha mandad un nuevo mensaje a %{receiver}"
-        group: "ha mandad un nuevo mensaje a %{receiver}"
-        user: "te ha mandad un nuevo mensaje"
+        event: "ha mandado un nuevo mensaje a %{receiver}"
+        group: "ha mandado un nuevo mensaje a %{receiver}"
+        user: "te ha mandado un nuevo mensaje"
       has_sent_reply:
-        event: "ha mandad una respuesta a %{receiver}"
-        group: "ha mandad una respuesta a %{receiver}"
-        user: "te ha mandad una respuesta"
+        event: "ha mandado una respuesta a %{receiver}"
+        group: "ha mandado una respuesta a %{receiver}"
+        user: "te ha mandado una respuesta"
       subject_new: "%{subject}"
       subject_reply: "%{subject}"
     notification_mailer:
@@ -273,11 +276,13 @@ es:
   notification:
     all_text: "Lee el texto entero en %{url}"
     confirm: "¿Confirmar contacto con %{sender}?"
+    default: "Tienes una nueva notificación"
     destroy_sure: "¿Borrar notificación?"
     fan: "%{sender} es ahora fan %{whose}."
-    follow:
+    follow:
       group: "%{sender} añadió a %{who} como contacto."
       user: "%{sender} te añadió como contacto."
+    hello: "Hola %{receiver},"
     like:
       group: "A %{sender} le gusta el %{thing} %{whose}."
       user: "A %{sender} le gusta tu %{thing}."
@@ -296,6 +301,7 @@ es:
     update:
       group: "%{sender} actualizó %{thing} en el muro %{whose}."
       user: "%{sender} actualizó %{thing} en tu muro."
+    visit: "Visita %{url} y comprueba todas tus notificaciones."
     watch: "Échale un vistazo en %{url}"
     watch_it: "¡Échale un vistazo!"
     who:
@@ -312,6 +318,8 @@ es:
     name: "publicación"
     one: "una publicación"
     title: "Textos"
+  preposition:
+    and: "y"
   profile:
     one: "Perfil"
     age: "Edad"

data/base/lib/social_stream-base.rb CHANGED Viewed

@@ -39,6 +39,8 @@ require 'modernizr-rails'
 require 'thinking-sphinx'
 # Syntactically Awesome Stylesheets
 require 'sass-rails'
+# Autolink text blocks
+require 'rails_autolink'
 # Provides your Rails application with social network and activity stream support
 module SocialStream
@@ -50,6 +52,7 @@ module SocialStream
   module Controllers
     autoload :Helpers, 'social_stream/controllers/helpers'
+    autoload :CancanDeviseIntegration, 'social_stream/controllers/cancan_devise_integration'
   end
   module Models

data/base/lib/social_stream/base.rb CHANGED Viewed

@@ -21,9 +21,14 @@ module SocialStream
       initializer "social_stream-base.controller_helpers" do
         ActiveSupport.on_load(:action_controller) do
           include SocialStream::Controllers::Helpers
+          include SocialStream::Controllers::CancanDeviseIntegration
         end
       end
+      initializer "social_stream-base.cancan_devise_integration" do
+        ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
+      end
       initializer "social_stream-base.toolbar_config" do
         SocialStream::ToolbarConfig.module_eval do
           include SocialStream::ToolbarConfig::Base

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.28".freeze
+    VERSION = "0.9.29".freeze
   end
 end

data/base/lib/social_stream/controllers/cancan_devise_integration.rb ADDED Viewed

@@ -0,0 +1,22 @@
+module SocialStream
+  module Controllers
+    # Common methods added to ApplicationController
+    module CancanDeviseIntegration
+      extend ActiveSupport::Concern
+      module InstanceMethods
+        private
+        # Redirect to login if the user is trying to access a protected resource
+        # and she is not authenticated
+        def rescue_from_access_denied
+          unless user_signed_in?
+            redirect_to new_user_session_path
+          end
+        end
+      end
+    end
+  end
+end

data/base/social_stream-base.gemspec CHANGED Viewed

@@ -51,8 +51,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
   # Sphinx search engine
   s.add_runtime_dependency('thinking-sphinx', '~> 2.0.8')
-  #Syntactically Awesome Stylesheets
+  # Syntactically Awesome Stylesheets
   s.add_runtime_dependency('sass-rails', '~> 3.1.0')
+  # Autolink text blocks
+  s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
   # Development gem dependencies
   #

data/events/app/views/events/index.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
-<%= location(link_to(image_tag("btn/event.png", :class => "btn_config")+t('conference.list')))%>
+<%= location(link_to t('conference.list'))%>
 <% toolbar %>

data/events/lib/social_stream/events/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.19".freeze
+    VERSION = "0.0.20".freeze
   end
 end

data/events/social_stream-events.gemspec CHANGED Viewed

@@ -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.9.28')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.29')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
   # Development Gem dependencies

data/lib/social_stream/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.6".freeze
+  VERSION = "0.12.7".freeze
 end

data/social_stream.gemspec CHANGED Viewed

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.28')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.29')
   s.add_runtime_dependency('social_stream-documents', '~> 0.4.4')
-  s.add_runtime_dependency('social_stream-events', '~> 0.0.19')
+  s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
   # Development Gem dependencies
   #

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  hash: 35
+  hash: 33
   prerelease:
   segments:
   - 0
   - 12
-  - 6
-  version: 0.12.6
+  - 7
+  version: 0.12.7
 platform: ruby
 authors:
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00 +01:00
+date: 2011-11-16 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -27,12 +27,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 3
+        hash: 1
         segments:
         - 0
         - 9
-        - 28
-        version: 0.9.28
+        - 29
+        version: 0.9.29
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
@@ -59,12 +59,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 57
+        hash: 55
         segments:
         - 0
         - 0
-        - 19
-        version: 0.0.19
+        - 20
+        version: 0.0.20
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency
@@ -437,7 +437,6 @@ files:
 - base/app/helpers/contacts_helper.rb
 - base/app/helpers/groups_helper.rb
 - base/app/helpers/location_helper.rb
-- base/app/helpers/notifications_helper.rb
 - base/app/helpers/permissions_helper.rb
 - base/app/helpers/profiles_helper.rb
 - base/app/helpers/search_helper.rb
@@ -668,12 +667,12 @@ files:
 - base/lib/generators/social_stream/base/templates/navigation.rb
 - base/lib/generators/social_stream/base/templates/relations.yml
 - base/lib/generators/social_stream/base/templates/sphinx.yml
-- base/lib/mailboxer/notification_decoder.rb
 - base/lib/paperclip/social_stream.rb
 - base/lib/social_stream-base.rb
 - base/lib/social_stream/ability.rb
 - base/lib/social_stream/base.rb
 - base/lib/social_stream/base/version.rb
+- base/lib/social_stream/controllers/cancan_devise_integration.rb
 - base/lib/social_stream/controllers/helpers.rb
 - base/lib/social_stream/d3.rb
 - base/lib/social_stream/migrations/base.rb

data/base/app/helpers/notifications_helper.rb DELETED Viewed

@@ -1,3 +0,0 @@
-module NotificationsHelper
-  include Mailboxer::NotificationDecoder
-end

data/base/lib/mailboxer/notification_decoder.rb DELETED Viewed

@@ -1,89 +0,0 @@
-module Mailboxer
-  module NotificationDecoder
-    include SubjectsHelper, ActionView::Helpers::TextHelper
-    def decode_notification notification_text, activity
-      return if activity.nil?
-      notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name),
-                                                                      url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
-                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
-      notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender), :s => activity.receiver.slug)))
-      notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),
-                                                                      url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
-                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
-      notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
-      if activity.receiver.subject.is_a?(User)
-        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
-        notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
-      else
-        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others',
-                                                    :receiver => truncate_name(activity.receiver.name)))
-        notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
-      end
-      if activity.direct_object.present?
-        object = activity.direct_object
-        object = object.subject if object.is_a? Actor
-        notification_text=notification_text.gsub(/\%\{object\}/,link_to(t(object.class.to_s.underscore+".name"),
-                                                                      url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show,
-                                                                              :id=> object.id, :only_path => false)))
-        notification_text=notification_text.gsub(/\%\{object.name\}/,t(object.class.to_s.underscore+".name"))
-        if object.respond_to? :text
-          notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '),
-                                                                          url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show,
-                                                                                  :id=> object.id, :only_path => false)))
-        elsif SocialStream.objects.include? :document and object.is_a? Document
-          notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.file_file_name.truncate(100, :separator =>' '),
-                                                                          url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show,
-                                                                                  :id=> object.id, :only_path => false)))
-        end
-        #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
-      else
-        notification_text=notification_text.gsub(/\%\{object\}/,t('unknown'))
-        notification_text=notification_text.gsub(/\%\{object.name\}/,t('unknown'))
-      end
-      notification_text
-    end
-    def decode_basic_notification notification_text, activity
-      return if activity.nil?
-      notification_text = notification_text.gsub(/\%\{sender\}/, truncate_name(activity.sender.name))
-      notification_text = notification_text.gsub(/\%\{confirm\}/,t('notification.confirm'))
-      notification_text = notification_text.gsub(/\%\{look\}/,t('notification.look') + ": "+
-                                     url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
-                                             :action=> :show, :id=> activity.sender.subject.slug, :only_path => false))
-      notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
-      if activity.receiver.subject.is_a?(User)
-        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
-        notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
-      else
-        notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others',
-                                                  :receiver => truncate_name(activity.receiver.name)))
-        notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
-      end
-      if activity.direct_object.present?
-        object = activity.direct_object
-        object = object.subject if object.is_a? Actor
-        notification_text=notification_text.gsub(/\%\{object\}/,t(object.class.to_s.underscore+".name"))
-        notification_text=notification_text.gsub(/\%\{object.name\}/,t(object.class.to_s.underscore+".name"))
-        notification_text=notification_text.gsub(/\%\{object.text\}/,object.text.truncate(100, :separator =>' ')) if object.respond_to? :text
-        #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
-      else
-        notification_text=notification_text.gsub(/\%\{object\}/,t('unknown'))
-        notification_text=notification_text.gsub(/\%\{object.name\}/,t('unknown'))
-      end
-      notification_text
-    end
-  end
-end