lib/social_stream/ability.rb in social_stream-0.2.3 vs lib/social_stream/ability.rb in social_stream-0.3.0

@@ -2,25 +2,26 @@
   class Ability
     include CanCan::Ability
 
     def initialize(user)
       can :create, Activity do |a|
-        # All ties authors must the user
-        a.tie.sender_subject == user &&
-          a.tie.permission?(user, 'create', 'activity')
+        # All ties' authors must be the user
+        a.tie.receiver_subject == user &&
+          a.tie.allows?(user, 'create', 'activity')
       end
 
       can :read, Activity do |a|
+        # This condition would not be neccesary if every actor had a public tie with others
         a.tie.relation.name == 'public' ||
-          a.tie.permission?(user, 'read', 'activity')
+          a.tie.allows?(user, 'read', 'activity')
       end
 
       can :update, Activity do |a|
-        a.tie.permission?(user, 'update', 'activity')
+        a.tie.allows?(user, 'update', 'activity')
       end
 
       can :destroy, Activity do |a|
-        a.tie.permission?(user, 'destroy', 'activity')
+        a.tie.allows?(user, 'destroy', 'activity')
       end
     end
   end
 end