social_stream-base 0.6.6 → 0.6.8

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.8.7
+  - 1.9.2

data/app/helpers/notifications_helper.rb

@@ -1,15 +1,21 @@
 module NotificationsHelper
-  include SubjectsHelper, ActionView::Helpers::TextHelper
+  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), activity.sender.subject))
+    notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name), activity.sender.subject))   
+    notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_path(activity.receiver.contact_to!(activity.sender))))
+    notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),activity.sender.subject))
     notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
-
+    
     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(object.class.to_s.downcase,object))
       notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
+      notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), object)) 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\}/,"nilclass")
       notification_text=notification_text.gsub(/\%\{object.name\}/,"nilclass")

data/app/models/activity.rb

@@ -79,10 +79,13 @@ class Activity < ActiveRecord::Base
       order("created_at desc")
   }
 
+  before_validation :fill_relations
+
   after_create  :increment_like_count
   after_destroy :decrement_like_count, :delete_notifications
- 
 
+  validates_presence_of :relations
+ 
   #For now, it should be the last one
   #FIXME
   after_create :send_notifications
@@ -222,9 +225,9 @@ class Activity < ActiveRecord::Base
         if contact.reflexive?
           return true
         else
-          relation_ids = receiver.relation_customs.allow(sender, 'create', 'activity')
-
-          return relation_ids.present?
+          receiver.
+            relation_customs.allow(sender, 'create', 'activity').
+            present?
         end
       end
 
@@ -251,6 +254,16 @@ class Activity < ActiveRecord::Base
 
   private
 
+  # Before validation callback
+  #
+  # Fill the relations when posting to other subject's wall
+  def fill_relations
+    return if contact.reflexive? || relations.present?
+
+    self.relations =
+      contact.receiver.relation_customs.allow(contact.sender, 'create', 'activity')
+  end
+
   #Send notifications to actors based on proximity, interest and permissions
   def send_notifications
     notify

data/app/models/actor.rb

@@ -143,7 +143,7 @@ class Actor < ActiveRecord::Base
       receivers = group.contact_actors(:direction => :sent, :relations => relation)
       emails = Array.new
       receivers.each do |receiver|
-        emails << receiver.mailboxer_email
+        emails << receiver.email
       end
       return emails
     end
@@ -407,7 +407,8 @@ class Actor < ActiveRecord::Base
   # Build a new activity where subject like this
   def new_like(subject)
     a = Activity.new :verb => "like",
-                     :contact => subject.contact_to!(self)
+                     :contact => subject.contact_to!(self),
+                     :relation_ids => Array(subject.relation_public.id)
     
     a.activity_objects << activity_object           
                     

data/app/views/invitation_mailer/send_invitation.html.erb

@@ -1,8 +1,9 @@
 <div>
   <div>
-    <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
-    <br/>
-    <div style="position: absolute;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
+    <div style="padding: 10px 5px 5px 5px;">
+      <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
+    </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] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
       </div>
@@ -20,48 +21,50 @@
       </div>
     </div>
   </div>
-  <div>
-    <div>
-      <%= t('frontpage.share.default')%>:
-    </div>
-    <div>
-      <ul>
-        <li>
-          <%= t('frontpage.share.sentence1') %>
-        </li>
-        <li>
-          <%= t('frontpage.share.sentence2') %>
-        </li>
-      </ul>
-    </div>
-  </div>
-
-  <div>
-    <div>
-      <%= t('frontpage.meet.default')%>:
-    </div>
+  <div style="padding: 10px 5px 5px 5px;">
     <div>
-      <ul>
-        <li>
-          <%= t('frontpage.meet.sentence1') %>
-        </li>
-      </ul>
+      <div>
+        <%= t('frontpage.share.default')%>:
+      </div>
+      <div>
+        <ul>
+          <li>
+            <%= t('frontpage.share.sentence1') %>
+          </li>
+          <li>
+            <%= t('frontpage.share.sentence2') %>
+          </li>
+        </ul>
+      </div>
     </div>
-  </div>
-
-  <div>
+  
     <div>
-      <%= t('frontpage.collaborate.default')%>:
+      <div>
+        <%= t('frontpage.meet.default')%>:
+      </div>
+      <div>
+        <ul>
+          <li>
+            <%= t('frontpage.meet.sentence1') %>
+          </li>
+        </ul>
+      </div>
     </div>
+  
     <div>
-      <ul>
-        <li>
-          <%= t('frontpage.collaborate.sentence1') %>
-        </li>
-        <li>
-          <%= t('frontpage.collaborate.sentence2') %>
-        </li>
-      </ul>
+      <div>
+        <%= t('frontpage.collaborate.default')%>:
+      </div>
+      <div>
+        <ul>
+          <li>
+            <%= t('frontpage.collaborate.sentence1') %>
+          </li>
+          <li>
+            <%= t('frontpage.collaborate.sentence2') %>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,2 +1,2 @@
-%{sender} added you as contact. 
+%{confirm}
 

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

@@ -1,2 +1,2 @@
-%{sender.name} added you as contact.
+%{sender} added you as contact.
 

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

@@ -1,5 +1,5 @@
 <% if activity.direct_object.is_a? Actor %>
-  <%= render :partial => 'notifications/activities/like_subject_body' %>
+  %{look}
 <% else %>
-  <%= render :partial => 'notifications/activities/like_object_body'%>
-<% end %>
+  "%{object.text}" 
+<% end %>

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

@@ -1,5 +1,5 @@
 <% if activity.direct_object.is_a? Actor %>
-  <%= render :partial => 'notifications/activities/like_subject_subject' %>
+  %{sender.name} is now your fan.
 <% else %>
-  <%= render :partial => 'notifications/activities/like_object_subject' %>
+  %{sender.name} likes your %{object.name} 
 <% end %>

data/app/views/notifications/activities/_make-friend_body.html.erb

@@ -1,3 +1,2 @@
-%{sender} also added you as contact. 
-
+%{look}
 

data/app/views/notifications/activities/_make-friend_subject.html.erb

@@ -1,2 +1,2 @@
-%{sender.name} added you as contact. 
+%{sender} also added you as contact. 
 

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

@@ -1,2 +1,6 @@
-%{sender} added a %{object} in your wall. 
-
+<% if activity.direct_object.respond_to? :text %>
+  "%{object.text}"
+<%end%>
+<% if SocialStream.activity_forms.include? :document and activity.direct_object.is_a? Document %>
+  %{object.image}
+<% end%>

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

@@ -1 +1 @@
-%{sender.name} added a %{object.name} in your wall 
+%{sender} added a %{object} in your wall 

data/config/locales/en.yml

@@ -191,7 +191,9 @@ en:
     trash: "Trash"
     send: "Send a message"
   notification:
+    confirm: "Confirm %{sender.name} as contact?"
     destroy_sure: "Do you want to delete this notification?"
+    look: "Take a look at %{sender.name}'s wall"
     one: "Notification"
     other: "Notifications"
     read: "Mark as read"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.6.6".freeze
+    VERSION = "0.6.8".freeze
   end
 end

data/lib/social_stream/toolbar_config.rb

@@ -42,7 +42,7 @@ module SocialStream
         :url => "#",
         :options => {:link => {:id => "contacts_menu"}},
         :items => [
-          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.addresbook'), :url => contacts_path},
+          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.addressbook'), :url => contacts_path},
           {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path},
           {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)}
         ]}

data/social_stream-base.gemspec

@@ -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.3.2')
+  s.add_runtime_dependency('mailboxer','~> 0.3.3')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging

data/spec/dummy/config/environments/test.rb

@@ -28,6 +28,7 @@ Dummy::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

data/spec/models/activity_authorization_spec.rb

@@ -0,0 +1,339 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module ActivityTestHelper
+  def create_activity(contact, relations)
+    @activity = Factory(:activity,
+                        :contact_id => contact.id,
+                        :relation_ids => Array(Relation.normalize_id(relations)))
+
+  end
+
+  def create_ability_accessed_by(subject)
+    @ability = Ability.new(subject)
+  end
+
+  def create_ability_accessed_by_related(tie_type)
+    @tie = create_related_tie(tie_type)
+    @related = @tie.receiver_subject
+    @ability = Ability.new(@related)
+  end
+
+  def create_ability_accessed_publicly
+    u = Factory(:user)
+    @ability = Ability.new(u)
+  end
+
+  def create_related_tie(tie_type)
+    Factory(tie_type, :contact => Factory(:contact, :sender => Actor.normalize(@subject)))
+  end
+
+  shared_examples_for "Allows Creating" do
+    it "should allow create" do
+      @ability.should be_able_to(:create, @activity)
+    end
+  end
+  
+  shared_examples_for "Allows Reading" do
+    it "should allow read" do
+      @ability.should be_able_to(:read, @activity)
+    end
+  end
+  
+  shared_examples_for "Allows Updating" do
+    it "should allow update" do
+      @ability.should be_able_to(:update, @activity)
+    end
+  end
+  
+  shared_examples_for "Allows Destroying" do
+    it "should allow destroy" do
+      @ability.should be_able_to(:destroy, @activity)
+    end
+  end
+
+  shared_examples_for "Denies Creating" do
+    it "should deny create" do
+      @ability.should_not be_able_to(:create, @activity)
+    end
+  end
+  
+  shared_examples_for "Denies Reading" do
+    it "should deny read" do
+      @ability.should_not be_able_to(:read, @activity)
+    end
+  end
+  
+  shared_examples_for "Denies Updating" do
+    it "should deny update" do
+      @ability.should_not be_able_to(:update, @activity)
+    end
+  end
+  
+  shared_examples_for "Denies Destroying" do
+    it "should deny destroy" do
+      @ability.should_not be_able_to(:destroy, @activity)
+    end
+  end
+  
+end
+
+describe Activity do
+  include ActivityTestHelper
+
+  context "user" do
+    before(:all) do
+      @subject = @user = Factory(:user)
+    end
+
+    context "with public activity" do
+      before do
+        contact = @user.contact_to!(@user)
+        create_activity(contact, @user.relation_public)
+      end
+
+      describe "sender home" do
+        it "should include activity" do
+          @activity.sender.wall(:home).should include(@activity)
+        end
+      end
+
+      describe "sender profile" do
+        context "accessed by alien" do
+          it "should include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => Factory(:user)).should include(@activity)
+          end
+        end
+
+        context "accessed by anonymous" do
+          it "should include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => nil).should include(@activity)
+          end
+        end
+      end
+    end
+
+    describe "belonging to friend" do
+      before do
+        @tie = create_related_tie(:friend)
+        create_activity(@tie.contact.inverse!, @tie.relation)
+      end
+
+      describe "accessed by sender" do
+        before do
+          create_ability_accessed_by(@tie.receiver_subject)
+        end
+
+        it_should_behave_like "Allows Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Allows Updating"
+        it_should_behave_like "Allows Destroying"
+      end
+      
+      describe "accessed by different friend" do
+        before do
+          create_ability_accessed_by_related :friend
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed by acquaintance" do
+        before do
+          create_ability_accessed_by_related :acquaintance
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed publicly" do
+        before do
+          create_ability_accessed_publicly
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+    end
+    
+    describe "belonging to user's friend relation" do
+      before do
+        create_activity(@user.contact_to!(@user), @user.relation_custom('friend'))
+      end
+
+      describe "accessed by the sender" do
+        before do
+          create_ability_accessed_by(@user)
+        end
+
+        it_should_behave_like "Allows Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Allows Updating"
+        it_should_behave_like "Allows Destroying"
+      end
+      
+      describe "accessed by a friend" do
+        before do
+          create_ability_accessed_by_related :friend
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed by acquaintance" do
+        before do
+          create_ability_accessed_by_related :acquaintance
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed publicly" do
+        before do
+          create_ability_accessed_publicly
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+    end
+
+    describe "belonging to user's public relation" do
+
+      before do
+        create_activity(@user.contact_to!(@user), @user.relation_public)
+      end
+
+      describe "accessed by the sender" do
+        before do
+          create_ability_accessed_by(@user)
+        end
+
+        it_should_behave_like "Allows Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Allows Updating"
+        it_should_behave_like "Allows Destroying"
+      end
+      
+      describe "accessed by a friend" do
+        before do
+          create_ability_accessed_by_related :friend
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed by acquaintance" do
+        before do
+          create_ability_accessed_by_related :acquaintance
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed publicly" do
+        before do
+          create_ability_accessed_publicly
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+    end
+
+    describe "belonging to other user's public relation" do
+
+      before do
+        @tie = Factory(:public)
+        create_activity @tie.contact, @tie.sender.relation_public
+        create_ability_accessed_by @tie.receiver_subject
+      end
+      
+      it_should_behave_like "Denies Creating"
+    end
+  end
+
+  context "group" do
+    before(:all) do
+      @subject = @group = Factory(:group)
+    end
+
+    describe "belonging to member tie" do
+      before do
+        @tie = create_related_tie(:member)
+        create_activity @tie.contact.inverse!, @tie.relation
+      end
+
+      describe "accessed by same member" do
+        before do
+          create_ability_accessed_by @tie.receiver_subject
+        end
+
+        it_should_behave_like "Allows Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Allows Updating"
+        it_should_behave_like "Allows Destroying"
+      end
+      
+      describe "accessed by different member" do
+        before do
+          create_ability_accessed_by_related :member
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Allows Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed by partner" do
+        before do
+          create_ability_accessed_by_related :partner
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+
+      describe "accessed publicly" do
+        before do
+          create_ability_accessed_publicly
+        end
+
+        it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Reading"
+        it_should_behave_like "Denies Updating"
+        it_should_behave_like "Denies Destroying"
+      end
+    end
+  end
+end
+
+

data/spec/models/activity_spec.rb

@@ -1,84 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-module ActivityTestHelper
-  def create_activity(contact, relations)
-    @activity = Factory(:activity,
-                        :contact_id => contact.id,
-                        :relation_ids => Array(Relation.normalize_id(relations)))
-
-  end
-
-  def create_ability_accessed_by(subject)
-    @ability = Ability.new(subject)
-  end
-
-  def create_ability_accessed_by_related(tie_type)
-    @tie = create_related_tie(tie_type)
-    @related = @tie.receiver_subject
-    @ability = Ability.new(@related)
-  end
-
-  def create_ability_accessed_publicly
-    u = Factory(:user)
-    @ability = Ability.new(u)
-  end
-
-  def create_related_tie(tie_type)
-    Factory(tie_type, :contact => Factory(:contact, :sender => Actor.normalize(@subject)))
-  end
-
-  shared_examples_for "Allows Creating" do
-    it "should allow create" do
-      @ability.should be_able_to(:create, @activity)
-    end
-  end
-  
-  shared_examples_for "Allows Reading" do
-    it "should allow read" do
-      @ability.should be_able_to(:read, @activity)
-    end
-  end
-  
-  shared_examples_for "Allows Updating" do
-    it "should allow update" do
-      @ability.should be_able_to(:update, @activity)
-    end
-  end
-  
-  shared_examples_for "Allows Destroying" do
-    it "should allow destroy" do
-      @ability.should be_able_to(:destroy, @activity)
-    end
-  end
-
-  shared_examples_for "Denies Creating" do
-    it "should deny create" do
-      @ability.should_not be_able_to(:create, @activity)
-    end
-  end
-  
-  shared_examples_for "Denies Reading" do
-    it "should deny read" do
-      @ability.should_not be_able_to(:read, @activity)
-    end
-  end
-  
-  shared_examples_for "Denies Updating" do
-    it "should deny update" do
-      @ability.should_not be_able_to(:update, @activity)
-    end
-  end
-  
-  shared_examples_for "Denies Destroying" do
-    it "should deny destroy" do
-      @ability.should_not be_able_to(:destroy, @activity)
-    end
-  end
-  
-end
-
 describe Activity do
-  include ActivityTestHelper
 
   describe "wall" do
     context "with a friend activity" do
@@ -207,261 +129,6 @@ describe Activity do
     end
   end
 
-  context "user" do
-    before(:all) do
-      @subject = @user = Factory(:user)
-    end
-
-    context "with public activity" do
-      before do
-        contact = @user.contact_to!(@user)
-        create_activity(contact, @user.relation_public)
-      end
-
-      describe "sender home" do
-        it "should include activity" do
-          @activity.sender.wall(:home).should include(@activity)
-        end
-      end
-
-      describe "sender profile" do
-        context "accessed by alien" do
-          it "should include activity" do
-            @activity.sender.wall(:profile,
-                                  :for => Factory(:user)).should include(@activity)
-          end
-        end
-
-        context "accessed by anonymous" do
-          it "should include activity" do
-            @activity.sender.wall(:profile,
-                                  :for => nil).should include(@activity)
-          end
-        end
-      end
-    end
-
-    describe "belonging to friend" do
-      before do
-        @tie = create_related_tie(:friend)
-        create_activity(@tie.contact.inverse!, @tie.relation)
-      end
-
-      describe "accessed by sender" do
-        before do
-          create_ability_accessed_by(@tie.receiver_subject)
-        end
-
-        it_should_behave_like "Allows Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Allows Updating"
-        it_should_behave_like "Allows Destroying"
-      end
-      
-      describe "accessed by different friend" do
-        before do
-          create_ability_accessed_by_related :friend
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed by acquaintance" do
-        before do
-          create_ability_accessed_by_related :acquaintance
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Denies Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed publicly" do
-        before do
-          create_ability_accessed_publicly
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Denies Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-    end
-    
-    describe "belonging to user's friend relation" do
-      before do
-        create_activity(@user.contact_to!(@user), @user.relation_custom('friend'))
-      end
-
-      describe "accessed by the sender" do
-        before do
-          create_ability_accessed_by(@user)
-        end
-
-        it_should_behave_like "Allows Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Allows Updating"
-        it_should_behave_like "Allows Destroying"
-      end
-      
-      describe "accessed by a friend" do
-        before do
-          create_ability_accessed_by_related :friend
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed by acquaintance" do
-        before do
-          create_ability_accessed_by_related :acquaintance
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Denies Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed publicly" do
-        before do
-          create_ability_accessed_publicly
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Denies Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-    end
-
-    describe "belonging to user's public relation" do
-
-      before do
-        create_activity(@user.contact_to!(@user), @user.relation_public)
-      end
-
-      describe "accessed by the sender" do
-        before do
-          create_ability_accessed_by(@user)
-        end
-
-        it_should_behave_like "Allows Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Allows Updating"
-        it_should_behave_like "Allows Destroying"
-      end
-      
-      describe "accessed by a friend" do
-        before do
-          create_ability_accessed_by_related :friend
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed by acquaintance" do
-        before do
-          create_ability_accessed_by_related :acquaintance
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed publicly" do
-        before do
-          create_ability_accessed_publicly
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-    end
-
-    describe "belonging to other user's public relation" do
-
-      before do
-        @tie = Factory(:public)
-        create_activity @tie.contact, @tie.sender.relation_public
-        create_ability_accessed_by @tie.receiver_subject
-      end
-      
-      it_should_behave_like "Denies Creating"
-    end
-  end
-
-  context "group" do
-    before(:all) do
-      @subject = @group = Factory(:group)
-    end
-
-    describe "belonging to member tie" do
-      before do
-        @tie = create_related_tie(:member)
-        create_activity @tie.contact.inverse!, @tie.relation
-      end
-
-      describe "accessed by same member" do
-        before do
-          create_ability_accessed_by @tie.receiver_subject
-        end
-
-        it_should_behave_like "Allows Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Allows Updating"
-        it_should_behave_like "Allows Destroying"
-      end
-      
-      describe "accessed by different member" do
-        before do
-          create_ability_accessed_by_related :member
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Allows Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed by partner" do
-        before do
-          create_ability_accessed_by_related :partner
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Denies Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-
-      describe "accessed publicly" do
-        before do
-          create_ability_accessed_publicly
-        end
-
-        it_should_behave_like "Denies Creating"
-        it_should_behave_like "Denies Reading"
-        it_should_behave_like "Denies Updating"
-        it_should_behave_like "Denies Destroying"
-      end
-    end
-  end
-
   context "without relations" do
     it "should allow create to friend" do
       tie = Factory(:friend)
@@ -470,5 +137,16 @@ describe Activity do
 
       assert activity.allow?(tie.receiver, 'create')
     end
+
+    it "should fill relation" do
+      tie = Factory(:friend)
+
+      post = Post.new :text => "testing",
+                      :_contact_id => tie.contact.inverse!.id
+
+      post.save!
+
+      post.post_activity.relations.should include(tie.relation)
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +02:00
+date: 2011-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,12 +205,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 3
-        - 2
-        version: 0.3.2
+        - 3
+        version: 0.3.3
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -447,6 +447,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE
@@ -1011,11 +1012,7 @@ files:
 - app/views/notifications/activities/_follow_body.html.erb
 - app/views/notifications/activities/_follow_subject.html.erb
 - app/views/notifications/activities/_like_body.html.erb
-- app/views/notifications/activities/_like_object_body.html.erb
-- app/views/notifications/activities/_like_object_subject.html.erb
 - app/views/notifications/activities/_like_subject.html.erb
-- app/views/notifications/activities/_like_subject_body.html.erb
-- app/views/notifications/activities/_like_subject_subject.html.erb
 - app/views/notifications/activities/_make-friend_body.html.erb
 - app/views/notifications/activities/_make-friend_subject.html.erb
 - app/views/notifications/activities/_post_body.html.erb
@@ -1153,6 +1150,7 @@ files:
 - spec/factories/tie.rb
 - spec/factories/user.rb
 - spec/integration/navigation_spec.rb
+- spec/models/activity_authorization_spec.rb
 - spec/models/activity_spec.rb
 - spec/models/actor_spec.rb
 - spec/models/contact_spec.rb

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

@@ -1,2 +0,0 @@
-%{sender} likes your %{object}. 
- 

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

@@ -1,2 +0,0 @@
-%{sender.name} likes your %{object.name} 
- 

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

@@ -1 +0,0 @@
-%{sender} is now your fan.

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

@@ -1,2 +0,0 @@
-%{sender.name} is now your fan.
-