RubyGems - social_stream-base - Versions diffs - 0.12.1 → 0.13.0 - Mend

social_stream-base 0.12.1 → 0.13.0

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

data/app/assets/images/flags/en.png +0 -0
data/app/assets/images/flags/es.png +0 -0
data/app/assets/javascripts/toolbar.js +22 -1
data/app/assets/stylesheets/activities.css.scss +1 -1
data/app/assets/stylesheets/cheesecake.css.scss +46 -4
data/app/assets/stylesheets/settings.css +11 -0
data/app/controllers/cheesecake_controller.rb +15 -3
data/app/controllers/contacts_controller.rb +2 -0
data/app/controllers/conversations_controller.rb +5 -5
data/app/controllers/likes_controller.rb +1 -1
data/app/helpers/notifications_helper.rb +10 -0
data/app/models/activity.rb +55 -36
data/app/models/activity_object.rb +3 -23
data/app/models/actor.rb +20 -4
data/app/models/channel.rb +13 -1
data/app/models/comment.rb +4 -0
data/app/models/contact.rb +55 -19
data/app/models/group.rb +5 -2
data/app/models/like.rb +2 -2
data/app/models/relation/custom.rb +1 -1
data/app/models/tie.rb +4 -3
data/app/views/cheesecake/_cheesecake.html.erb +63 -0
data/app/views/cheesecake/_index.html.erb +43 -86
data/app/views/cheesecake/index.html.erb +2 -0
data/app/views/cheesecake/update.js.erb +3 -0
data/app/views/devise/passwords/new.html.erb +1 -1
data/app/views/devise/registrations/new.html.erb +1 -1
data/app/views/devise/sessions/new.html.erb +1 -1
data/app/{assets/stylesheets/0_devise_sign.css → views/layouts/_devise_style.html.erb} +3 -1
data/app/views/layouts/_header_signed_in.erb +1 -1
data/app/views/message_mailer/new_message_email.html.erb +2 -1
data/app/views/message_mailer/new_message_email.text.erb +2 -1
data/app/views/message_mailer/reply_message_email.html.erb +2 -1
data/app/views/message_mailer/reply_message_email.text.erb +2 -1
data/app/views/notification_mailer/new_notification_email.html.erb +2 -1
data/app/views/notification_mailer/new_notification_email.text.erb +2 -1
data/app/views/notifications/activities/_post.html.erb +24 -1
data/app/views/notifications/activities/_post.text.erb +22 -3
data/app/views/settings/_language.html.erb +1 -1
data/config/locales/en.yml +3 -2
data/config/locales/es.yml +4 -3
data/config/routes.rb +1 -0
data/db/migrate/20120111141717_activity_channels.rb +74 -0
data/lib/social_stream-base.rb +1 -0
data/lib/social_stream/base/engine.rb +2 -1
data/lib/social_stream/base/version.rb +1 -1
data/lib/social_stream/models/channeled.rb +50 -0
data/lib/social_stream/models/object.rb +4 -13
data/lib/social_stream/toolbar_config/base.rb +1 -1
data/lib/tasks/db/populate.rake +1 -1
data/social_stream-base.gemspec +2 -2
data/spec/controllers/comments_controller_spec.rb +3 -3
data/spec/factories/activity.rb +3 -3
data/spec/factories/contact.rb +2 -0
data/spec/models/activity_authorization_spec.rb +5 -1
data/spec/models/like_spec.rb +3 -3
data/spec/models/tie_spec.rb +4 -4
metadata +70 -64
data/vendor/assets/javascripts/menu.js +0 -25

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

@@ -5,6 +5,8 @@
 <% toolbar :option => :contacts %>
 <% location link_to(t("contact.other"),contacts_path) %>
+<div id="cheesecake">
 <%= render :partial => "index"%>
+</div>
 <div class="space_center"></div>

data/app/views/cheesecake/update.js.erb ADDED Viewed

@@ -0,0 +1,3 @@
+$('#cheesecake').html("<%= escape_javascript render :partial => 'index' %>");
+<%= render :partial => 'cheesecake' %>

data/app/views/devise/passwords/new.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% content_for :headers do%>
-  <%= stylesheet_link_tag "0_devise_sign", :media => "screen, projection" %>
+  <%= render :partial => 'layouts/devise_style' %>
 <%end%>
 <div id="welcome">
   <div id="login" class="block">

data/app/views/devise/registrations/new.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% content_for :headers do%>
-  <%= stylesheet_link_tag "0_devise_sign", :media => "screen, projection" %>
+  <%= render :partial => 'layouts/devise_style' %>
 <%end%>
 <div id="welcome">

data/app/views/devise/sessions/new.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% content_for :headers do%>
-  <%= stylesheet_link_tag "0_devise_sign", :media => "screen, projection" %>
+  <%= render :partial => 'layouts/devise_style' %>
 <%end%>
 <div id="welcome">

data/app/{assets/stylesheets/0_devise_sign.css → views/layouts/_devise_style.html.erb} RENAMED Viewed

@@ -1,3 +1,4 @@
+<style type="text/css">
 /* This stylesheet overwrites some of the parameters fixed by other stylesheets found in
  * assets/stylesheets. Since they are compiled all together in alphabetic order, it should be
  * start by zero to make sure it is the first one to be executed.
@@ -21,8 +22,9 @@
 #wrapper_body{
   background-color: inherit;
-  background-image: url("/assets/big-logo.png");
+  background-image: url("<%= asset_path("big-logo.png") %>");
   background-repeat: no-repeat;
   background-position: bottom left;
   width:100%;
 }
+</style>

data/app/views/layouts/_header_signed_in.erb CHANGED Viewed

@@ -23,7 +23,7 @@
             <li>
               <%= link_to(t('message.other'), conversations_path) %>
               <span id="header_inbox_count">
-              <%= link_to(current_subject.mailbox.inbox(:unread => true).count.to_s, conversations_path) %>
+              <%= link_to(current_subject.unread_messages_count.to_s, conversations_path) %>
               </span>
             </li>
             <li class="pipe">·</li>

data/app/views/message_mailer/new_message_email.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
-<% self.class.send :include, SubjectsHelper %>
+<% self.class.send :include, SubjectsHelper, NotificationsHelper %>
+<% locale_as @receiver.subject %>
 <!DOCTYPE html>
 <html>
   <head>

data/app/views/message_mailer/new_message_email.text.erb CHANGED Viewed

@@ -1,4 +1,5 @@
-<% self.class.send :include, SubjectsHelper %>
+<% self.class.send :include, SubjectsHelper, NotificationsHelper %>
+<% locale_as @receiver.subject %>
 <%=truncate_name(@message.sender.name)%> <%= t('mailboxer.message_mailer.has_sent_new.' + @receiver.subject.class.to_s.downcase, :receiver => @receiver.name) %>
 -----------------------------------------------

data/app/views/message_mailer/reply_message_email.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
-<% self.class.send :include, SubjectsHelper %>
+<% self.class.send :include, SubjectsHelper, NotificationsHelper %>
+<% locale_as @receiver.subject %>
 <!DOCTYPE html>
 <html>
   <head>

data/app/views/message_mailer/reply_message_email.text.erb CHANGED Viewed

@@ -1,4 +1,5 @@
-<% self.class.send :include, SubjectsHelper %>
+<% self.class.send :include, SubjectsHelper, NotificationsHelper %>
+<% locale_as @receiver.subject %>
 <%= truncate_name(@message.sender.name)%> <%= t('mailboxer.message_mailer.has_sent_reply.' + @receiver.subject.class.to_s.downcase, :receiver => @receiver.name) %>
 -----------------------------------------------

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

@@ -1,4 +1,5 @@
-<% self.class.send :include, SubjectsHelper, ActionView::Helpers::TextHelper  %>
+<% self.class.send :include, SubjectsHelper, NotificationsHelper, ActionView::Helpers::TextHelper  %>
+<% locale_as @receiver.subject %>
 <!DOCTYPE html>
 <html>
   <head>

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

@@ -1,4 +1,5 @@
-<% self.class.send :include, SubjectsHelper, ActionView::Helpers::TextHelper %>
+<% self.class.send :include, SubjectsHelper, NotificationsHelper, ActionView::Helpers::TextHelper %>
+<% locale_as @receiver.subject %>
 <%= t('notification.hello', :receiver => @receiver.name)%>
 <%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }",

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

@@ -1,16 +1,39 @@
 <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)),
-   :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.one'),
+   :title => link_to(activity.direct_object.parent_post.text.truncate(30, :separator => ' '),
                      polymorphic_url(activity.direct_object))) %>
+<% 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 %>
 </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))%>

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

@@ -1,17 +1,36 @@
+<% 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)),
-           :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
+                     :receiver => truncate_name(activity.receiver.name)),
+           :title => activity.direct_object.parent_post.text.truncate(30, :separator => ' ')) %>
+<% 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 %>
 <% 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 =>' '))%>"
+--><%= 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)%>
+          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/app/views/settings/_language.html.erb CHANGED Viewed

@@ -17,7 +17,7 @@
     <div class="form_row">
  <div class="form_label"><%= label_tag :language, t('settings.lang_change.name') %></div>
  <div class="form_field">
- <%= select_tag(:language, options_for_select([[t('lang.browser'), 'browser']] + I18n.available_locales.map{|l| [ t("lang_names.#{l.to_s}") + ' (' + l.to_s + ')' , l.to_s ] }, (current_user.language.blank? ? 'browser' : current_user.language)), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
+ <%= select_tag(:language, options_for_select([[t('lang.browser'), 'browser']] + I18n.available_locales.map{|l| [ t(:language_name, :locale => l.to_s), l.to_s ] }, (current_user.language.blank? ? 'browser' : current_user.language)), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
  </div>
     </div>
             <div class="actions center">

data/config/locales/en.yml CHANGED Viewed

@@ -1,4 +1,5 @@
 en:
+  language_name: "English"
   actor:
     name: "Name"
   action:
@@ -300,8 +301,8 @@ en:
     one: "Notification"
     other: "Notifications"
     post:
-      group: "%{sender} added %{thing} in %{whose} wall."
-      user: "%{sender} added %{thing} in %{whose} wall."
+      group: "%{title} -- by %{sender} in %{whose} wall"
+      user: "%{title} -- by %{sender} in %{whose} wall"
     read: "Mark as read"
     read_all: "Mark all as read"
     unread: "Mark as unread"

data/config/locales/es.yml CHANGED Viewed

@@ -1,4 +1,5 @@
 es:
+  language_name: "Español"
   actor:
     name: "Nombre"
   action:
@@ -146,7 +147,7 @@ es:
     confirm: "¿Borrar %{element}}?"
   devise:
     links:
-      sign_in: "Ingresar"
+      sign_in: "Entrar"
       sign_up: "Registrarse"
       forgot_password: "¿Olvidaste tu contraseña?"
       confirmation_instructions: "¿No recibiste instrucciones de confirmación?"
@@ -300,8 +301,8 @@ es:
     one: "Notificación"
     other: "Notificaciones"
     post:
-      group: "%{sender} añadió %{thing} en el muro %{whose}."
-      user: "%{sender} añadió %{thing} en tu muro."
+      group: "%{title} -- por %{sender} en el muro %{whose}"
+      user: "%{title} -- por %{sender} en tu muro"
     read: "Marcar como leída"
     read_all: "Marcar todas como leídas"
     unread: "Marcar como no leídas"

data/config/routes.rb CHANGED Viewed

@@ -85,6 +85,7 @@ Rails.application.routes.draw do
   match 'search' => 'search#index', :as => :search
   match 'cheesecake' => 'cheesecake#index', :as => :cheesecake
+  match 'update_cheesecake' => 'cheesecake#update', :as => :update_cheesecake
   match 'ties' => 'ties#index', :as => :ties

data/db/migrate/20120111141717_activity_channels.rb ADDED Viewed

@@ -0,0 +1,74 @@
+class ActivityChannels < ActiveRecord::Migration
+  class ActivityMigration < ActiveRecord::Base
+    self.record_timestamps = false
+    set_table_name "activities"
+  end
+  def up
+    change_table :activities do |t|
+      t.integer :channel_id
+    end
+    add_index "activities", "channel_id"
+    add_foreign_key "activities", "channels", :name => "index_activities_on_channel_id"
+    ActivityMigration.reset_column_information
+    ActivityMigration.all.each do |a|
+      activity = Activity.find(a.id)
+      case activity.verb
+      when "post", "update"
+        a.channel_id = activity.direct_object.channel_id
+      else
+        contact = Contact.find activity.contact_id
+        author_id = contact.sender_id
+        owner_id  = contact.receiver_id
+        user_author_id =
+         (contact.sender_subject.is_a?(User) ?
+          contact.sender :
+          contact.sender.sent_ties.order(:created_at).first.receiver).id
+        a.channel_id =
+          Channel.find_or_create_by_author_id_and_user_author_id_and_owner_id(author_id,
+                                                                              user_author_id,
+                                                                              owner_id).id
+      end
+      a.save!
+    end
+    remove_foreign_key "activities", :name => "index_activities_on_contact_id"
+    remove_column :activities, :contact_id
+    Activity.reset_column_information
+  end
+  def down
+    change_table :activities do |t|
+      t.integer :contact_id
+    end
+    add_index "activities", "contact_id"
+    add_foreign_key "activities", "contacts", :name => "index_activities_on_contact_id"
+    ActivityMigration.reset_column_information
+    ActivityMigration.all.each do |a|
+      channel = Channel.find a.channel_id
+      a.contact_id = Contact.find_by_sender_id_and_receiver_id(channel.author_id, channel.owner_id)
+      a.save!
+    end
+    remove_foreign_key "activities", :name => "index_activities_on_channel_id"
+    remove_column :activities, :channel_id
+  end
+end

data/lib/social_stream-base.rb CHANGED Viewed

@@ -18,6 +18,7 @@ module SocialStream
   end
   module Models
+    autoload :Channeled, 'social_stream/models/channeled'
     autoload :Object,    'social_stream/models/object'
     autoload :Subject,   'social_stream/models/subject'
     autoload :Subtype,   'social_stream/models/subtype'

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

@@ -18,8 +18,9 @@ module SocialStream
         Mime::Type.register 'application/xrd+xml', :xrd
       end
-      initializer "social_stream-base.model.supertype" do
+      initializer "social_stream-base.model.supertypes" do
         ActiveSupport.on_load(:active_record) do
+          include SocialStream::Models::Channeled::ActiveRecord
           include SocialStream::Models::Subtype::ActiveRecord
           include SocialStream::Models::Supertype::ActiveRecord
         end

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

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

data/lib/social_stream/models/channeled.rb ADDED Viewed

@@ -0,0 +1,50 @@
+module SocialStream
+  module Models
+    # Models that have author, user_author and owner, properties saved in {Channel}.
+    # Currently {Activity} and {ActivityObject}
+    module Channeled
+      extend ActiveSupport::Concern
+      included do
+        # Channeled models are subtypes of {Channel}
+        # Author, owner and user_author are defined in its channel
+        subtype_of :channel,
+                   :belongs => { :dependent => nil }
+        before_validation :check_existing_channel
+      end
+      module InstanceMethods
+        protected
+        # Use existing channel, do not create a new one
+        def check_existing_channel
+          return unless channel!.new_record?
+          existing_channel =
+            Channel.
+              where(:author_id      => author_id,
+                    :owner_id       => owner_id,
+                    :user_author_id => user_author_id).
+              first
+          return if existing_channel.blank?
+          self.channel = existing_channel
+        end
+      end
+      module ActiveRecord
+        extend ActiveSupport::Concern
+        module ClassMethods
+          # This class is channeled. See {Channel}
+          def channeled
+            include SocialStream::Models::Channeled
+          end
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/models/object.rb CHANGED Viewed

@@ -16,8 +16,6 @@ module SocialStream
         has_one  :channel, :through => :activity_object
         has_many :activity_object_activities, :through => :activity_object
-#        before_create :create_activity_object_with_type
         unless self == Actor
           validates_presence_of :author_id, :owner_id, :user_author_id
@@ -48,19 +46,12 @@ module SocialStream
         # Build the post activity when this object is not saved
         def build_post_activity
-          Activity.new :contact_id   => _contact_id,
+          Activity.new :author       => author,
+                       :user_author  => user_author,
+                       :owner        => owner,
                        :relation_ids => Array(_relation_ids)
         end
-	# before_create callback
-	#
-        # Build corresponding ActivityObject including this class type
-        def create_activity_object_with_type #:nodoc:
-          o = create_activity_object! :object_type => self.class.to_s
-	  # WEIRD: Rails 3.1.0.rc3 does not assign activity_object_id
-	  self.activity_object_id = o.id
-        end
         def _contact
           @_contact ||= author && owner && author.contact_to!(owner)
         end
@@ -105,7 +96,7 @@ module SocialStream
         def create_activity(verb)
           a = Activity.new :verb         => verb,
-                           :contact      => _contact,
+                           :channel      => channel,
                            :relation_ids => _relation_ids,
                            :parent_id    => _activity_parent_id