Adds Follower behavior to External Person

- Introduces Follower and Followable concerns - Adds External Profile - External Person can follow profiles - External Profiles can be followed - Refactors Profile/Circle relations Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>

Adds Follower behavior to External Person
- Introduces Follower and Followable concerns - Adds External Profile - External Person can follow profiles - External Profiles can be followed - Refactors Profile/Circle relations Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Dylan Guedes · Gabriel Silva
1 parent 9b3cd0de
Showing 39 changed files with 665 additions and 401 deletions Show diff stats
app/controllers/concerns/needs_profile.rb
app/controllers/my_profile/circles_controller.rb
app/controllers/my_profile/followers_controller.rb
app/controllers/public/profile_controller.rb
app/jobs/notify_activity_to_profiles_job.rb
app/models/add_member.rb
app/models/circle.rb
app/models/concerns/external_user.rb
app/models/concerns/followable.rb
app/models/concerns/follower.rb
app/models/external_person.rb
app/models/external_profile.rb
app/models/favorite_enterprise_person.rb
app/models/friendship.rb
app/models/person.rb
app/models/profile.rb
app/models/profile_follower.rb
app/views/blocks/profile_info_actions/_select_circles.html.erb
app/views/followers/_profile_list.html.erb
app/views/profile/_profile_comment_form.html.erb
@@ -32,6 +32,8 @@ module NeedsProfile
         params.delete(:profile)
         redirect_to(Noosfero.url_options.merge(params).merge(:host => profile_hostname))
       end
+    elsif session[:external]
+      @profile = ExternalPerson.find(session[:external])
     else
       render_not_found
     end
@@ -3,7 +3,7 @@ class CirclesController &lt; MyProfileController
   before_action :accept_only_post, :only => [:create, :update, :destroy]
   def index
-    @circles = profile.circles
+    @circles = profile.owned_circles
   end
   def new
@@ -11,7 +11,7 @@ class CirclesController &lt; MyProfileController
   end
   def create
-    @circle = Circle.new(params[:circle].merge({ :person => profile }))
+    @circle = Circle.new(params[:circle].merge({ :owner => profile }))
     if @circle.save
       redirect_to :action => 'index'
     else
@@ -21,7 +21,7 @@ class CirclesController &lt; MyProfileController
   def xhr_create
     if request.xhr?
-      circle = Circle.new(params[:circle].merge({:person => profile }))
+      circle = Circle.new(params[:circle].merge({:owner => profile }))
       if circle.save
         render :partial => "circle_checkbox", :locals => { :circle => circle },
                :status => 201
@@ -4,11 +4,11 @@ class FollowersController &lt; MyProfileController
   before_action :accept_only_post, :only => [:update_category]
   def index
-    @followed_people = profile.followed_profiles.order(:type)
+    @followed_people = profile.followed_profiles.sort_by(&:type)
     @profile_types = {_('All profiles') => nil}.merge(Circle.profile_types).to_a
     if params['filter'].present?
-      @followed_people = @followed_people.where(:type => params['filter'])
+      @followed_people = @followed_people.select{|c| c.type == params['filter']}
       @active_filter = params['filter']
     end
@@ -17,7 +17,7 @@ class FollowersController &lt; MyProfileController
   def set_category_modal
     followed_profile = Profile.find(params[:followed_profile_id])
-    circles = Circle.where(:person => profile, :profile_type => followed_profile.class.name)
+    circles = Circle.where(:owner => profile, :profile_type => followed_profile.class.name)
     render :partial => 'followers/edit_circles_modal', :locals => { :circles => circles, :followed_profile => followed_profile }
   end
@@ -74,6 +74,8 @@ class ProfileController &lt; PublicController
   def following
     @followed_people = profile.followed_profiles.paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.followed_profiles.count)
+    puts "FOLLOWED_PEOPLE: #{@followed_people.map(&:name)}"
+    return @followed_people
   end
   def followed
@@ -170,6 +172,7 @@ class ProfileController &lt; PublicController
     if profile.followed_by?(current_person)
       render :text => _("You are already following %s.") % profile.name, :status => 400
     else
+      params[:circles] ||= []
       selected_circles = params[:circles].map{ |circle_name, circle_id| Circle.find_by(:id => circle_id) }.select{ |c| c.present? }
       if selected_circles.present?
         current_person.follow(profile, selected_circles)
@@ -181,7 +184,7 @@ class ProfileController &lt; PublicController
   end
   def find_profile_circles
-    circles = Circle.where(:person => current_person, :profile_type => profile.class.name)
+    circles = Circle.where(:owner => current_person, :profile_type => profile.class.name)
     render :partial => 'blocks/profile_info_actions/circles', :locals => { :circles => circles, :profile_types => Circle.profile_types.to_a }
   end
@@ -260,10 +263,11 @@ class ProfileController &lt; PublicController
   end
   def search_followed
-    result = []
-    circles = find_by_contents(:circles, user, user.circles.where(:profile_type => 'Person'), params[:q])[:results]
-    followed = find_by_contents(:followed, user, Profile.followed_by(user), params[:q])[:results]
-    result = circles + followed
+    circles = find_by_contents(:circles, user, user.owned_circles.where(:profile_type => 'Person'), params[:q])[:results]
+    local_followed = find_by_contents(:followed, user, user.local_followed_profiles, params[:q])[:results]
+    external_followed = find_by_contents(:followed, user, user.external_followed_profiles, params[:q])[:results]
+
+    result = circles + local_followed + external_followed
     render :text => prepare_to_token_input_by_class(result).to_json
   end
@@ -516,7 +520,7 @@ class ProfileController &lt; PublicController
         followed << Person.find(identifier)
       when 'Circle'
         circle = Circle.find(identifier)
-        followed += Profile.in_circle(circle)
+        followed += circle.profiles
       end
     end
     followed.uniq
@@ -24,7 +24,7 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
       ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT profiles.id, #{tracked_action.id} FROM profiles WHERE profiles.id IN (#{target.marked_people.map(&:id).join(',')})")
     else
       # Notify all followers
-      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.owner_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.owner_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
     end
     if tracked_action.user.is_a? Organization
@@ -22,7 +22,7 @@ class AddMember &lt; Task
       self.roles = [Profile::Roles.member(organization.environment.id).id]
     end
     target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
-    person.follow(organization, Circle.find_or_create_by(:person => person, :name =>_('memberships'), :profile_type => 'Community'))
+    person.follow(organization, Circle.find_or_create_by(:owner => person, :name =>_('memberships'), :profile_type => 'Community'))
   end
   def title
@@ -6,30 +6,35 @@ class Circle &lt; ApplicationRecord
   _('Circle')
   has_many :profile_followers
-  belongs_to :person
+  belongs_to :owner, polymorphic: true
-  attr_accessible :name, :person, :profile_type
+  attr_accessible :name, :owner, :profile_type
   validates :name, presence: true
-  validates :person_id, presence: true
+  validates :owner_id, presence: true
   validates :profile_type, presence: true
-  validates :person_id, :uniqueness => {:scope => :name, :message => "can't add two circles with the same name"}
+  validates :owner_id, :uniqueness => {:scope => :name, :message => "can't add two circles with the same name"}
   validate :profile_type_must_be_in_list
   scope :by_owner, -> person{
-    where(:person => person)
+    where(:owner => person)
   }
   scope :with_name, -> name{
     where(:name => name)
   }
+  def profiles
+    self.profile_followers.map(&:profile)
+  end
+
   def self.profile_types
     {
       _("Person") => Person.name,
       _("Community") => Community.name,
-      _("Enterprise") => Enterprise.name
+      _("Enterprise") => Enterprise.name,
+      _("Organization") => Organization.name
     }
   end
@@ -20,7 +20,7 @@ module ExternalUser
       if login && domain && environment.has_federated_network?(domain)
         external_environment = environment.external_environments.find_by_domain(domain)
         scheme = "http#{external_environment.uses_ssl? ? 's' : ''}"
-        url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+
+p        url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+
                          login+'@'+domain)
         http = build_request(url)
         req = Net::HTTP::Get.new(url.to_s)
@@ -0,0 +1,23 @@
+module Followable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :profile_followers, :as => :profile
+    has_many :circles, :through => :profile_followers
+  end
+
+  def followers
+    person_followers = Person.joins(:owned_circles).merge(circles).uniq
+    external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
+
+    person_followers + external_person_followers
+  end
+
+  def followed_by?(person)
+    (person == self) || (person.in? self.followers)
+  end
+
+  def in_circle?(circle)
+    circle.in? self.circles
+  end
+end
@@ -0,0 +1,52 @@
+module Follower
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :owned_circles, as: :owner, :class_name => "Circle"
+  end
+
+  def follow(profile, circles)
+    circles = [circles] unless circles.is_a?(Array)
+    circles.each do |new_circle|
+      next if new_circle.owner != self || !profile.kind_of?(new_circle.profile_type.constantize)
+      ProfileFollower.create(profile: profile, circle: new_circle)
+    end
+  end
+
+  def follows?(profile)
+    return false if profile.nil?
+    profile.followed_by?(self)
+  end
+
+  def unfollow(profile)
+    ProfileFollower.with_follower(self).with_profile(profile).destroy_all
+  end
+
+  def local_followed_profiles
+    Profile.joins(:circles).where("circles.owner_id = ?", self.id).uniq
+  end
+
+  def external_followed_profiles
+    ExternalProfile.joins(:circles).where("circles.owner_id = ?", self.id).uniq
+  end
+
+  def followed_profiles
+    local_followed_profiles + external_followed_profiles
+  end
+
+  def update_profile_circles(profile, new_circles)
+    profile_circles = ProfileFollower.with_profile(profile).with_follower(self).map(&:circle)
+    circles_to_add = new_circles - profile_circles
+    self.follow(profile, circles_to_add)
+
+    circles_to_remove = profile_circles - new_circles
+    ProfileFollower.where('circle_id IN (?) AND profile_id = ?',
+                          circles_to_remove.map(&:id), profile.id).destroy_all
+  end
+
+  def remove_profile_from_circle(profile, circle)
+    return if circle.owner != self
+    ProfileFollower.with_profile(profile).with_circle(circle).destroy_all
+  end
+
+end
 # A pseudo profile is a person from a remote network
-class ExternalPerson < ActiveRecord::Base
+class ExternalPerson < ExternalProfile
   include Human
   include ProfileEntity
+  include Follower
   validates_uniqueness_of :identifier, scope: :source
-
   validates_presence_of :source, :email, :created_at
   attr_accessible :source, :email, :created_at
@@ -27,13 +27,6 @@ class ExternalPerson &lt; ActiveRecord::Base
     _('Public profile')
   end
-  def avatar
-    "http://#{self.source}/profile/#{self.identifier}/icon/"
-  end
-
-  def url
-    "http://#{self.source}/profile/#{self.identifier}"
-  end
   alias :public_profile_url :url
@@ -75,10 +68,6 @@ class ExternalPerson &lt; ActiveRecord::Base
     "#{scheme}://#{self.source}"
   end
-  def profile_custom_icon(gravatar_default=nil)
-    self.avatar
-  end
-
   def preferred_login_redirection
     environment.redirection_after_login
   end
@@ -122,26 +111,6 @@ class ExternalPerson &lt; ActiveRecord::Base
     "#{jid(options)}/#{self.name}"
   end
-  class ExternalPerson::Image
-    def initialize(path)
-      @path = path
-    end
-
-    def public_filename(size = nil)
-      URI.join(@path, size.to_s)
-    end
-
-    def content_type
-      # This is not really going to be used anywhere that matters
-      # so we are hardcodding it here.
-      'image/png'
-    end
-  end
-
-  def image
-    ExternalPerson::Image.new(avatar)
-  end
-
   def data_hash(gravatar_default = nil)
     friends_list = {}
     {
@@ -195,67 +164,11 @@ class ExternalPerson &lt; ActiveRecord::Base
      build_contact: nil, is_a_friend?: false, ask_to_join?: false, refuse_join:
      nil, blocks_to_expire_cache: [], cache_keys: [], communities_cache_key: '',
      friends_cache_key: '', manage_friends_cache_key: '',
-     relationships_cache_key: '', is_member_of?: false, follows?: false,
+     relationships_cache_key: '', is_member_of?: false,
      each_friend: nil, is_last_admin?: false, is_last_admin_leaving?: false,
      leave: nil, last_notification: nil, notification_time: 0, notifier: nil,
-     remove_suggestion: nil, allow_invitation_from?: false
-    }
-
-    derivated_methods = generate_derivated_methods(methods_and_responses)
-    derivated_methods.merge(methods_and_responses)
-  end
-
-  def profile_instance_methods
-    methods_and_responses = {
-     role_assignments: RoleAssignment.none, favorite_enterprises:
-     Enterprise.none, memberships: Profile.none, friendships: Profile.none,
-     tasks: Task.none, suggested_profiles: ProfileSuggestion.none,
-     suggested_people: ProfileSuggestion.none, suggested_communities:
-     ProfileSuggestion.none, public_profile: true, nickname: nil, custom_footer:
-     '', custom_header: '', address: '', zip_code: '', contact_phone: '',
-     image_builder: nil, description: '', closed: false, template_id: nil, lat:
-     nil, lng: nil, is_template: false, fields_privacy: {}, preferred_domain_id:
-     nil, category_ids: [], country: '', city: '', state: '',
-     national_region_code: '', redirect_l10n: false, notification_time: 0,
-     custom_url_redirection: nil, email_suggestions: false,
-     allow_members_to_invite: false, invite_friends_only: false, secret: false,
-     profile_admin_mail_notification: false, redirection_after_login: nil,
-     profile_activities: ProfileActivity.none, action_tracker_notifications:
-     ActionTrackerNotification.none, tracked_notifications:
-     ActionTracker::Record.none, scraps_received: Scrap.none, template:
-     Profile.none, comments_received: Comment.none, email_templates:
-     EmailTemplate.none, members: Profile.none, members_like: Profile.none,
-     members_by: Profile.none, members_by_role: Profile.none, scraps:
-     Scrap.none, welcome_page_content: nil, settings: {}, find_in_all_tasks:
-     nil, top_level_categorization: {}, interests: Category.none, geolocation:
-     '', country_name: '', pending_categorizations: [], add_category: false,
-     create_pending_categorizations: false, top_level_articles: Article.none,
-     valid_identifier: true, valid_template: false, create_default_set_of_boxes:
-     true, copy_blocks_from: nil, default_template: nil,
-     template_without_default: nil, template_with_default: nil, apply_template:
-     false, iframe_whitelist: [], recent_documents: Article.none, last_articles:
-     Article.none, is_validation_entity?: false, hostname: nil, own_hostname:
-     nil, article_tags: {}, tagged_with: Article.none,
-     insert_default_article_set: false, copy_articles_from: true,
-     copy_article_tree: nil, copy_article?: false, add_member: false,
-     remove_member: false, add_admin: false, remove_admin: false, add_moderator:
-     false, display_info_to?: true, update_category_from_region: nil,
-     accept_category?: false, custom_header_expanded: '',
-     custom_footer_expanded: '', public?: true, themes: [], find_theme: nil,
-     blogs: Blog.none, blog: nil, has_blog?: false, forums: Forum.none, forum:
-     nil, has_forum?: false, admins: [], settings_field: {}, setting_changed:
-     false, public_content: true, enable_contact?: false, folder_types: [],
-     folders: Article.none, image_galleries: Article.none, image_valid: true,
-     update_header_and_footer: nil, update_theme: nil, update_layout_template:
-     nil, recent_actions: ActionTracker::Record.none, recent_notifications:
-     ActionTracker::Record.none, more_active_label: _('no activity'),
-     more_popular_label: _('no members'), profile_custom_image: nil,
-     is_on_homepage?: false, activities: ProfileActivity.none,
-     may_display_field_to?: true, may_display_location_to?: true, public_fields:
-     {}, followed_by?: false, display_private_info_to?: true, can_view_field?:
-     true, remove_from_suggestion_list: nil, layout_template: 'default',
-     is_admin?: false, add_friend: false, follows?: false, is_a_friend?: false,
-     already_request_friendship?: false
+     remove_suggestion: nil, allow_invitation_from?: false, in_social_circle?: false,
+     allow_followers: false
     }
     derivated_methods = generate_derivated_methods(methods_and_responses)
@@ -266,25 +179,15 @@ class ExternalPerson &lt; ActiveRecord::Base
     if person_instance_methods.keys.include?(method)
       return person_instance_methods[method]
     end
-    if profile_instance_methods.keys.include? method
-      return profile_instance_methods[method]
-    end
+    super(method, *args, &block)
   end
   def respond_to_missing?(method_name, include_private = false)
     person_instance_methods.keys.include?(method_name) ||
-    profile_instance_methods.keys.include?(method_name) ||
     super
   end
-  private
-
-  def generate_derivated_methods(methods)
-    derivated_methods = {}
-    methods.keys.each do |method|
-      derivated_methods[method.to_s.insert(-1, '?').to_sym] = false
-      derivated_methods[method.to_s.insert(-1, '=').to_sym] = nil
-    end
-    derivated_methods
+  def kind_of?(klass)
+    (klass == Person) ? true : super
   end
 end
@@ -0,0 +1,126 @@
+class ExternalProfile < ApplicationRecord
+
+  include Followable
+
+  SEARCHABLE_FIELDS = {
+    :name => {:label => _('Name'), :weight => 10},
+    :identifier => {:label => _('Username'), :weight => 5},
+    :nickname => {:label => _('Nickname'), :weight => 2},
+  }
+
+  def name
+    "#{self[:name]}@#{self.source}"
+  end
+
+  class ExternalProfile::Image
+    def initialize(path)
+      @path = path
+    end
+
+    def public_filename(size = nil)
+      URI.join(@path, size.to_s)
+    end
+
+    def content_type
+      # This is not really going to be used anywhere that matters
+      # so we are hardcodding it here.
+      'image/png'
+    end
+  end
+
+  def url
+    "http://#{self.source}/profile/#{self.identifier}"
+  end
+
+  def image
+    ExternalProfile::Image.new(avatar)
+  end
+
+  def profile_custom_icon(gravatar_default=nil)
+    self.avatar
+  end
+
+  def avatar
+    "http://#{self.source}/profile/#{self.identifier}/icon/"
+  end
+
+  # External Profile should respond to all methods in Profile
+def profile_instance_methods
+    methods_and_responses = {
+     role_assignments: RoleAssignment.none, favorite_enterprises:
+     Enterprise.none, memberships: Profile.none, friendships: Profile.none,
+     tasks: Task.none, suggested_profiles: ProfileSuggestion.none,
+     suggested_people: ProfileSuggestion.none, suggested_communities:
+     ProfileSuggestion.none, public_profile: true, nickname: nil, custom_footer:
+     '', custom_header: '', address: '', zip_code: '', contact_phone: '',
+     image_builder: nil, description: '', closed: false, template_id: nil, lat:
+     nil, lng: nil, is_template: false, fields_privacy: {}, preferred_domain_id:
+     nil, category_ids: [], country: '', city: '', state: '',
+     national_region_code: '', redirect_l10n: false, notification_time: 0,
+     custom_url_redirection: nil, email_suggestions: false,
+     allow_members_to_invite: false, invite_friends_only: false, secret: false,
+     profile_admin_mail_notification: false, redirection_after_login: nil,
+     profile_activities: ProfileActivity.none, action_tracker_notifications:
+     ActionTrackerNotification.none, tracked_notifications:
+     ActionTracker::Record.none, scraps_received: Scrap.none, template:
+     Profile.none, comments_received: Comment.none, email_templates:
+     EmailTemplate.none, members: Profile.none, members_like: Profile.none,
+     members_by: Profile.none, members_by_role: Profile.none, scraps:
+     Scrap.none, welcome_page_content: nil, settings: {}, find_in_all_tasks:
+     nil, top_level_categorization: {}, interests: Category.none, geolocation:
+     '', country_name: '', pending_categorizations: [], add_category: false,
+     create_pending_categorizations: false, top_level_articles: Article.none,
+     valid_identifier: true, valid_template: false, create_default_set_of_boxes:
+     true, copy_blocks_from: nil, default_template: nil,
+     template_without_default: nil, template_with_default: nil, apply_template:
+     false, iframe_whitelist: [], recent_documents: Article.none, last_articles:
+     Article.none, is_validation_entity?: false, hostname: nil, own_hostname:
+     nil, article_tags: {}, tagged_with: Article.none,
+     insert_default_article_set: false, copy_articles_from: true,
+     copy_article_tree: nil, copy_article?: false, add_member: false,
+     remove_member: false, add_admin: false, remove_admin: false, add_moderator:
+     false, display_info_to?: true, update_category_from_region: nil,
+     accept_category?: false, custom_header_expanded: '',
+     custom_footer_expanded: '', public?: true, themes: [], find_theme: nil,
+     blogs: Blog.none, blog: nil, has_blog?: false, forums: Forum.none, forum:
+     nil, has_forum?: false, admins: [], settings_field: {}, setting_changed:
+     false, public_content: true, enable_contact?: false, folder_types: [],
+     folders: Article.none, image_galleries: Article.none, image_valid: true,
+     update_header_and_footer: nil, update_theme: nil, update_layout_template:
+     nil, recent_actions: ActionTracker::Record.none, recent_notifications:
+     ActionTracker::Record.none, more_active_label: _('no activity'),
+     more_popular_label: _('no members'), profile_custom_image: nil,
+     is_on_homepage?: false, activities: ProfileActivity.none,
+     may_display_field_to?: true, may_display_location_to?: true, public_fields:
+     {}, display_private_info_to?: true, can_view_field?:
+     true, remove_from_suggestion_list: nil, layout_template: 'default',
+     is_admin?: false, add_friend: false, is_a_friend?: false,
+     already_request_friendship?: false, tracked_actions: ActionTracker::Record.none
+    }
+
+    derivated_methods = generate_derivated_methods(methods_and_responses)
+    derivated_methods.merge(methods_and_responses)
+  end
+
+  def method_missing(method, *args, &block)
+    if profile_instance_methods.keys.include? method
+      return profile_instance_methods[method]
+    end
+    raise NoMethodError, "undefined method #{method} for #{self}"
+  end
+
+  def respond_to_missing?(method_name, include_private = false)
+    profile_instance_methods.keys.include?(method_name) || super
+  end
+
+  private
+
+  def generate_derivated_methods(methods)
+    derivated_methods = {}
+    methods.keys.each do |method|
+      derivated_methods[method.to_s.insert(-1, '?').to_sym] = false
+      derivated_methods[method.to_s.insert(-1, '=').to_sym] = nil
+    end
+    derivated_methods
+  end
+end
@@ -8,7 +8,7 @@ class FavoriteEnterprisePerson &lt; ApplicationRecord
   belongs_to :person
   after_create do |favorite|
-    favorite.person.follow(favorite.enterprise, Circle.find_or_create_by(:person => favorite.person, :name =>_('favorites'), :profile_type => 'Enterprise'))
+    favorite.person.follow(favorite.enterprise, Circle.find_or_create_by(:owner => favorite.person, :name =>_('favorites'), :profile_type => 'Enterprise'))
   end
   protected
@@ -12,7 +12,7 @@ class Friendship &lt; ApplicationRecord
     circles = friendship.group.blank? ? ['friendships'] : friendship.group.split(',').map(&:strip)
     circles.each do |circle|
-      friendship.person.follow(friendship.friend, Circle.find_or_create_by(:person => friendship.person, :name => circle, :profile_type => 'Person'))
+      friendship.person.follow(friendship.friend, Circle.find_or_create_by(:owner => friendship.person, :name => circle, :profile_type => 'Person'))
     end
   end
@@ -22,7 +22,7 @@ class Friendship &lt; ApplicationRecord
     groups = friendship.group.blank? ? ['friendships'] : friendship.group.split(',').map(&:strip)
     groups.each do |group|
-      circle = Circle.find_by(:person => friendship.person, :name => group )
+      circle = Circle.find_by(:owner => friendship.person, :name => group )
       friendship.person.remove_profile_from_circle(friendship.friend, circle) if circle
     end
   end
@@ -2,6 +2,7 @@
 class Person < Profile
   include Human
+  include Follower
   attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles
@@ -93,7 +94,6 @@ class Person &lt; Profile
   has_many :following_articles, :class_name => 'Article', :through => :article_followers, :source => :article
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
-  has_many :circles
   scope :online, -> {
     joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
@@ -183,33 +183,6 @@ class Person &lt; Profile
     end
   end
-  def follow(profile, circles)
-    circles = [circles] unless circles.is_a?(Array)
-    circles.each do |new_circle|
-      ProfileFollower.create(profile: profile, circle: new_circle)
-    end
-  end
-
-  def update_profile_circles(profile, new_circles)
-    profile_circles = ProfileFollower.with_profile(profile).with_follower(self).map(&:circle)
-    circles_to_add = new_circles - profile_circles
-    circles_to_remove = profile_circles - new_circles
-    circles_to_add.each do |new_circle|
-      ProfileFollower.create(profile: profile, circle: new_circle)
-    end
-
-    ProfileFollower.where('circle_id IN (?) AND profile_id = ?',
-                          circles_to_remove.map(&:id), profile.id).destroy_all
-  end
-
-  def unfollow(profile)
-    ProfileFollower.with_follower(self).with_profile(profile).destroy_all
-  end
-
-  def remove_profile_from_circle(profile, circle)
-    ProfileFollower.with_profile(profile).with_circle(circle).destroy_all
-  end
-
   def already_request_friendship?(person)
     person.tasks.where(requestor_id: self.id, type: 'AddFriend', status: Task::Status::ACTIVE).first
   end
@@ -494,11 +467,6 @@ class Person &lt; Profile
     profile.members.include?(self)
   end
-  def follows?(profile)
-    return false if profile.nil?
-    profile.followed_by?(self)
-  end
-
   def each_friend(offset=0)
     while friend = self.friends.order(:id).offset(offset).first
       yield friend
@@ -603,10 +571,6 @@ class Person &lt; Profile
     }
   end
-  def followed_profiles
-    Profile.followed_by self
-  end
-
   def in_social_circle?(person)
     self.is_a_friend?(person) || super
   end
@@ -4,6 +4,7 @@
 class Profile < ApplicationRecord
   include ProfileEntity
+  include Followable
   attr_accessible :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time,
     :custom_url_redirection, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :profile_admin_mail_notification, :redirection_after_login, :allow_followers
@@ -222,20 +223,6 @@ class Profile &lt; ApplicationRecord
   scope :more_active, -> { order 'activities_count DESC' }
   scope :more_recent, -> { order "created_at DESC" }
-  scope :followed_by, -> person{
-    distinct.select('profiles.*').
-    joins('left join profiles_circles ON profiles_circles.profile_id = profiles.id').
-    joins('left join circles ON circles.id = profiles_circles.circle_id').
-    where('circles.person_id = ?', person.id)
-  }
-
-  scope :in_circle, -> circle{
-    distinct.select('profiles.*').
-    joins('left join profiles_circles ON profiles_circles.profile_id = profiles.id').
-    joins('left join circles ON circles.id = profiles_circles.circle_id').
-    where('circles.id = ?', circle.id)
-  }
-
   settings_items :allow_followers, :type => :boolean, :default => true
   alias_method :allow_followers?, :allow_followers
@@ -251,8 +238,7 @@ class Profile &lt; ApplicationRecord
   has_many :email_templates, :foreign_key => :owner_id
-  has_many :profile_followers
-  has_many :followers, -> { uniq }, :class_name => 'Person', :through => :profile_followers, :source => :person
+  # has_many :followers, -> { uniq }, :through => :profile_followers, :source => :person
   # Although this should be a has_one relation, there are no non-silly names for
   # a foreign key on article to reference the template to which it is
@@ -729,7 +715,7 @@ private :generate_url, :url_options
       else
         self.affiliate(person, Profile::Roles.admin(environment.id), attributes) if members.count == 0
         self.affiliate(person, Profile::Roles.member(environment.id), attributes)
-        person.follow(self, Circle.find_or_create_by(:person => person, :name =>_('memberships'), :profile_type => 'Community'))
+        person.follow(self, Circle.find_or_create_by(:owner => person, :name =>_('memberships'), :profile_type => self.class.name))
       end
       person.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == self.id }.each { |invite| invite.cancel }
       remove_from_suggestion_list person
@@ -1011,10 +997,6 @@ private :generate_url, :url_options
     self.active_fields
   end
-  def followed_by?(person)
-    (person == self) || (person.in? self.followers)
-  end
-
   def in_social_circle?(person)
     (person == self) || (person.is_member_of?(self))
   end
@@ -1058,7 +1040,4 @@ private :generate_url, :url_options
     person.kind_of?(Profile) && person.has_permission?('destroy_profile', self)
   end
-  def in_circle?(circle, follower)
-    ProfileFollower.with_follower(follower).with_circle(circle).with_profile(self).present?
-  end
 end
@@ -4,17 +4,24 @@ class ProfileFollower &lt; ApplicationRecord
   attr_accessible :profile, :circle
-  belongs_to :profile
+  #TODO -> user being followed
+  belongs_to :profile, :polymorphic => true
   belongs_to :circle
-  has_one :person, through: :circle
-  alias follower person
+  #TODO -> circle owner
+  # has_one :person, through: :circle, source_type: "ProfileFollower"
+
+  def circle_owner
+    self.circle.owner
+  end
+
+  alias follower circle_owner
   validates_presence_of :profile_id, :circle_id
   validates :profile_id, :uniqueness => {:scope => :circle_id, :message => "can't put a profile in the same circle twice"}
   scope :with_follower, -> person{
-    joins(:circle).where('circles.person_id = ?', person.id)
+    joins(:circle).where('circles.owner_id = ?', person.id)
   }
   scope :with_profile, -> profile{
@@ -3,7 +3,7 @@
   <div id="circles-checkboxes">
     <% circles.each do |circle| %>
       <div class="circle">
-        <%= labelled_check_box circle.name, "circles[#{circle.name}]", circle.id, followed_profile.in_circle?(circle, follower) %>
+        <%= labelled_check_box circle.name, "circles[#{circle.name}]", circle.id, followed_profile.in_circle?(circle) %>
       </div>
     <% end %>
   </div>
 <ul class="profile-list">
+  <h1>Aqui</h1>
   <% profiles.each do |followed_profile| %>
     <li>
     <%= link_to_profile profile_image(followed_profile) + tag('br') + followed_profile.short_name,
@@ -10,7 +10,7 @@
                                  :rows => 1,
                                  :class => 'submit-with-keypress',
                                  :title => _('Leave your comment'),
-                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
+                                 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false).to_s + ")'" if logged_in?),
                                  :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
                                  :value => _('Leave your comment'),
                                  :style => 'color: #ccc' %>
@@ -0,0 +1,11 @@
+class AddsPersonTypeToCircles < ActiveRecord::Migration
+  def up
+    add_column :circles, :person_type, :string, default: "Person"
+    add_index :circles, [:person_id, :person_type]
+  end
+
+  def down
+    remove_column :circles, :person_type
+    remove_index :circles, [:person_id, :person_type]
+  end
+end
@@ -0,0 +1,11 @@
+class AddsProfileTypeToProfileFollowers < ActiveRecord::Migration
+  def up
+    add_column :profiles_circles, :profile_type, :string, default: "Person"
+    add_index :profiles_circles, [:profile_id, :profile_type]
+  end
+
+  def down
+    remove_column :profiles_circles, :profile_type
+    remove_index :profiles_circles, [:profile_id, :profile_type]
+  end
+end
@@ -0,0 +1,11 @@
+class RenamePersonIdFromCircles < ActiveRecord::Migration
+  def up
+    rename_column :circles, :person_id, :owner_id
+    rename_column :circles, :person_type, :owner_type
+  end
+
+  def down
+    rename_column :circles, :owner_id, :person_id
+    rename_column :circles, :owner_type, :person_type
+  end
+end
@@ -0,0 +1,9 @@
+class RenameExternalPeopleToExternalProfiles < ActiveRecord::Migration
+  def up
+    rename_table :external_people, :external_profiles
+  end
+
+  def down
+    rename_table :external_profiles, :external_people
+  end
+end
@@ -0,0 +1,9 @@
+class AddTypeToExternalProfile < ActiveRecord::Migration
+  def up
+    add_column :external_profiles, :type, :string, default: "ExternalProfile"
+  end
+
+  def down
+    remove_column :external_profiles, :type
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160705162914) do
+ActiveRecord::Schema.define(version: 20160829185118) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -277,11 +277,13 @@ ActiveRecord::Schema.define(version: 20160705162914) do
   create_table "circles", force: :cascade do |t|
     t.string  "name"
-    t.integer "person_id"
-    t.string  "profile_type", null: false
+    t.integer "owner_id"
+    t.string  "profile_type",                    null: false
+    t.string  "owner_type",   default: "Person"
   end
-  add_index "circles", ["person_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
+  add_index "circles", ["owner_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
+  add_index "circles", ["owner_id", "owner_type"], name: "index_circles_on_owner_id_and_owner_type", using: :btree
   create_table "comments", force: :cascade do |t|
     t.string   "title"
@@ -439,7 +441,7 @@ ActiveRecord::Schema.define(version: 20160705162914) do
   add_index "external_feeds", ["enabled"], name: "index_external_feeds_on_enabled", using: :btree
   add_index "external_feeds", ["fetched_at"], name: "index_external_feeds_on_fetched_at", using: :btree
-  create_table "external_people", force: :cascade do |t|
+  create_table "external_profiles", force: :cascade do |t|
     t.string   "name"
     t.string   "identifier"
     t.string   "source"
@@ -448,6 +450,7 @@ ActiveRecord::Schema.define(version: 20160705162914) do
     t.boolean  "visible",        default: true
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "type",           default: "ExternalProfile"
   end
   create_table "favorite_enterprise_people", force: :cascade do |t|
@@ -686,9 +689,11 @@ ActiveRecord::Schema.define(version: 20160705162914) do
     t.integer  "circle_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "profile_type", default: "Person"
   end
   add_index "profiles_circles", ["profile_id", "circle_id"], name: "profiles_circles_composite_key_index", unique: true, using: :btree
+  add_index "profiles_circles", ["profile_id", "profile_type"], name: "index_profiles_circles_on_profile_id_and_profile_type", using: :btree
   create_table "qualifier_certifiers", force: :cascade do |t|
     t.integer "qualifier_id"
 Given /^the user "(.+)" has the following circles$/ do |user_name,table|
   person = User.find_by(:login => user_name).person
   table.hashes.each do |circle|
-    Circle.create!(:person => person, :name => circle[:name], :profile_type => circle[:profile_type])
+    Circle.create!(:owner => person, :name => circle[:name], :profile_type => circle[:profile_type])
   end
 end
@@ -11,7 +11,7 @@ Then /^&quot;(.+)&quot; should be a follower of &quot;(.+)&quot; in circle &quot;(.+)&quot;$/ do |person, prof
   person = Person.find_by(identifier: person)
   followers.should include(person)
-  circle = Circle.find_by(:name => circle, :person => person)
+  circle = Circle.find_by(:name => circle, :owner => person)
   ProfileFollower.find_by(:circle => circle, :profile => profile).should_not == nil
 end
@@ -25,11 +25,11 @@ end
 Given /^"(.+)" is a follower of "(.+)" in circle "(.+)"$/ do |person, profile, circle|
   profile =  Profile.find_by(identifier: profile)
   person = Person.find_by(identifier: person)
-  circle = Circle.find_by(:name => circle, :person => person)
+  circle = Circle.find_by(:name => circle, :owner => person)
   ProfileFollower.create!(:circle => circle, :profile => profile)
 end
 Then /^"(.+)" should have the circle "(.+)" with profile type "(.+)"$/ do |user_name, circle, profile_type|
   person = User.find_by(:login => user_name).person
-  Circle.find_by(:name => circle, :person => person, :profile_type => profile_type).should_not == nil
+  Circle.find_by(:name => circle, :owner => person, :profile_type => profile_type).should_not == nil
 end
@@ -10,8 +10,8 @@ class CirclesControllerTest &lt; ActionController::TestCase
   end
   should 'return all circles of a profile' do
-    circle1 = Circle.create!(:name => "circle1", :person => @person, :profile_type => 'Person')
-    circle2 = Circle.create!(:name => "circle2", :person => @person, :profile_type => 'Person')
+    circle1 = Circle.create!(:name => "circle1", :owner => @person, :profile_type => 'Person')
+    circle2 = Circle.create!(:name => "circle2", :owner => @person, :profile_type => 'Person')
     get :index, :profile => @person.identifier
     assert_equivalent [circle1, circle2], assigns[:circles]
@@ -24,7 +24,7 @@ class CirclesControllerTest &lt; ActionController::TestCase
   end
   should 'create a new circle' do
-    assert_difference '@person.circles.count' do
+    assert_difference '@person.owned_circles.count' do
       post :create, :profile => @person.identifier,
                     :circle => { :name => 'circle' , :profile_type => Person.name}
     end
@@ -32,14 +32,14 @@ class CirclesControllerTest &lt; ActionController::TestCase
   end
   should 'not create a circle without a name' do
-    assert_no_difference '@person.circles.count' do
+    assert_no_difference '@person.owned_circles.count' do
       post :create, :profile => @person.identifier, :circle => { :name => nil }
     end
     assert_template :new
   end
   should 'retrieve an existing circle when editing' do
-    circle = Circle.create!(:name => "circle", :person => @person, :profile_type => 'Person')
+    circle = Circle.create!(:name => "circle", :owner => @person, :profile_type => 'Person')
     get :edit, :profile => @person.identifier, :id => circle.id
     assert_equal circle.name, assigns[:circle].name
   end
@@ -50,7 +50,7 @@ class CirclesControllerTest &lt; ActionController::TestCase
   end
   should 'update an existing circle' do
-    circle = Circle.create!(:name => "circle", :person => @person, :profile_type => 'Person')
+    circle = Circle.create!(:name => "circle", :owner => @person, :profile_type => 'Person')
     post :update, :profile => @person.identifier, :id => circle.id,
                   :circle => { :name => "new name" }
@@ -60,7 +60,7 @@ class CirclesControllerTest &lt; ActionController::TestCase
   end
   should 'not update an existing circle without a name' do
-    circle = Circle.create!(:name => "circle", :person => @person, :profile_type => 'Person')
+    circle = Circle.create!(:name => "circle", :owner => @person, :profile_type => 'Person')
     post :update, :profile => @person.identifier, :id => circle.id,
                   :circle => { :name => nil }
@@ -75,18 +75,18 @@ class CirclesControllerTest &lt; ActionController::TestCase
   end
   should 'destroy an existing circle and remove related profiles' do
-    circle = Circle.create!(:name => "circle", :person => @person, :profile_type => 'Person')
+    circle = Circle.create!(:name => "circle", :owner => @person, :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => fast_create(Person).id, :circle_id => circle.id)
-    assert_difference ["@person.circles.count", 'ProfileFollower.count'], -1 do
+    assert_difference ["@person.owned_circles.count", 'ProfileFollower.count'], -1 do
       post :destroy, :profile => @person.identifier, :id => circle.id
     end
   end
   should 'not destroy an existing circle if action is not post' do
-    circle = Circle.create!(:name => "circle", :person => @person, :profile_type => 'Person')
+    circle = Circle.create!(:name => "circle", :owner => @person, :profile_type => 'Person')
-    assert_no_difference "@person.circles.count" do
+    assert_no_difference "@person.owned_circles.count" do
       get :destroy, :profile => @person.identifier, :id => circle.id
     end
     assert_response 404
@@ -9,8 +9,8 @@ class FollowersControllerTest &lt; ActionController::TestCase
   should 'return followed people list' do
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle.id)
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    ProfileFollower.create(:profile => person, :circle => circle)
     get :index, :profile => @profile.identifier
     assert_includes assigns(:followed_people), person
@@ -20,10 +20,10 @@ class FollowersControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
     community = fast_create(Community)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> @profile, :name => "Teams", :profile_type => 'Community')
-    fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle.id)
-    fast_create(ProfileFollower, :profile_id => community.id, :circle_id => circle2.id)
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> @profile, :name => "Teams", :profile_type => 'Community')
+    ProfileFollower.create(:profile => person, :circle => circle)
+    ProfileFollower.create(:profile => community, :circle => circle2)
     get :index, :profile => @profile.identifier, :filter => "Community"
     assert_equal assigns(:followed_people), [community]
@@ -47,8 +47,8 @@ class FollowersControllerTest &lt; ActionController::TestCase
   should 'update followed person category' do
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> @profile, :name => "DotA", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> @profile, :name => "DotA", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle.id)
     post :update_category, :profile => @profile.identifier, :circles => {"DotA"=> circle2.id}, :followed_profile_id => person.id
@@ -773,7 +773,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'not see the followers activities in the current profile' do
-    circle = Circle.create!(:person=> profile, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> profile, :name => "Zombies", :profile_type => 'Person')
     p2 = create_user.person
     refute profile.follows?(p2)
@@ -969,7 +969,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     p1= fast_create(Person)
-    circle = Circle.create!(:person=> profile, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> profile, :name => "Zombies", :profile_type => 'Person')
     profile.follow(p1, circle)
@@ -1993,7 +1993,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
     assert_difference 'ProfileFollower.count' do
       post :follow, :profile => person.identifier, :circles => {"Zombies" => circle.id}
@@ -2004,8 +2004,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> @profile, :name => "Brainsss", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> @profile, :name => "Brainsss", :profile_type => 'Person')
     assert_difference 'ProfileFollower.count', 2 do
       post :follow, :profile => person.identifier, :circles => {"Zombies" => circle.id, "Brainsss"=> circle2.id}
@@ -2016,8 +2016,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> @profile, :name => "Brainsss", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> @profile, :name => "Brainsss", :profile_type => 'Person')
     assert_no_difference 'ProfileFollower.count' do
       post :follow, :profile => person.identifier, :circles => {"Zombies" => "0", "Brainsss" => "0"}
@@ -2030,11 +2030,11 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle.id)
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    ProfileFollower.create(:profile => person, :circle => circle)
     assert_no_difference 'ProfileFollower.count' do
-      post :follow, :profile => person.identifier, :follow => { :circles => {"Zombies" => circle.id} }
+      post :follow, :profile => person.identifier, :circles => {"Zombies" => circle.id}
     end
     assert_response 400
   end
@@ -2050,8 +2050,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
-    follower = fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle.id)
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
+    follower = ProfileFollower.create!(:profile => person, circle: circle)
     assert_not_nil follower
@@ -2073,7 +2073,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     person = fast_create(Person)
-    circle = Circle.create!(:person=> @profile, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> @profile, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle.id)
     post :unfollow, :profile => person.identifier, :redirect_to => "/some/url"
@@ -2082,8 +2082,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should "search followed people or circles" do
     login_as(@profile.identifier)
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
-    c2 = Circle.create!(:name => 'Work', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
+    c2 = Circle.create!(:name => 'Work', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     p3 = create_user('mary').person
@@ -2115,7 +2115,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'treat followed entries' do
     login_as(@profile.identifier)
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     p3 = create_user('mary').person
@@ -2132,7 +2132,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'return empty followed entries if the user is not on his wall' do
     login_as(@profile.identifier)
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     p3 = create_user('mary').person
@@ -2149,7 +2149,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'leave private scrap' do
     login_as(@profile.identifier)
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     ProfileFollower.create!(:profile => p1, :circle => c1)
@@ -2165,7 +2165,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'list private scraps on wall for marked people' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     ProfileFollower.create!(:profile => p1, :circle => c1)
     p1.add_friend(@profile)
@@ -2179,7 +2179,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'not list private scraps on wall for not marked people' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     not_marked = create_user('jack').person
@@ -2197,7 +2197,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'list private scraps on wall for creator' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     ProfileFollower.create!(:profile => p1, :circle => c1)
     scrap = Scrap.create!(:content => 'Secret message.', :sender_id => @profile.id, :receiver_id => @profile.id, :marked_people => [p1])
@@ -2210,7 +2210,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'list private scraps on wall for environment administrator' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     admin = create_user('env-admin').person
     env = @profile.environment
@@ -2227,7 +2227,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'list private scraps on network for marked people' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     p2.add_friend(p1)
@@ -2245,7 +2245,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'not list private scraps on network for not marked people' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     not_marked = create_user('jack').person
     not_marked.add_friend(p1)
@@ -2262,7 +2262,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'list private scraps on network for creator' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     p1.add_friend(@profile)
     ProfileFollower.create!(:profile => p1, :circle => c1)
@@ -2277,7 +2277,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
   should 'list private scraps on network for environment admin' do
-    c1 = Circle.create!(:name => 'Family', :person => @profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => @profile, :profile_type => Person)
     p1 = create_user('emily').person
     admin = create_user('env-admin').person
     env = @profile.environment
@@ -1101,7 +1101,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'create notifications to followers when creating an article' do
     friend = fast_create(Person)
-    circle = Circle.create!(:person=> friend, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> friend, :name => "Zombies", :profile_type => 'Person')
     friend.follow(profile, circle)
     Article.destroy_all
     ActionTracker::Record.destroy_all
@@ -1115,7 +1115,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'create the notification to the follower when one follower has the notification and the other no' do
     f1 = fast_create(Person)
-    circle = Circle.create!(:person=> f1, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> f1, :name => "Zombies", :profile_type => 'Person')
     f1.follow(profile, circle)
     User.current = profile.user
@@ -1125,7 +1125,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal 2, ActionTrackerNotification.where(action_tracker_id: article.activity.id).count
     f2 = fast_create(Person)
-    circle2 = Circle.create!(:person=> f2, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> f2, :name => "Zombies", :profile_type => 'Person')
     f2.follow(profile, circle2)
     article2 = create TinyMceArticle, :name => 'Tracked Article 2', :profile_id => profile.id
@@ -1137,7 +1137,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'destroy activity and notifications of followers when destroying an article' do
     friend = fast_create(Person)
-    circle = Circle.create!(:person=> friend, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> friend, :name => "Zombies", :profile_type => 'Person')
     friend.follow(profile, circle)
@@ -134,4 +134,30 @@ class ExternalPersonTest &lt; ActiveSupport::TestCase
       assert_respond_to ExternalPerson.new, method.to_sym unless method =~ /^autosave_.*|validate_.*|^before_.*|^after_.*|^assignment_.*|^(city|state)_.*/
     end
   end
+
+  should 'raise error if method is not in Person or Profile' do
+    assert_raise NoMethodError do
+      ExternalPerson.new.send(:this_method_does_not_exist_right?)
+    end
+  end
+
+  should 'be able to follow people' do
+    person = fast_create(Person, :environment_id => Environment.default.id)
+    circle = Circle.create(owner: @external_person, profile_type: "Person", name: "FRIENDSSS")
+
+    assert_difference "@external_person.followed_profiles.count" do
+      @external_person.follow(person, circle)
+    end
+  end
+
+  should 'be able to unfolllow people' do
+    person = fast_create(Person, :environment_id => Environment.default.id)
+    circle = Circle.create(owner: @external_person, profile_type: "Person", name: "FRIENDSSS")
+    @external_person.follow(person, circle)
+
+    assert_difference "@external_person.followed_profiles.count", -1 do
+      @external_person.unfollow(person)
+    end
+  end
+
 end
@@ -0,0 +1,59 @@
+require_relative "../test_helper"
+
+class FollowableTest < ActiveSupport::TestCase
+
+  def setup
+    @person1 = create_user('perso-test-1').person
+    @person2 = create_user('person-test-2').person
+    @external_person = ExternalPerson.create!(identifier: 'johnlocke',
+                                     name: 'John Locke',
+                                     source: 'anerenvironment.org',
+                                     email: 'locke@island.org',
+                                     created_at: Date.yesterday)
+
+    @circle1 = Circle.create!(owner: @person1, name: "Zombies", profile_type: 'Person')
+    @circle2 = Circle.create!(owner: @person1, name: "Humans", profile_type: 'Person')
+    @circle3 = Circle.create!(owner: @external_person, name: "Crypt", profile_type: 'Person')
+
+    @external_profile = ExternalProfile.create
+  end
+
+  should 'return all unique circles and followers of a profile' do
+    @person1.follow(@person2, @circle1)
+    @person1.follow(@person2, @circle2)
+    @external_person.follow(@person2, @circle3)
+
+    assert_equivalent [@circle1, @circle2, @circle3], @person2.circles
+    assert_equivalent [@person1, @external_person], @person2.followers
+  end
+
+  should 'return all unique circles and followers of a external profile' do
+    Circle.any_instance.stubs(:profile_type).returns("ExternalProfile")
+    @person1.follow(@external_profile, @circle1)
+    @person1.follow(@external_profile, @circle2)
+    @external_person.follow(@external_profile, @circle3)
+
+    assert_equivalent [@circle1, @circle2, @circle3], @external_profile.circles
+    assert_equivalent [@person1, @external_person], @external_profile.followers
+  end
+
+  should 'onlyreturn true if profile is in circle' do
+    @person1.follow(@person2, @circle1)
+    @external_person.follow(@person2, @circle3)
+
+    assert @person2.in_circle? @circle1
+    assert @person2.in_circle? @circle3
+    refute @person2.in_circle? @circle2
+  end
+
+  should 'only return true if external profile is in circle' do
+    Circle.any_instance.stubs(:profile_type).returns("ExternalProfile")
+    @person1.follow(@external_profile, @circle1)
+    @external_person.follow(@external_profile, @circle3)
+
+    assert @external_profile.in_circle? @circle1
+    assert @external_profile.in_circle? @circle3
+    refute @external_profile.in_circle? @circle2
+  end
+
+end
@@ -0,0 +1,184 @@
+require_relative "../test_helper"
+
+class FollowerTest < ActiveSupport::TestCase
+
+  def setup
+    @person1 = create_user('perso-test-1').person
+    @person2 = create_user('person-test-2').person
+
+    @circle1 = Circle.create!(owner: @person1, name: "Zombies", profile_type: 'Person')
+    @circle2 = Circle.create!(owner: @person1, name: "Humans", profile_type: 'Person')
+    @circle3 = Circle.create!(owner: @person1, name: "Crypt", profile_type: 'Community')
+
+    @external_person = ExternalPerson.create!(identifier: 'johnlocke',
+                                     name: 'John Locke',
+                                     source: 'anerenvironment.org',
+                                     email: 'locke@island.org',
+                                     created_at: Date.yesterday)
+  end
+
+  should 'follows? return false when no profile is passed as parameter' do
+    assert_equal false, @person1.follows?(nil)
+  end
+
+  should 'follow person with regular user' do
+    assert_difference '@person1.followed_profiles.count' do
+      @person1.follow(@person2, @circle1)
+    end
+    assert @person1.follows?(@person2)
+  end
+
+  should 'follow a community' do
+    community = fast_create(Community)
+    circle = Circle.create!(owner: @person1, name: "Terminus", profile_type: 'Community')
+
+    assert_difference '@person1.followed_profiles.count' do
+      @person1.follow(community, circle)
+    end
+    assert @person1.follows?(community)
+  end
+
+  should 'not follow person if the user is not the owner of the circle' do
+    person3 = create_user('perso-test-3').person
+
+    assert_no_difference '@circle1.owner.followed_profiles.count' do
+      person3.follow(@person2, @circle1)
+    end
+    assert_not @circle1.owner.follows?(@person2)
+  end
+
+  should 'not follow a community if circle profile type does not match' do
+    community = fast_create(Community)
+
+    assert_no_difference '@person1.followed_profiles.count' do
+      @person1.follow(community, @circle1)
+    end
+    assert_not @person1.follows?(community)
+  end
+
+  should 'follow person with external user' do
+    @circle1.update_attributes(owner: @external_person)
+
+    assert_difference '@external_person.followed_profiles.count' do
+      @external_person.follow(@person2, @circle1)
+    end
+    assert @external_person.follows?(@person2)
+  end
+
+  should 'unfollow person with regular user' do
+    @person1.follow(@person2, @circle1)
+
+    assert_difference '@person1.followed_profiles.count', -1 do
+      @person1.unfollow(@person2)
+    end
+    assert_not @person1.follows?(@person2)
+  end
+
+  should 'unfollow person with external user' do
+    @circle1.update_attributes(owner: @external_person)
+    @external_person.follow(@person2, @circle1)
+
+    assert_difference '@external_person.followed_profiles.count', -1 do
+      @external_person.unfollow(@person2)
+    end
+    assert_not @external_person.follows?(@person2)
+  end
+
+  should 'get the followed profiles for a regular user' do
+    community = fast_create(Community)
+
+    @person1.follow(@person2, @circle1)
+    @person1.follow(@external_person, @circle1)
+    @person1.follow(community, @circle3)
+    assert_equivalent [@person2, @external_person, community],
+                      @person1.followed_profiles
+  end
+
+  should 'get the followed profiles for an external user' do
+    person3 = create_user('person-test-3').person
+    community = fast_create(Community)
+    @circle1.update_attributes(owner: @external_person)
+    @circle3.update_attributes(owner: @external_person)
+
+    @external_person.follow(@person2, @circle1)
+    @external_person.follow(person3, @circle1)
+    @external_person.follow(community, @circle3)
+    assert_equivalent [@person2, person3, community],
+                      @external_person.followed_profiles
+  end
+
+  should 'not follow same person twice even with different circles' do
+    circle4 = Circle.create!(owner: @person1, name: "Free Folk", profile_type: 'Person')
+
+    @person1.follow(@person2, @circle1)
+    @person1.follow(@person2, @circle2)
+    @person1.follow(@person2, circle4)
+    assert_equivalent [@person2], @person1.followed_profiles
+  end
+
+  should 'display an error if a person is already being followed' do
+    @person1.follow(@person2, @circle1)
+    profile_follower = ProfileFollower.new(circle: @circle1, profile: @person2)
+
+    profile_follower.valid?
+    assert profile_follower.errors.messages[:profile_id].present?
+  end
+
+  should 'update profile circles for a person' do
+    circle4 = Circle.create!(owner: @person1, name: "Brains", profile_type: 'Person')
+    @person1.follow(@person2, [@circle1, @circle2])
+
+    @person1.update_profile_circles(@person2, [@circle2, circle4])
+    assert_equivalent [@circle2, circle4], @person2.circles
+  end
+
+  should 'keep other follower circles after update' do
+    person3 = create_user('person-test-3').person
+    circle4 = Circle.create!(owner: person3, name: "Humans", profile_type: 'Person')
+    @person1.follow(@person2, @circle1)
+    person3.follow(@person2, circle4)
+
+    @person1.update_profile_circles(@person2, [@circle1, @circle2])
+    assert_equivalent [@circle1, @circle2, circle4], @person2.circles
+  end
+
+  should 'remove a person from a circle' do
+    @person1.follow(@person2, [@circle1, @circle2])
+
+    @person1.remove_profile_from_circle(@person2, @circle2)
+    assert @person2.in_circle? @circle1
+    assert_not @person2.in_circle? @circle2
+  end
+
+  should 'not remove a person from a circle if the user is not the owner' do
+    person3 = create_user('person-test-3').person
+    @person1.follow(@person2, [@circle1, @circle2])
+
+    person3.remove_profile_from_circle(@person2, @circle2)
+    assert @person2.in_circle? @circle1
+    assert @person2.in_circle? @circle2
+  end
+
+  should 'follow external profile' do
+    external_profile = ExternalProfile.create
+    @circle1.stubs(:profile_type).returns("ExternalProfile")
+
+    assert_difference '@person1.followed_profiles.count' do
+      @person1.follow(external_profile, @circle1)
+    end
+    assert @person1.follows? external_profile
+    assert_equivalent [external_profile], @person1.followed_profiles
+  end
+
+  should 'unfollow external profile' do
+    external_profile = ExternalProfile.create
+    @circle1.stubs(:profile_type).returns("ExternalProfile")
+    @person1.follow(external_profile, @circle1)
+
+    assert_difference '@person1.followed_profiles.count', -1 do
+      @person1.unfollow(external_profile)
+    end
+    assert_not @person1.follows?(@person2)
+  end
+
+end
@@ -81,8 +81,8 @@ class FriendshipTest &lt; ActiveSupport::TestCase
       p2.add_friend(p1, 'friends')
     end
-    assert_includes p1.followers(true), p2
-    assert_includes p2.followers(true), p1
+    assert_includes p1.followers, p2
+    assert_includes p2.followers, p1
   end
   should 'remove follower when a friend removal occurs' do
@@ -94,8 +94,8 @@ class FriendshipTest &lt; ActiveSupport::TestCase
     Friendship.remove_friendship(p1, p2)
-    assert_not_includes p1.followers(true), p2
-    assert_not_includes p2.followers(true), p1
+    assert_not_includes p1.followers, p2
+    assert_not_includes p2.followers, p1
   end
   should 'keep friendship intact when stop following' do
@@ -115,8 +115,8 @@ class FriendshipTest &lt; ActiveSupport::TestCase
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> p2, :name => "Zombies", :profile_type => 'Person')
     p1.follow(p2, circle1)
     p2.follow(p1, circle2)
@@ -31,9 +31,9 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> p2, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> person, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle1.id)
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle2.id)
@@ -54,7 +54,7 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
   should 'notify only marked people on marked scraps' do
     profile = create_user('scrap-creator').person
-    c1 = Circle.create!(:name => 'Family', :person => profile, :profile_type => Person)
+    c1 = Circle.create!(:name => 'Family', :owner => profile, :profile_type => Person)
     p1 = create_user('emily').person
     p2 = create_user('wollie').person
     not_marked = create_user('jack').person
@@ -100,7 +100,7 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle1.id)
     fast_create(RoleAssignment, :accessor_id => m1.id, :role_id => 3, :resource_id => community.id)
@@ -148,8 +148,8 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> p2, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle1.id)
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle2.id)
@@ -267,9 +267,9 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     o.add_member(p3)
     assert p3.is_member_of?(o)
-    assert_equal true, o.send(:followed_by?,p1)
-    assert_equal true, o.send(:followed_by?,p3)
-    assert_equal false, o.send(:followed_by?,p2)
+    assert o.followed_by? p1
+    assert o.followed_by? p3
+    refute o.followed_by? p2
   end
   should "compose bare jabber id by identifier plus 'conference' and default hostname" do
@@ -843,8 +843,8 @@ class PersonTest &lt; ActiveSupport::TestCase
     p3 = fast_create(Person)
     p4 = fast_create(Person)
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
-    circle4 = Circle.create!(:person=> p4, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner => p2, :name => "Zombies", :profile_type => 'Person')
+    circle4 = Circle.create!(:owner => p4, :name => "Zombies", :profile_type => 'Person')
     p2.follow(p1, circle2)
     assert p2.follows?(p1)
@@ -889,8 +889,8 @@ class PersonTest &lt; ActiveSupport::TestCase
     p3 = fast_create(Person)
     p4 = fast_create(Person)
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
-    circle4 = Circle.create!(:person=> p4, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner => p2, :name => "Zombies", :profile_type => 'Person')
+    circle4 = Circle.create!(:owner => p4, :name => "Zombies", :profile_type => 'Person')
     p2.follow(p1, circle2)
     assert p2.follows?(p1)
     refute p3.follows?(p1)
@@ -1640,11 +1640,6 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert person.can_change_homepage?
   end
-  should 'follow? return false when no profile is passed as parameter' do
-    person = Person.new
-    assert_equal false, person.follows?(nil)
-  end
-
   should 'allow posting content when has post_content permission' do
     person = create_user('person').person
     profile = mock
@@ -1957,53 +1952,4 @@ class PersonTest &lt; ActiveSupport::TestCase
     person.user.expects(:save!).never
     person.save!
   end
-
-  should 'update profile circles for a person' do
-    person = create_user('testuser').person
-    community = fast_create(Community)
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Community')
-    circle2 = Circle.create!(:person=> person, :name => "Dota", :profile_type => 'Community')
-    circle3 = Circle.create!(:person=> person, :name => "Quadrado", :profile_type => 'Community')
-    person.follow(community, [circle, circle2])
-    person.update_profile_circles(community, [circle2, circle3])
-    assert_equivalent [circle2, circle3], ProfileFollower.with_profile(community).with_follower(person).map(&:circle)
-  end
-
-  should 'a person follow a profile' do
-    person = create_user('testuser').person
-    community = fast_create(Community)
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Community')
-    person.follow(community, circle)
-    assert_includes person.followed_profiles, community
-  end
-
-  should 'a person follow a profile with more than one circle' do
-    person = create_user('testuser').person
-    community = fast_create(Community)
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Community')
-    circle2 = Circle.create!(:person=> person, :name => "Dota", :profile_type => 'Community')
-    person.follow(community, [circle, circle2])
-    assert_includes person.followed_profiles, community
-    assert_equivalent [circle, circle2], ProfileFollower.with_profile(community).with_follower(person).map(&:circle)
-  end
-
-  should 'a person unfollow a profile' do
-    person = create_user('testuser').person
-    community = fast_create(Community)
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Community')
-    person.follow(community, circle)
-    person.unfollow(community)
-    assert_not_includes person.followed_profiles, community
-  end
-
-  should 'a person remove a profile from a circle' do
-    person = create_user('testuser').person
-    community = fast_create(Community)
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Community')
-    circle2 = Circle.create!(:person=> person, :name => "Dota", :profile_type => 'Community')
-    person.follow(community, [circle, circle2])
-    person.remove_profile_from_circle(community, circle)
-    assert_equivalent [circle2], ProfileFollower.with_profile(community).with_follower(person).map(&:circle)
-  end
-
 end
@@ -1,73 +0,0 @@
-require_relative "../test_helper"
-
-class ProfileFollowersTest < ActiveSupport::TestCase
-
-  should 'a person follow another' do
-    p1 = create_user('person_test').person
-    p2 = create_user('person_test_2').person
-    circle = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-
-    assert_difference 'ProfileFollower.count' do
-      p1.follow(p2, circle)
-    end
-
-    assert_includes p2.followers(true), p1
-    assert_not_includes p1.followers(true), p2
-  end
-
-  should 'a person unfollow another person' do
-    p1 = create_user('person_test').person
-    p2 = create_user('person_test_2').person
-    circle = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-
-    p1.follow(p2,circle)
-
-    assert_difference 'ProfileFollower.count', -1 do
-      p1.unfollow(p2)
-    end
-
-    assert_not_includes p2.followers(true), p1
-  end
-
-  should 'get the followed persons for a profile' do
-    p1 = create_user('person_test').person
-    p2 = create_user('person_test_2').person
-    p3 = create_user('person_test_3').person
-    circle = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-
-    p1.follow(p2, circle)
-    p1.follow(p3, circle)
-
-    assert_equivalent p1.followed_profiles, [p2,p3]
-    assert_equivalent Profile.followed_by(p1), [p2,p3]
-  end
-
-  should 'not follow same person twice' do
-    p1 = create_user('person_test').person
-    p2 = create_user('person_test_2').person
-    circle = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-
-    assert_difference 'ProfileFollower.count' do
-      p1.follow(p2, circle)
-      p1.follow(p2, circle)
-    end
-
-    assert_equivalent p1.followed_profiles, [p2]
-    assert_equivalent p2.followers, [p1]
-  end
-
-  should 'show the correct message when a profile is followed by the same person' do
-    p1 = create_user('person_test').person
-    p2 = create_user('person_test_2').person
-    circle = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-
-    p1.follow(p2, circle)
-    profile_follower = ProfileFollower.new
-    profile_follower.circle = circle
-    profile_follower.profile = p2
-    profile_follower.valid?
-
-    assert_includes profile_follower.errors.messages[:profile_id],
-      "can't put a profile in the same circle twice"
-  end
-end
	@@ -3,7 +3,7 @@ class CirclesController < MyProfileController		@@ -3,7 +3,7 @@ class CirclesController < MyProfileController
3	before_action :accept_only_post, :only => [:create, :update, :destroy]	3	before_action :accept_only_post, :only => [:create, :update, :destroy]
4		4
5	def index	5	def index
6	- @circles = profile.circles	6	+ @circles = profile.owned_circles
7	end	7	end
8		8
9	def new	9	def new
	@@ -11,7 +11,7 @@ class CirclesController < MyProfileController		@@ -11,7 +11,7 @@ class CirclesController < MyProfileController
11	end	11	end
12		12
13	def create	13	def create
14	- @circle = Circle.new(params[:circle].merge({ :person => profile }))	14	+ @circle = Circle.new(params[:circle].merge({ :owner => profile }))
15	if @circle.save	15	if @circle.save
16	redirect_to :action => 'index'	16	redirect_to :action => 'index'
17	else	17	else
	@@ -21,7 +21,7 @@ class CirclesController < MyProfileController		@@ -21,7 +21,7 @@ class CirclesController < MyProfileController
21		21
22	def xhr_create	22	def xhr_create
23	if request.xhr?	23	if request.xhr?
24	- circle = Circle.new(params[:circle].merge({:person => profile }))	24	+ circle = Circle.new(params[:circle].merge({:owner => profile }))
25	if circle.save	25	if circle.save
26	render :partial => "circle_checkbox", :locals => { :circle => circle },	26	render :partial => "circle_checkbox", :locals => { :circle => circle },
27	:status => 201	27	:status => 201
	@@ -4,11 +4,11 @@ class FollowersController < MyProfileController		@@ -4,11 +4,11 @@ class FollowersController < MyProfileController
4	before_action :accept_only_post, :only => [:update_category]	4	before_action :accept_only_post, :only => [:update_category]
5		5
6	def index	6	def index
7	- @followed_people = profile.followed_profiles.order(:type)	7	+ @followed_people = profile.followed_profiles.sort_by(&:type)
8	@profile_types = {_('All profiles') => nil}.merge(Circle.profile_types).to_a	8	@profile_types = {_('All profiles') => nil}.merge(Circle.profile_types).to_a
9		9
10	if params['filter'].present?	10	if params['filter'].present?
11	- @followed_people = @followed_people.where(:type => params['filter'])	11	+ @followed_people = @followed_people.select{\|c\| c.type == params['filter']}
12	@active_filter = params['filter']	12	@active_filter = params['filter']
13	end	13	end
14		14
	@@ -17,7 +17,7 @@ class FollowersController < MyProfileController		@@ -17,7 +17,7 @@ class FollowersController < MyProfileController
17		17
18	def set_category_modal	18	def set_category_modal
19	followed_profile = Profile.find(params[:followed_profile_id])	19	followed_profile = Profile.find(params[:followed_profile_id])
20	- circles = Circle.where(:person => profile, :profile_type => followed_profile.class.name)	20	+ circles = Circle.where(:owner => profile, :profile_type => followed_profile.class.name)
21	render :partial => 'followers/edit_circles_modal', :locals => { :circles => circles, :followed_profile => followed_profile }	21	render :partial => 'followers/edit_circles_modal', :locals => { :circles => circles, :followed_profile => followed_profile }
22	end	22	end
23		23
	@@ -24,7 +24,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)		@@ -24,7 +24,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)
24	ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT profiles.id, #{tracked_action.id} FROM profiles WHERE profiles.id IN (#{target.marked_people.map(&:id).join(',')})")	24	ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT profiles.id, #{tracked_action.id} FROM profiles WHERE profiles.id IN (#{target.marked_people.map(&:id).join(',')})")
25	else	25	else
26	# Notify all followers	26	# Notify all followers
27	- ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")	27	+ ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.owner_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.owner_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
28	end	28	end
29		29
30	if tracked_action.user.is_a? Organization	30	if tracked_action.user.is_a? Organization
	@@ -22,7 +22,7 @@ class AddMember < Task		@@ -22,7 +22,7 @@ class AddMember < Task
22	self.roles = [Profile::Roles.member(organization.environment.id).id]	22	self.roles = [Profile::Roles.member(organization.environment.id).id]
23	end	23	end
24	target.affiliate(requestor, self.roles.select{\|r\| !r.to_i.zero? }.map{\|i\| Role.find(i)})	24	target.affiliate(requestor, self.roles.select{\|r\| !r.to_i.zero? }.map{\|i\| Role.find(i)})
25	- person.follow(organization, Circle.find_or_create_by(:person => person, :name =>_('memberships'), :profile_type => 'Community'))	25	+ person.follow(organization, Circle.find_or_create_by(:owner => person, :name =>_('memberships'), :profile_type => 'Community'))
26	end	26	end
27		27
28	def title	28	def title
	@@ -20,7 +20,7 @@ module ExternalUser		@@ -20,7 +20,7 @@ module ExternalUser
20	if login && domain && environment.has_federated_network?(domain)	20	if login && domain && environment.has_federated_network?(domain)
21	external_environment = environment.external_environments.find_by_domain(domain)	21	external_environment = environment.external_environments.find_by_domain(domain)
22	scheme = "http#{external_environment.uses_ssl? ? 's' : ''}"	22	scheme = "http#{external_environment.uses_ssl? ? 's' : ''}"
23	- url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+	23	+p url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+
24	login+'@'+domain)	24	login+'@'+domain)
25	http = build_request(url)	25	http = build_request(url)
26	req = Net::HTTP::Get.new(url.to_s)	26	req = Net::HTTP::Get.new(url.to_s)
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+module Followable
	2	+ extend ActiveSupport::Concern
	3	+
	4	+ included do
	5	+ has_many :profile_followers, :as => :profile
	6	+ has_many :circles, :through => :profile_followers
	7	+ end
	8	+
	9	+ def followers
	10	+ person_followers = Person.joins(:owned_circles).merge(circles).uniq
	11	+ external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
	12	+
	13	+ person_followers + external_person_followers
	14	+ end
	15	+
	16	+ def followed_by?(person)
	17	+ (person == self) \|\| (person.in? self.followers)
	18	+ end
	19	+
	20	+ def in_circle?(circle)
	21	+ circle.in? self.circles
	22	+ end
	23	+end
@@ -0,0 +1,52 @@		@@ -0,0 +1,52 @@
	1	+module Follower
	2	+ extend ActiveSupport::Concern
	3	+
	4	+ included do
	5	+ has_many :owned_circles, as: :owner, :class_name => "Circle"
	6	+ end
	7	+
	8	+ def follow(profile, circles)
	9	+ circles = [circles] unless circles.is_a?(Array)
	10	+ circles.each do \|new_circle\|
	11	+ next if new_circle.owner != self \|\| !profile.kind_of?(new_circle.profile_type.constantize)
	12	+ ProfileFollower.create(profile: profile, circle: new_circle)
	13	+ end
	14	+ end
	15	+
	16	+ def follows?(profile)
	17	+ return false if profile.nil?
	18	+ profile.followed_by?(self)
	19	+ end
	20	+
	21	+ def unfollow(profile)
	22	+ ProfileFollower.with_follower(self).with_profile(profile).destroy_all
	23	+ end
	24	+
	25	+ def local_followed_profiles
	26	+ Profile.joins(:circles).where("circles.owner_id = ?", self.id).uniq
	27	+ end
	28	+
	29	+ def external_followed_profiles
	30	+ ExternalProfile.joins(:circles).where("circles.owner_id = ?", self.id).uniq
	31	+ end
	32	+
	33	+ def followed_profiles
	34	+ local_followed_profiles + external_followed_profiles
	35	+ end
	36	+
	37	+ def update_profile_circles(profile, new_circles)
	38	+ profile_circles = ProfileFollower.with_profile(profile).with_follower(self).map(&:circle)
	39	+ circles_to_add = new_circles - profile_circles
	40	+ self.follow(profile, circles_to_add)
	41	+
	42	+ circles_to_remove = profile_circles - new_circles
	43	+ ProfileFollower.where('circle_id IN (?) AND profile_id = ?',
	44	+ circles_to_remove.map(&:id), profile.id).destroy_all
	45	+ end
	46	+
	47	+ def remove_profile_from_circle(profile, circle)
	48	+ return if circle.owner != self
	49	+ ProfileFollower.with_profile(profile).with_circle(circle).destroy_all
	50	+ end
	51	+
	52	+end
1	# A pseudo profile is a person from a remote network	1	# A pseudo profile is a person from a remote network
2	-class ExternalPerson < ActiveRecord::Base	2	+class ExternalPerson < ExternalProfile
3		3
4	include Human	4	include Human
5	include ProfileEntity	5	include ProfileEntity
		6	+ include Follower
6		7
7	validates_uniqueness_of :identifier, scope: :source	8	validates_uniqueness_of :identifier, scope: :source
8	-
9	validates_presence_of :source, :email, :created_at	9	validates_presence_of :source, :email, :created_at
10		10
11	attr_accessible :source, :email, :created_at	11	attr_accessible :source, :email, :created_at
	@@ -27,13 +27,6 @@ class ExternalPerson < ActiveRecord::Base		@@ -27,13 +27,6 @@ class ExternalPerson < ActiveRecord::Base
27	_('Public profile')	27	_('Public profile')
28	end	28	end
29		29
30	- def avatar
31	- "http://#{self.source}/profile/#{self.identifier}/icon/"
32	- end
33	-
34	- def url
35	- "http://#{self.source}/profile/#{self.identifier}"
36	- end
37		30
38	alias :public_profile_url :url	31	alias :public_profile_url :url
39		32
	@@ -75,10 +68,6 @@ class ExternalPerson < ActiveRecord::Base		@@ -75,10 +68,6 @@ class ExternalPerson < ActiveRecord::Base
75	"#{scheme}://#{self.source}"	68	"#{scheme}://#{self.source}"
76	end	69	end
77		70
78	- def profile_custom_icon(gravatar_default=nil)
79	- self.avatar
80	- end
81	-
82	def preferred_login_redirection	71	def preferred_login_redirection
83	environment.redirection_after_login	72	environment.redirection_after_login
84	end	73	end
	@@ -122,26 +111,6 @@ class ExternalPerson < ActiveRecord::Base		@@ -122,26 +111,6 @@ class ExternalPerson < ActiveRecord::Base
122	"#{jid(options)}/#{self.name}"	111	"#{jid(options)}/#{self.name}"
123	end	112	end
124		113
125	- class ExternalPerson::Image
126	- def initialize(path)
127	- @path = path
128	- end
129	-
130	- def public_filename(size = nil)
131	- URI.join(@path, size.to_s)
132	- end
133	-
134	- def content_type
135	- # This is not really going to be used anywhere that matters
136	- # so we are hardcodding it here.
137	- 'image/png'
138	- end
139	- end
140	-
141	- def image
142	- ExternalPerson::Image.new(avatar)
143	- end
144	-
145	def data_hash(gravatar_default = nil)	114	def data_hash(gravatar_default = nil)
146	friends_list = {}	115	friends_list = {}
147	{	116	{
	@@ -195,67 +164,11 @@ class ExternalPerson < ActiveRecord::Base		@@ -195,67 +164,11 @@ class ExternalPerson < ActiveRecord::Base
195	build_contact: nil, is_a_friend?: false, ask_to_join?: false, refuse_join:	164	build_contact: nil, is_a_friend?: false, ask_to_join?: false, refuse_join:
196	nil, blocks_to_expire_cache: [], cache_keys: [], communities_cache_key: '',	165	nil, blocks_to_expire_cache: [], cache_keys: [], communities_cache_key: '',
197	friends_cache_key: '', manage_friends_cache_key: '',	166	friends_cache_key: '', manage_friends_cache_key: '',
198	- relationships_cache_key: '', is_member_of?: false, follows?: false,	167	+ relationships_cache_key: '', is_member_of?: false,
199	each_friend: nil, is_last_admin?: false, is_last_admin_leaving?: false,	168	each_friend: nil, is_last_admin?: false, is_last_admin_leaving?: false,
200	leave: nil, last_notification: nil, notification_time: 0, notifier: nil,	169	leave: nil, last_notification: nil, notification_time: 0, notifier: nil,
201	- remove_suggestion: nil, allow_invitation_from?: false
202	- }
203	-
204	- derivated_methods = generate_derivated_methods(methods_and_responses)
205	- derivated_methods.merge(methods_and_responses)
206	- end
207	-
208	- def profile_instance_methods
209	- methods_and_responses = {
210	- role_assignments: RoleAssignment.none, favorite_enterprises:
211	- Enterprise.none, memberships: Profile.none, friendships: Profile.none,
212	- tasks: Task.none, suggested_profiles: ProfileSuggestion.none,
213	- suggested_people: ProfileSuggestion.none, suggested_communities:
214	- ProfileSuggestion.none, public_profile: true, nickname: nil, custom_footer:
215	- '', custom_header: '', address: '', zip_code: '', contact_phone: '',
216	- image_builder: nil, description: '', closed: false, template_id: nil, lat:
217	- nil, lng: nil, is_template: false, fields_privacy: {}, preferred_domain_id:
218	- nil, category_ids: [], country: '', city: '', state: '',
219	- national_region_code: '', redirect_l10n: false, notification_time: 0,
220	- custom_url_redirection: nil, email_suggestions: false,
221	- allow_members_to_invite: false, invite_friends_only: false, secret: false,
222	- profile_admin_mail_notification: false, redirection_after_login: nil,
223	- profile_activities: ProfileActivity.none, action_tracker_notifications:
224	- ActionTrackerNotification.none, tracked_notifications:
225	- ActionTracker::Record.none, scraps_received: Scrap.none, template:
226	- Profile.none, comments_received: Comment.none, email_templates:
227	- EmailTemplate.none, members: Profile.none, members_like: Profile.none,
228	- members_by: Profile.none, members_by_role: Profile.none, scraps:
229	- Scrap.none, welcome_page_content: nil, settings: {}, find_in_all_tasks:
230	- nil, top_level_categorization: {}, interests: Category.none, geolocation:
231	- '', country_name: '', pending_categorizations: [], add_category: false,
232	- create_pending_categorizations: false, top_level_articles: Article.none,
233	- valid_identifier: true, valid_template: false, create_default_set_of_boxes:
234	- true, copy_blocks_from: nil, default_template: nil,
235	- template_without_default: nil, template_with_default: nil, apply_template:
236	- false, iframe_whitelist: [], recent_documents: Article.none, last_articles:
237	- Article.none, is_validation_entity?: false, hostname: nil, own_hostname:
238	- nil, article_tags: {}, tagged_with: Article.none,
239	- insert_default_article_set: false, copy_articles_from: true,
240	- copy_article_tree: nil, copy_article?: false, add_member: false,
241	- remove_member: false, add_admin: false, remove_admin: false, add_moderator:
242	- false, display_info_to?: true, update_category_from_region: nil,
243	- accept_category?: false, custom_header_expanded: '',
244	- custom_footer_expanded: '', public?: true, themes: [], find_theme: nil,
245	- blogs: Blog.none, blog: nil, has_blog?: false, forums: Forum.none, forum:
246	- nil, has_forum?: false, admins: [], settings_field: {}, setting_changed:
247	- false, public_content: true, enable_contact?: false, folder_types: [],
248	- folders: Article.none, image_galleries: Article.none, image_valid: true,
249	- update_header_and_footer: nil, update_theme: nil, update_layout_template:
250	- nil, recent_actions: ActionTracker::Record.none, recent_notifications:
251	- ActionTracker::Record.none, more_active_label: _('no activity'),
252	- more_popular_label: _('no members'), profile_custom_image: nil,
253	- is_on_homepage?: false, activities: ProfileActivity.none,
254	- may_display_field_to?: true, may_display_location_to?: true, public_fields:
255	- {}, followed_by?: false, display_private_info_to?: true, can_view_field?:
256	- true, remove_from_suggestion_list: nil, layout_template: 'default',
257	- is_admin?: false, add_friend: false, follows?: false, is_a_friend?: false,
258	- already_request_friendship?: false	170	+ remove_suggestion: nil, allow_invitation_from?: false, in_social_circle?: false,
		171	+ allow_followers: false
259	}	172	}
260		173
261	derivated_methods = generate_derivated_methods(methods_and_responses)	174	derivated_methods = generate_derivated_methods(methods_and_responses)
	@@ -266,25 +179,15 @@ class ExternalPerson < ActiveRecord::Base		@@ -266,25 +179,15 @@ class ExternalPerson < ActiveRecord::Base
266	if person_instance_methods.keys.include?(method)	179	if person_instance_methods.keys.include?(method)
267	return person_instance_methods[method]	180	return person_instance_methods[method]
268	end	181	end
269	- if profile_instance_methods.keys.include? method
270	- return profile_instance_methods[method]
271	- end	182	+ super(method, *args, &block)
272	end	183	end
273		184
274	def respond_to_missing?(method_name, include_private = false)	185	def respond_to_missing?(method_name, include_private = false)
275	person_instance_methods.keys.include?(method_name) \|\|	186	person_instance_methods.keys.include?(method_name) \|\|
276	- profile_instance_methods.keys.include?(method_name) \|\|
277	super	187	super
278	end	188	end
279		189
280	- private
281	-
282	- def generate_derivated_methods(methods)
283	- derivated_methods = {}
284	- methods.keys.each do \|method\|
285	- derivated_methods[method.to_s.insert(-1, '?').to_sym] = false
286	- derivated_methods[method.to_s.insert(-1, '=').to_sym] = nil
287	- end
288	- derivated_methods	190	+ def kind_of?(klass)
		191	+ (klass == Person) ? true : super
289	end	192	end
290	end	193	end
@@ -0,0 +1,126 @@		@@ -0,0 +1,126 @@
	1	+class ExternalProfile < ApplicationRecord
	2	+
	3	+ include Followable
	4	+
	5	+ SEARCHABLE_FIELDS = {
	6	+ :name => {:label => _('Name'), :weight => 10},
	7	+ :identifier => {:label => _('Username'), :weight => 5},
	8	+ :nickname => {:label => _('Nickname'), :weight => 2},
	9	+ }
	10	+
	11	+ def name
	12	+ "#{self[:name]}@#{self.source}"
	13	+ end
	14	+
	15	+ class ExternalProfile::Image
	16	+ def initialize(path)
	17	+ @path = path
	18	+ end
	19	+
	20	+ def public_filename(size = nil)
	21	+ URI.join(@path, size.to_s)
	22	+ end
	23	+
	24	+ def content_type
	25	+ # This is not really going to be used anywhere that matters
	26	+ # so we are hardcodding it here.
	27	+ 'image/png'
	28	+ end
	29	+ end
	30	+
	31	+ def url
	32	+ "http://#{self.source}/profile/#{self.identifier}"
	33	+ end
	34	+
	35	+ def image
	36	+ ExternalProfile::Image.new(avatar)
	37	+ end
	38	+
	39	+ def profile_custom_icon(gravatar_default=nil)
	40	+ self.avatar
	41	+ end
	42	+
	43	+ def avatar
	44	+ "http://#{self.source}/profile/#{self.identifier}/icon/"
	45	+ end
	46	+
	47	+ # External Profile should respond to all methods in Profile
	48	+def profile_instance_methods
	49	+ methods_and_responses = {
	50	+ role_assignments: RoleAssignment.none, favorite_enterprises:
	51	+ Enterprise.none, memberships: Profile.none, friendships: Profile.none,
	52	+ tasks: Task.none, suggested_profiles: ProfileSuggestion.none,
	53	+ suggested_people: ProfileSuggestion.none, suggested_communities:
	54	+ ProfileSuggestion.none, public_profile: true, nickname: nil, custom_footer:
	55	+ '', custom_header: '', address: '', zip_code: '', contact_phone: '',
	56	+ image_builder: nil, description: '', closed: false, template_id: nil, lat:
	57	+ nil, lng: nil, is_template: false, fields_privacy: {}, preferred_domain_id:
	58	+ nil, category_ids: [], country: '', city: '', state: '',
	59	+ national_region_code: '', redirect_l10n: false, notification_time: 0,
	60	+ custom_url_redirection: nil, email_suggestions: false,
	61	+ allow_members_to_invite: false, invite_friends_only: false, secret: false,
	62	+ profile_admin_mail_notification: false, redirection_after_login: nil,
	63	+ profile_activities: ProfileActivity.none, action_tracker_notifications:
	64	+ ActionTrackerNotification.none, tracked_notifications:
	65	+ ActionTracker::Record.none, scraps_received: Scrap.none, template:
	66	+ Profile.none, comments_received: Comment.none, email_templates:
	67	+ EmailTemplate.none, members: Profile.none, members_like: Profile.none,
	68	+ members_by: Profile.none, members_by_role: Profile.none, scraps:
	69	+ Scrap.none, welcome_page_content: nil, settings: {}, find_in_all_tasks:
	70	+ nil, top_level_categorization: {}, interests: Category.none, geolocation:
	71	+ '', country_name: '', pending_categorizations: [], add_category: false,
	72	+ create_pending_categorizations: false, top_level_articles: Article.none,
	73	+ valid_identifier: true, valid_template: false, create_default_set_of_boxes:
	74	+ true, copy_blocks_from: nil, default_template: nil,
	75	+ template_without_default: nil, template_with_default: nil, apply_template:
	76	+ false, iframe_whitelist: [], recent_documents: Article.none, last_articles:
	77	+ Article.none, is_validation_entity?: false, hostname: nil, own_hostname:
	78	+ nil, article_tags: {}, tagged_with: Article.none,
	79	+ insert_default_article_set: false, copy_articles_from: true,
	80	+ copy_article_tree: nil, copy_article?: false, add_member: false,
	81	+ remove_member: false, add_admin: false, remove_admin: false, add_moderator:
	82	+ false, display_info_to?: true, update_category_from_region: nil,
	83	+ accept_category?: false, custom_header_expanded: '',
	84	+ custom_footer_expanded: '', public?: true, themes: [], find_theme: nil,
	85	+ blogs: Blog.none, blog: nil, has_blog?: false, forums: Forum.none, forum:
	86	+ nil, has_forum?: false, admins: [], settings_field: {}, setting_changed:
	87	+ false, public_content: true, enable_contact?: false, folder_types: [],
	88	+ folders: Article.none, image_galleries: Article.none, image_valid: true,
	89	+ update_header_and_footer: nil, update_theme: nil, update_layout_template:
	90	+ nil, recent_actions: ActionTracker::Record.none, recent_notifications:
	91	+ ActionTracker::Record.none, more_active_label: _('no activity'),
	92	+ more_popular_label: _('no members'), profile_custom_image: nil,
	93	+ is_on_homepage?: false, activities: ProfileActivity.none,
	94	+ may_display_field_to?: true, may_display_location_to?: true, public_fields:
	95	+ {}, display_private_info_to?: true, can_view_field?:
	96	+ true, remove_from_suggestion_list: nil, layout_template: 'default',
	97	+ is_admin?: false, add_friend: false, is_a_friend?: false,
	98	+ already_request_friendship?: false, tracked_actions: ActionTracker::Record.none
	99	+ }
	100	+
	101	+ derivated_methods = generate_derivated_methods(methods_and_responses)
	102	+ derivated_methods.merge(methods_and_responses)
	103	+ end
	104	+
	105	+ def method_missing(method, *args, &block)
	106	+ if profile_instance_methods.keys.include? method
	107	+ return profile_instance_methods[method]
	108	+ end
	109	+ raise NoMethodError, "undefined method #{method} for #{self}"
	110	+ end
	111	+
	112	+ def respond_to_missing?(method_name, include_private = false)
	113	+ profile_instance_methods.keys.include?(method_name) \|\| super
	114	+ end
	115	+
	116	+ private
	117	+
	118	+ def generate_derivated_methods(methods)
	119	+ derivated_methods = {}
	120	+ methods.keys.each do \|method\|
	121	+ derivated_methods[method.to_s.insert(-1, '?').to_sym] = false
	122	+ derivated_methods[method.to_s.insert(-1, '=').to_sym] = nil
	123	+ end
	124	+ derivated_methods
	125	+ end
	126	+end
	@@ -8,7 +8,7 @@ class FavoriteEnterprisePerson < ApplicationRecord		@@ -8,7 +8,7 @@ class FavoriteEnterprisePerson < ApplicationRecord
8	belongs_to :person	8	belongs_to :person
9		9
10	after_create do \|favorite\|	10	after_create do \|favorite\|
11	- favorite.person.follow(favorite.enterprise, Circle.find_or_create_by(:person => favorite.person, :name =>_('favorites'), :profile_type => 'Enterprise'))	11	+ favorite.person.follow(favorite.enterprise, Circle.find_or_create_by(:owner => favorite.person, :name =>_('favorites'), :profile_type => 'Enterprise'))
12	end	12	end
13		13
14	protected	14	protected