social_stream-base 0.22.4 → 0.23.0

data/app/controllers/activities_controller.rb

@@ -1,18 +1,20 @@
-class ActivitiesController < InheritedResources::Base
-  actions :index
-
-  respond_to :js
-
-  protected
-
-  def collection
-    rel = params[:section].to_i if params[:section].present?
-
+class ActivitiesController < ApplicationController
+  def index
     # should be activities.page(params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 
     @activities ||= profile_subject.
                       wall(:profile,
-                           :for => current_subject,
-                           :relation => rel).
+                           :for => current_subject).
                       page(params[:page])
+
+    respond_to do |format|
+      format.js
+      format.atom
+    end
+  end
+
+  def show
+    activity = Activity.find(params[:id])
+
+    redirect_to activity.direct_object || activity.receiver_subject
   end
 end

data/app/controllers/api_controller.rb

@@ -22,17 +22,4 @@ class ApiController < ApplicationController
         
     redirect_to :controller => :users, :action => :show, :format => params[:format], :id => params[:id], :auth_token => params[:auth_token]
   end
-  
-  def activity_atom_feed
-    @subject = Actor.find_by_slug!(params[:id])
-    # FIXME: why? check with Victor
-    @subject ||= current_user
-
-    @activities = @subject.wall(:home).page(params[:page]).per(10)
-     
-    respond_to do |format|
-      format.atom
-    end
-  end
-  
 end

data/app/controllers/frontpage_controller.rb

@@ -7,12 +7,6 @@ class FrontpageController < ApplicationController
     end
   end
 
-  # Webfinger protocol
-  # http://code.google.com/p/webfinger/
-  def host_meta
-  end
-  
-
   private
 
   def redirect_user_to_home

data/app/models/activity.rb

@@ -197,8 +197,8 @@ class Activity < ActiveRecord::Base
     case verb
     when "follow", "make-friend", "like"
       I18n.t "activity.verb.#{ verb }.#{ receiver.subject_type }.title",
-      :subject => view.link_name(sender_subject),
-      :contact => view.link_name(receiver_subject)
+             :subject => view.link_name(sender_subject),
+             :contact => view.link_name(receiver_subject)
     when "post", "update"
       if sender == receiver
         view.link_name sender_subject
@@ -212,6 +212,25 @@ class Activity < ActiveRecord::Base
     end.html_safe
   end
 
+  # Title for activity streams
+  def stream_title
+    # FIXMEEEEEEEEEEEEEEEEE
+    object = ( direct_object.present? ? 
+               ( direct_object.is_a?(SocialStream::Models::Subject) ? 
+                 direct_object.name :
+                 direct_object.title ) :
+               receiver.name )
+
+    I18n.t "activity.stream.title.#{ verb }",
+           :author => sender_subject.name,
+           :activity_object => object
+  end
+
+  # TODO: detailed description of activity
+  def stream_content
+    stream_title
+  end
+    
   def notificable?
     is_root? or ['post','update'].include?(root.verb)
   end
@@ -245,65 +264,6 @@ class Activity < ActiveRecord::Base
     [parent] + siblings
   end
 
-  # Is subject allowed to perform action on this {Activity}?
-  def allow?(subject, action)
-    return false if author.blank?
-
-    case action
-    when 'create'
-      return false if subject.blank? || author_id != Actor.normalize_id(subject)
-
-      rels = Relation.normalize(relation_ids)
-
-      own_rels = rels.select{ |r| r.actor_id == author_id }
-      # Consider Relation::Single as own_relations
-      own_rels += rels.select{ |r| r.is_a?(Relation::Single) }
-
-      foreign_rels = rels - own_rels
-
-      # Only posting to own relations or allowed to post to foreign relations
-      return foreign_rels.blank? && own_rels.present? ||
-             foreign_rels.present? && Relation.allow(subject, 
-                                                     action,
-                                                     'activity',
-                                                     :in => foreign_rels).
-                                               all.size == foreign_rels.size
-
-    when 'read'
-      return true if relations.select{ |r| r.is_a?(Relation::Public) }.any?
-
-      return false if subject.blank?
-
-      return true if [author_id, owner_id].include?(Actor.normalize_id(subject))
-    when 'update'
-      return true if [author_id, owner_id].include?(Actor.normalize_id(subject))
-    when 'destroy'
-      # We only allow destroying to sender and receiver by now
-      return [author_id, owner_id].include?(Actor.normalize_id(subject))
-    end
-
-    Relation.
-      allow?(subject, action, 'activity', :in => self.relation_ids, :public => false)
-  end
-
-  # Can subject delete the object of this activity?
-  def delete_object_by?(subject)
-    subject.present? &&
-    direct_object.present? &&
-      ! direct_object.is_a?(Actor) &&
-      ! direct_object.class.ancestors.include?(SocialStream::Models::Subject) &&
-      allow?(subject, 'destroy')
-  end
-
-  # Can subject edit the object of this activity?
-  def edit_object_by?(subject)
-    subject.present? &&
-    direct_object.present? &&
-      ! direct_object.is_a?(Actor) &&
-      ! direct_object.class.ancestors.include?(SocialStream::Models::Subject) &&
-      allow?(subject, 'update')
-  end
-
   # Is this activity public?
   def public?
     relation_ids.include? Relation::Public.instance.id

data/app/models/actor.rb

@@ -136,13 +136,11 @@ class Actor < ActiveRecord::Base
   after_create :create_initial_relations
   
   after_create :save_or_create_profile
-  
-  class << self
-    def find_by_webfinger!(link)
-      link =~ /(acct:)?(.*)@/
 
-      find_by_slug! $2
-    end
+  # FIXME SocialStream::ActivityStreams::Supertype should take precedence over
+  # SocialStream::ActivityStreams::Subtype
+  def as_object_type
+    subtype_instance.as_object_type
   end
   
   #Returning the email address of the model if an email should be sent for this object (Message or Notification).
@@ -590,5 +588,3 @@ class Actor < ActiveRecord::Base
     mailbox.inbox(:unread => true).count(:id, :distinct => true)
   end
 end
-
-ActiveSupport.run_load_hooks(:actor, Actor)

data/app/models/audience.rb

@@ -7,3 +7,5 @@ class Audience < ActiveRecord::Base
   belongs_to :activity
   belongs_to :relation
 end
+
+ActiveSupport.run_load_hooks(:audience, Audience)

data/app/models/comment.rb

@@ -12,7 +12,8 @@ class Comment < ActiveRecord::Base
   end
 
   def parent_post
-    self.post_activity.parent.direct_object
+    _activity_parent_id && _activity_parent.direct_object ||
+      post_activity.parent.direct_object
   end
 
   def title

data/app/models/group.rb

@@ -57,5 +57,3 @@ class Group < ActiveRecord::Base
     end
   end
 end
-
-ActiveSupport.run_load_hooks(:group, Group)

data/app/models/relation.rb

@@ -181,6 +181,11 @@ class Relation < ActiveRecord::Base
     self.class.positive_names.include?(self.class.to_s)
   end
 
+  # Does this relation include the follow permission?
+  def follow?
+    permissions.follow.any?
+  end
+
   private
 
   # Before create callback
@@ -190,4 +195,3 @@ class Relation < ActiveRecord::Base
     self.sender_type = actor.subject_type
   end
 end
-

data/app/models/relation/custom.rb

@@ -5,8 +5,11 @@
 # Default relations are defined at config/relations.yml
 #
 class Relation::Custom < Relation
-  # Default relations are defined in this configuration file
-  CONFIG = File.join(::Rails.root, 'config', 'relations.yml')
+  # Default relations shipped with Social Stream
+  DEFAULT = {}
+
+  # Default relations are re-defined in this configuration file
+  CONFIG_FILE = File.join(::Rails.root, 'config', 'relations.yml')
 
   # This is weird. We must call #inspect before has_ancestry for Relation::Custom
   # to recognize STI
@@ -21,14 +24,14 @@ class Relation::Custom < Relation
   class << self
     # Relations configuration
     def config
-      @config ||= YAML.load_file(CONFIG)
+      @config ||= build_config
     end
 
     def defaults_for(actor)
       cfg_rels = config[actor.subject_type.underscore]
 
       if cfg_rels.nil?
-        raise "Undefined relations for subject type #{ actor.subject_type }. Please, add an entry to #{ CONFIG }"
+        raise "Undefined relations for subject type #{ actor.subject_type }. Please, add an entry to #{ CONFIG_FILE }"
       end
 
       rels = {}
@@ -62,6 +65,14 @@ class Relation::Custom < Relation
     def strongest
       roots
     end
+
+    private
+    
+    # Gets the default relations defined in DEFAULT and updates the values
+    # from the CONFIG_FILE configuration file
+    def build_config
+      DEFAULT.merge YAML.load_file(CONFIG_FILE)
+    end
   end
 
   # Compare two relations
@@ -110,3 +121,5 @@ class Relation::Custom < Relation
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:relation_custom, Relation::Custom)

data/app/models/tie.rb

@@ -156,5 +156,3 @@ class Tie < ActiveRecord::Base
         contact.sender_id == relation.actor_id
   end
 end
-
-ActiveSupport.run_load_hooks(:tie, Tie)

data/app/models/user.rb

@@ -153,5 +153,3 @@ class User < ActiveRecord::Base
     
   end
 end
-
-ActiveSupport.run_load_hooks(:user, User)

data/app/views/activities/_options.html.erb

@@ -22,7 +22,7 @@
       </div>
     <% end %>
 
-    <% if activity.delete_object_by?(current_subject) %>
+    <% if activity.direct_object && can?(:destroy, activity.direct_object) %>
       <div class="verb_delete"> 
         · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', 
                       :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  

data/app/views/activities/index.atom.builder

@@ -0,0 +1,48 @@
+atom_feed('xmlns:activity' => 'http://activitystrea.ms/spec/1.0/') do |feed|
+  feed.link :rel => 'next', :href => url_for(:only_path => false, :page => params[:page].to_i + 1, :format => :atom)
+  if params[:page].to_i > 1
+    feed.link :rel => 'previous', :href => url_for(:only_path => false, :page => params[:page].to_i - 1, :format => :atom)
+  end 
+
+  #FIXME find a way to decouple the view from here
+
+  if defined? SocialStream::Ostatus
+    feed.link :rel => 'hub', :href => SocialStream::Ostatus.hub
+    feed.link rel: 'salmon', href: salmon_url(profile_subject.slug)
+  end
+
+  feed.title(t 'activity.stream.atom_title', subject: profile_subject.name) 
+  feed.updated(@activities.first.present? ? @activities.first.updated_at : Time.now)
+
+  feed.author do
+    feed.name(profile_subject.name)
+    feed.uri("acct:#{ profile_subject.slug }@#{ request.host_with_port }")
+    feed.tag!('activity:object-type', profile_subject.as_object_type.to_s)
+  end
+
+  @activities.each do |activity|
+    feed.entry(activity) do |entry|
+      entry.title(activity.stream_title)
+      entry.summary(activity.direct_object.try(:description))
+
+      entry.author do |a|
+        a.name(activity.sender.name)
+        a.uri("acct:#{ activity.sender.slug }@#{ request.host_with_port }")
+        a.tag!('activity:object-type', activity.sender.as_object_type.to_s)
+      end
+
+      #TODO Ostatus mentions:
+      # entry.link rel: mentioned, href: "acct:#{ mentioned.slug }@#{ host_with_port }"
+
+      entry.tag!('activity:verb', activity.verb)
+
+      if (obj = activity.direct_object).present?
+        entry.tag!('activity:object') do |act_obj|
+          act_obj.title(obj.title)
+          act_obj.tag!('activity:object-type', obj.as_object_type.to_s)
+          act_obj.published(obj.created_at)
+        end
+      end
+    end
+  end
+end

data/app/views/activity_objects/_activity_object.atom.erb

@@ -0,0 +1 @@
+TODO

data/config/locales/en.yml

@@ -62,6 +62,14 @@ en:
           group: "Members of %{receiver}"
           user: "Contacts of %{receiver}"
     sending: "Sending"
+    stream:
+      atom_title: "Activity Stream from %{subject}"
+      title:
+        follow: "%{author} added %{activity_object} as contact"
+        like: "%{author} likes %{activity_object}"
+        make-friend: "%{author} also added %{activity_object} as contact"
+        post: "%{author} posted %{activity_object}"
+        updated: "%{author} posted %{activity_object}"
     title: "Activities"
     to_comment: "Comment"
     unlike: "I do not like anymore"

data/config/locales/es.yml

@@ -61,6 +61,14 @@ es:
           group: "Integrantes de %{receiver}"
           user: "Contactos de %{receiver}"
     sending: "Enviando"
+    stream:
+      atom_title: "Actividades de %{subject}"
+      title:
+        follow: "%{author} añadió a %{activity_object} como contacto"
+        like: "A %{author} le gusta %{activity_object}"
+        make-friend: "%{author} también añadió a %{activity_object} como contacto"
+        post: "%{author} publicó %{activity_object}"
+        updated: "%{author} actualizó %{activity_object}"
     title: "Actividades"
     to_comment: "Comentar"
     unlike: "Ya no me gusta"

data/config/routes.rb

@@ -101,21 +101,13 @@ Rails.application.routes.draw do
   match 'api/user/:id' => 'api#users', :as => :api_user
   match 'api/me' => 'api#users', :as => :api_me
   match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
-  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom', :as => :api_user_activities
 
   match 'api/me/contacts' => 'contacts#index', :format => 'json', :as => :api_contacts
   match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json', :as => :api_subject_contacts
   ##/API##
-
  
   #Background tasks
   constraints SocialStream::Routing::Constraints::Resque.new do
     mount Resque::Server, :at => "/resque"
   end
-
-  # Webfinger
-  match '.well-known/host-meta',:to => 'frontpage#host_meta'
-
-  # Find subjects by slug
-  match 'subjects/lrdd/:id' => 'subjects#lrdd', :as => 'subject_lrdd'
 end

data/lib/rails/social_stream.rb

@@ -5,7 +5,7 @@ class ActionDispatch::Http::UploadedFile
   def initialize_with_magic(*args, &block)
     initialize_without_magic(*args, &block)
 
-    if (unix_file = `which file`.chomp).present? && File.exists?(unix_file)
+    if (unix_file = `which file`.try(:chomp)).present? && File.exists?(unix_file)
       `#{ unix_file } -v 2>&1` =~ /^file-(.*)$/
       version = $1
 

data/lib/social_stream-base.rb

@@ -4,6 +4,11 @@ require 'social_stream/base/dependencies'
 # Provides your Rails application with social network and activity stream support
 module SocialStream
   autoload :Ability,   'social_stream/ability'
+  autoload :ActivityStreams, 'social_stream/activity_streams'
+  module ActivityStreams
+    autoload :Supertype, 'social_stream/activity_streams/supertype'
+    autoload :Subtype,   'social_stream/activity_streams/subtype'
+  end
   autoload :D3,        'social_stream/d3'
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'

data/lib/social_stream/ability/base.rb

@@ -37,40 +37,28 @@ module SocialStream
         end
 
         can :create, Comment do |c|
-          c._activity_parent.allow?(subject, 'read')
+          can? :read, c.parent_post
         end
 
         can :read, Comment do |c|
-          c.post_activity.allow?(subject, 'read')
+          can? :read, c.parent_post
         end
 
         can :update, Comment do |c|
-          c.post_activity.allow?(subject, 'update')
+          can? :update, c.parent_post
         end
 
         can :destroy, Comment do |c|
-          c.post_activity.allow?(subject, 'destroy')
+          can? :destroy, c.parent_post
         end
 
         # Activities
-        can :create, Activity do |a|
-          a.allow?(subject, 'create')
-        end
-
         can :read, Activity do |a|
           a.public? ||
             subject.present? &&
             a.audience.include?(subject.actor) 
         end
 
-        can :update, Activity do |a|
-          a.allow?(subject, 'update')
-        end
-
-        can :destroy, Activity do |a|
-          a.allow?(subject, 'destroy')
-        end
-
         # Users
         can :read, User