RubyGems - social_stream-base - Versions diffs - 0.7.1 → 0.7.2 - Mend

social_stream-base 0.7.1 → 0.7.2

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

data/app/controllers/contacts_controller.rb +11 -14
data/app/models/activity.rb +5 -1
data/app/views/message_mailer/new_message_email.html.erb +26 -12
data/app/views/message_mailer/new_message_email.text.erb +2 -5
data/app/views/message_mailer/reply_message_email.html.erb +26 -12
data/app/views/message_mailer/reply_message_email.text.erb +3 -6
data/app/views/messages/new.html.erb +2 -2
data/app/views/notification_mailer/new_notification_email.text.erb +3 -3
data/app/views/objects/_show.html.erb +3 -0
data/app/views/posts/show.html.erb +2 -0
data/config/locales/en.yml +2 -1
data/lib/social_stream/base/version.rb +1 -1
data/lib/social_stream/models/object.rb +10 -0
data/social_stream-base.gemspec +1 -1
data/spec/controllers/likes_controller_spec.rb +19 -0
data/spec/controllers/posts_controller_spec.rb +12 -0
data/spec/factories/post.rb +5 -0
data/vendor/assets/javascripts/ckeditor/config.js +2 -0
metadata +9 -7

data/app/controllers/contacts_controller.rb CHANGED Viewed

@@ -1,24 +1,21 @@
 class ContactsController < ApplicationController
   before_filter :authenticate_user!
   def index
     if params[:pending].present?
       pending
-      return
+    return
     end
     @contacts =
-      Contact.sent_by(current_subject).
-              joins(:receiver).merge(Actor.alphabetic).
-              merge(Actor.letter(params[:letter])).
-              merge(Actor.search(params[:search])).
-              active
+    Contact.sent_by(current_subject).
+            joins(:receiver).merge(Actor.alphabetic).
+            merge(Actor.letter(params[:letter])).
+            merge(Actor.search(params[:search])).
+            active
     respond_to do |format|
       format.html { @contacts = @contacts.page(params[:page]).per(10) }
       format.js { @contacts = @contacts.page(params[:page]).per(10) }
-      format.json { render :text => @contacts.map{ |c| { 'key' => c.actor_id.to_s, 'value' => self.class.helpers.truncate_name(c.name) } }.to_json }
+      format.json { render :text => @contacts.map{ |c| { 'key' => c.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
     end
   end
@@ -43,22 +40,22 @@ class ContactsController < ApplicationController
   def destroy
     @contact = current_subject.sent_contacts.find params[:id]
     @contact.relation_ids = [current_subject.relation_public.id]
     respond_to do |format|
       format.js
     end
   end
   def pending
-      @contacts = current_subject.pending_contacts
+    @contacts = current_subject.pending_contacts
     respond_to do |format|
       format.html { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
       format.js { Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
-      format.json { render :text => @contacts.map{ |c| { 'key' => c.actor_id.to_s, 'value' => self.class.helpers.truncate_name(c.name) } }.to_json }
+      format.json { render :text => @contacts.map{ |c| { 'key' => c.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
     end
   end
 end

data/app/models/activity.rb CHANGED Viewed

@@ -231,7 +231,11 @@ class Activity < ActiveRecord::Base
       return val
     when 'read'
-      return true if [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject)) || relations.select{ |r| r.is_a?(Relation::Public) }.any?
+      return true if relations.select{ |r| r.is_a?(Relation::Public) }.any?
+      return false if subject.blank?
+      return true if [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject))
     when 'update'
       return true if contact.sender_id == Actor.normalize_id(subject)
     when 'destroy'

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

@@ -4,17 +4,31 @@
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
   </head>
   <body>
-    <h1>You have a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
-    <p>
-      You have received a new message:
-    </p>
-    <blockquote>
-      <p>
-        <%= raw @message.body %>
-      </p>
-    </blockquote>
-    <p>
-      Visit <%= link_to root_url,root_url %> and go to your inbox for more info.
-    </p>
+    <div>
+      <div style="padding: 10px 5px 5px 5px;">
+        <span style="font-weight: bold;"><%= @message.sender.name%></span>
+         has sent you a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
+      </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="http://<%= ActionMailer::Base.default_url_options[:host] +@message.sender.logo.url(:profile)%>" alt="<%=@message.sender.name%>">
+        </div>
+        <div style=" margin: 5px 5px 5px 5px;">
+          <p style="font-weight: bold; "><%= @message.sender.name %>
+            <% if @message.sender.profile.organization? %>
+              <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @message.sender.profile.organization%></span>
+            <% end %>
+          </p>
+          <p>
+            <%= raw @message.body %>
+          </p>
+        </div>
+      </div>
+      <div style="padding: 10px 5px 5px 5px;">
+        <p>
+          <%= link_to((t('message.look')+" at "+t('socialstream')), conversation_url(@message.conversation))%>
+        </p>
+      </div>
+    </div>
   </body>
 </html>

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

@@ -1,10 +1,7 @@
-You have a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
-===============================================
-You have received a new message:
+<%= @message.sender.name%> has sent you a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
 -----------------------------------------------
 <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
 -----------------------------------------------
-Visit <%= root_url %> and go to your inbox for more info.
+<%=t('message.look')%> at <%= t('socialstream')%>: <%=conversation_url(@message.conversation)%>.

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

@@ -4,17 +4,31 @@
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
   </head>
   <body>
-    <h1>You have a new reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
-    <p>
-      You have received a new reply:
-    </p>
-    <blockquote>
-      <p>
-        <%= raw @message.body %>
-      </p>
-    </blockquote>
-    <p>
-      Visit <%= link_to root_url,root_url %> and go to your inbox for more info.
-    </p>
+    <div>
+      <div style="padding: 10px 5px 5px 5px;">
+        <span style="font-weight: bold;"><%= @message.sender.name%></span>
+        has sent a reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
+      </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="http://<%= ActionMailer::Base.default_url_options[:host] +@message.sender.logo.url(:profile)%>" alt="<%=@message.sender.name%>">
+        </div>
+        <div style=" margin: 5px 5px 5px 5px;">
+          <p style="font-weight: bold; "><%= @message.sender.name %>
+            <% if @message.sender.profile.organization? %>
+              <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @message.sender.profile.organization%></span>
+            <% end %>
+          </p>
+          <p>
+            <%= raw @message.body %>
+          </p>
+        </div>
+      </div>
+      <div style="padding: 10px 5px 5px 5px;">
+        <p>
+          <%= link_to t('message.look'), conversation_url(@message.conversation)%> at <%= t('socialstream')%>
+        </p>
+      </div>
+    </div>
   </body>
 </html>

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

@@ -1,10 +1,7 @@
-You have a new reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
-===============================================
-You have received a new reply:
+<%= @message.sender.name%> has sent a reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
 -----------------------------------------------
-<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
+"<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>"
 -----------------------------------------------
-Visit <%= root_url %> and go to your inbox for more info.
+<%=t('message.look')%> at <%= t('socialstream')%>: <%=conversation_url(@message.conversation)%>.

data/app/views/messages/new.html.erb CHANGED Viewed

@@ -17,7 +17,7 @@
 		height: 6
 	});
+	/*
 	$('#body').ckeditor(
 	 function(){
 	  $('#cke_top_body').click( updateTextArea);
@@ -38,7 +38,7 @@
 			$("#body").trigger('keyup');
   }
+*/
 	<% unless @recipient.nil? %>
 		$("#_recipients").trigger("addItem",[{"title": "<%= truncate_name @recipient.name %>", "value": "<%= @recipient.id %>"}]);
 	<% end %>

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

@@ -1,6 +1,6 @@
 <% self.class.send :include, NotificationsHelper %>
 <%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
-===============================================
+-----------------------------------------------
 <%= strip_tags decode_notification @notification.body,@notification.notified_object  %>
-Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
+-----------------------------------------------
+Visit <%= notifications_url %> and check all your notifications.

data/app/views/objects/_show.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<% toolbar :profile => object._owner %>
+<%= render object.post_activity %>

data/app/views/posts/show.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <%= render :partial => 'objects/show',
2	+ :locals => { :object => @post } %>

data/config/locales/en.yml CHANGED Viewed

@@ -190,13 +190,14 @@ en:
   message:
     answer: "Write your answer"
     inbox: "Inbox"
+    look: "Take a look at this conversation"
     new: "New Message"
     one: "Message"
     other: "Messages"
     participants: "Participants"
+    send: "Send a message"
     sentbox: "Sentbox"
     trash: "Trash"
-    send: "Send a message"
   notification:
     confirm: "Confirm %{sender.name} as contact?"
     destroy_sure: "Do you want to delete this notification?"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.1".freeze
+    VERSION = "0.7.2".freeze
   end
 end

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

@@ -65,6 +65,16 @@ module SocialStream
           @_activity_parent ||= Activity.find(_activity_parent_id)
         end
+        # The {SocialStream::Models::Subject subject} that posted this object
+        def _author
+          post_activity.contact.sender_subject
+        end
+        # The owner of the wall where {#_author} posted this object
+        def _owner
+          post_activity.contact.receiver_subject
+        end
         private
         def create_post_activity

data/social_stream-base.gemspec CHANGED Viewed

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.4.0')
+  s.add_runtime_dependency('mailboxer','~> 0.4.1')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging

data/spec/controllers/likes_controller_spec.rb CHANGED Viewed

@@ -25,5 +25,24 @@ describe LikesController do
     assert ! @activity.liked_by?(@subject)
   end
+  it "should create, destroy and create it again" do
+    @activity = Factory(:activity)
+    @subject  = @activity.receiver_subject
+    sign_in @subject
+    post :create, :activity_id => @activity.id
+    assert @activity.liked_by?(@subject)
+    delete :destroy, :activity_id => @activity.id
+    assert ! @activity.liked_by?(@subject)
+    post :create, :activity_id => @activity.id
+    assert @activity.liked_by?(@subject)
+  end
 end

data/spec/controllers/posts_controller_spec.rb CHANGED Viewed

@@ -151,5 +151,17 @@ describe PostsController do
       post.post_activity.relations.should include(@tie.relation)
     end
   end
+  context "creating public post" do
+    before do
+      @post = Factory(:public_post)
+    end
+    it "should render" do
+      get :show, :id => @post.to_param
+      response.should be_success
+    end
+  end
 end

data/spec/factories/post.rb CHANGED Viewed

@@ -3,3 +3,8 @@ Factory.define :post do |p|
   p._contact_id { Factory(:friend).contact_id }
   p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
 end
+Factory.define :public_post, :parent => :post do |p|
+  p._contact_id { Factory(:self_contact).id }
+  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_public.id) }
+end

data/vendor/assets/javascripts/ckeditor/config.js CHANGED Viewed

@@ -18,4 +18,6 @@ CKEDITOR.editorConfig = function( config ) {
 	['Link','Unlink'],
 	['Image','Smiley']
 	];
+  config.skin = 'myskin,/assets/ckeditor/skins/kama/';
 };

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  hash: 1
+  hash: 7
   prerelease:
   segments:
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors:
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00 +02:00
+date: 2011-07-21 00:00:00 +02:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -205,12 +205,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 15
+        hash: 13
         segments:
         - 0
         - 4
-        - 0
-        version: 0.4.0
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency
@@ -811,6 +811,7 @@ files:
 - app/views/notifications/index.js.erb
 - app/views/objects/_destroy.js.erb
 - app/views/objects/_new.html.erb
+- app/views/objects/_show.html.erb
 - app/views/permissions/_index.html.erb
 - app/views/permissions/index.js.erb
 - app/views/posts/_fields.erb
@@ -818,6 +819,7 @@ files:
 - app/views/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
+- app/views/posts/show.html.erb
 - app/views/profiles/_contact.html.erb
 - app/views/profiles/_experience.html.erb
 - app/views/profiles/_personal.html.erb