Gabriel Silva · Gabriel Silva · Gabriel Silva
Showing 16 changed files Show diff stats
app/controllers/my_profile/circles_controller.rb
app/controllers/my_profile/followers_controller.rb
app/controllers/public/profile_controller.rb
app/models/circle.rb
app/models/concerns/external_user.rb
app/models/concerns/follower.rb
app/models/external_person.rb
app/models/external_profile.rb
app/models/person.rb
app/models/profile.rb
app/models/profile_follower.rb
app/views/blocks/profile_info_actions/_select_circles.html.erb
db/migrate/20160822110424_rename_external_people_to_external_profiles.rb
db/migrate/20160822174619_adds_profile_type_to_profile_followers.rb
db/migrate/20160822184703_rename_person_id_from_circles.rb
db/schema.rb
@@ -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
@@ -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
@@ -176,7 +176,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
 class Circle < ApplicationRecord
   #TODO -> n:m with profile, item in the circle
-  has_many :profile_followers
+  has_many :profile, :through => :profile_follower
   #TODO -> owner
-  belongs_to :person, polymorphic: true
+  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
@@ -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' : ''}"
-p        url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+
+        url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+
                          login+'@'+domain)
         http = build_request(url)
         req = Net::HTTP::Get.new(url.to_s)
@@ -2,18 +2,9 @@ module Follower
   extend ActiveSupport::Concern
   def follow(profile, circles)
-    puts "follow..."
     circles = [circles] unless circles.is_a?(Array)
     circles.each do |new_circle|
-      puts "seguindo alguen..."
-      puts "profile_type: #{new_circle.profile_type}, class_name: #{profile.class.name}"
-      puts "new_circle.person: #{new_circle.person}, self: #{self}"
-      if (new_circle.person != self && !(self.kind_of?(new_circle.person.class)) || new_circle.profile_type != profile.class.name)
-        next
-      end
-      puts '*20'*20
-      puts "CHEGOU NO PROFILE FOLLOWER"
-      puts '*20'*20
+      next if new_circle.owner != self || new_circle.profile_type != profile.class.name
       ProfileFollower.create(profile: profile, circle: new_circle)
     end
   end
@@ -42,7 +33,7 @@ module Follower
   end
   def remove_profile_from_circle(profile, circle)
-    return if circle.person != self
+    return if circle.owner != self
     ProfileFollower.with_profile(profile).with_circle(circle).destroy_all
   end
 # A pseudo profile is a person from a remote network
-class ExternalPerson < ExternalProfile
+class ExternalPerson < ActiveRecord::Base
   include Human
   include ProfileEntity
+  include Follower
+
+  has_many :profile_followers
+  has_many :circles, :through => :profile_followers, :as => :profile
+  has_many :owned_circles, as: :owner, :class_name => "Circle"
   validates_uniqueness_of :identifier, scope: :source
@@ -27,6 +32,13 @@ class ExternalPerson &lt; ExternalProfile
     _('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
@@ -68,6 +80,10 @@ class ExternalPerson &lt; ExternalProfile
     "#{scheme}://#{self.source}"
   end
+  def profile_custom_icon(gravatar_default=nil)
+    self.avatar
+  end
+
   def preferred_login_redirection
     environment.redirection_after_login
   end
@@ -111,6 +127,26 @@ class ExternalPerson &lt; ExternalProfile
     "#{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 = {}
     {
@@ -129,4 +165,132 @@ class ExternalPerson &lt; ExternalProfile
     }
   end
+  # External Person should respond to all methods in Person and Profile
+  def person_instance_methods
+    methods_and_responses = {
+     enterprises: Enterprise.none, communities: Community.none, friends:
+     Person.none, memberships: Profile.none, friendships: Person.none,
+     following_articles: Article.none, article_followers: ArticleFollower.none,
+     requested_tasks: Task.none, mailings: Mailing.none, scraps_sent:
+     Scrap.none, favorite_enterprise_people: FavoriteEnterprisePerson.none,
+     favorite_enterprises: Enterprise.none, acepted_forums: Forum.none,
+     articles_with_access: Article.none, suggested_profiles:
+     ProfileSuggestion.none, suggested_people: ProfileSuggestion.none,
+     suggested_communities: ProfileSuggestion.none, user: nil,
+     refused_communities: Community.none, has_permission?: false,
+     has_permission_with_admin?: false, has_permission_without_admin?: false,
+     has_permission_with_plugins?: false, has_permission_without_plugins?:
+     false, memberships_by_role: Person.none, can_change_homepage?: false,
+     can_control_scrap?: false, receives_scrap_notification?: false,
+     can_control_activity?: false, can_post_content?: false,
+     suggested_friend_groups: [], friend_groups: [], add_friend: nil,
+     already_request_friendship?: false, remove_friend: nil,
+     presence_of_required_fields: nil, active_fields: [], required_fields: [],
+     signup_fields: [], default_set_of_blocks: [], default_set_of_boxes: [],
+     default_set_of_articles: [], cell_phone: nil, comercial_phone: nil,
+     nationality: nil, schooling: nil, contact_information: nil, sex: nil,
+     birth_date: nil, jabber_id: nil, personal_website: nil, address_reference:
+     nil, district: nil, schooling_status: nil, formation: nil,
+     custom_formation: nil, area_of_study: nil, custom_area_of_study: nil,
+     professional_activity: nil, organization_website: nil, organization: nil,
+     photo: nil, city: nil, state: nil, country: nil, zip_code: nil,
+     address_line2: nil, copy_communities_from: nil,
+     has_organization_pending_tasks?: false, organizations_with_pending_tasks:
+     Organization.none, pending_tasks_for_organization: Task.none,
+     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,
+     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, in_social_circle?: false,
+     allow_followers: false, in_circles: Circle.none, followers: [], in_circle?: 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, is_a_friend?: false,
+     already_request_friendship?: false
+    }
+
+    derivated_methods = generate_derivated_methods(methods_and_responses)
+    derivated_methods.merge(methods_and_responses)
+  end
+
+  def method_missing(method, *args, &block)
+    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
+  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
+  end
 end
@@ -94,7 +94,7 @@ 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, as: :person
+  has_many :owned_circles, as: :owner, :class_name => 'Circle'
   scope :online, -> {
     joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
@@ -223,14 +223,7 @@ class Profile &lt; ApplicationRecord
     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)
+    where('circles.owner_id = ?', person.id)
   }
   settings_items :allow_followers, :type => :boolean, :default => true
@@ -249,15 +242,11 @@ class Profile &lt; ApplicationRecord
   has_many :email_templates, :foreign_key => :owner_id
   has_many :profile_followers
-
-  def in_circles
-    Circle.joins(:profile_followers).
-      where('profiles_circles.profile_id = ?', self.id)
-  end
+  has_many :circles, :through => :profile_followers, :as => :profile
   def followers
-    person_followers = Person.joins(:circles).merge(in_circles).uniq
-    external_person_followers = ExternalPerson.joins(:circles).merge(in_circles).uniq
+    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
@@ -1068,7 +1057,7 @@ 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?
+  def in_circle?(circle)
+    circle.in? self.circles
   end
 end
@@ -5,14 +5,14 @@ class ProfileFollower &lt; ApplicationRecord
   attr_accessible :profile, :circle
   #TODO -> user being followed
-  belongs_to :profile
+  belongs_to :profile, :polymorphic => true
   belongs_to :circle
   #TODO -> circle owner
   # has_one :person, through: :circle, source_type: "ProfileFollower"
   def circle_owner
-    self.circle.person
+    self.circle.owner
   end
   alias follower circle_owner
@@ -21,7 +21,7 @@ class ProfileFollower &lt; ApplicationRecord
   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>
@@ -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
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160810132802) do
+ActiveRecord::Schema.define(version: 20160608123748) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -278,12 +278,10 @@ ActiveRecord::Schema.define(version: 20160810132802) do
   create_table "circles", force: :cascade do |t|
     t.string  "name"
     t.integer "person_id"
-    t.string  "profile_type",                    null: false
-    t.string  "person_type",  default: "Person"
+    t.string  "profile_type", null: false
   end
   add_index "circles", ["person_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
-  add_index "circles", ["person_id", "person_type"], name: "index_circles_on_person_id_and_person_type", using: :btree
   create_table "comments", force: :cascade do |t|
     t.string   "title"
@@ -555,11 +553,6 @@ ActiveRecord::Schema.define(version: 20160810132802) do
     t.datetime "updated_at"
   end
-  create_table "private_scraps", force: :cascade do |t|
-    t.integer "person_id"
-    t.integer "scrap_id"
-  end
-
   create_table "product_qualifiers", force: :cascade do |t|
     t.integer  "product_id"
     t.integer  "qualifier_id"
@@ -688,11 +681,9 @@ ActiveRecord::Schema.define(version: 20160810132802) do
     t.integer  "circle_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "profile_type", default: "Profile"
   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"
	@@ -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
	@@ -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
	@@ -176,7 +176,7 @@ class ProfileController < PublicController		@@ -176,7 +176,7 @@ class ProfileController < PublicController
176	end	176	end
177		177
178	def find_profile_circles	178	def find_profile_circles
179	- circles = Circle.where(:person => current_person, :profile_type => profile.class.name)	179	+ circles = Circle.where(:owner => current_person, :profile_type => profile.class.name)
180	render :partial => 'blocks/profile_info_actions/circles', :locals => { :circles => circles, :profile_types => Circle.profile_types.to_a }	180	render :partial => 'blocks/profile_info_actions/circles', :locals => { :circles => circles, :profile_types => Circle.profile_types.to_a }
181	end	181	end
182		182
1	class Circle < ApplicationRecord	1	class Circle < ApplicationRecord
2	#TODO -> n:m with profile, item in the circle	2	#TODO -> n:m with profile, item in the circle
3	- has_many :profile_followers	3	+ has_many :profile, :through => :profile_follower
4	#TODO -> owner	4	#TODO -> owner
5	- belongs_to :person, polymorphic: true	5	+ belongs_to :owner, polymorphic: true
6		6
7	- attr_accessible :name, :person, :profile_type	7	+ attr_accessible :name, :owner, :profile_type
8		8
9	validates :name, presence: true	9	validates :name, presence: true
10	- validates :person_id, presence: true	10	+ validates :owner_id, presence: true
11	validates :profile_type, presence: true	11	validates :profile_type, presence: true
12	- validates :person_id, :uniqueness => {:scope => :name, :message => "can't add two circles with the same name"}	12	+ validates :owner_id, :uniqueness => {:scope => :name, :message => "can't add two circles with the same name"}
13		13
14	validate :profile_type_must_be_in_list	14	validate :profile_type_must_be_in_list
15		15
	@@ -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	-p url = URI.parse(scheme+"://"+ domain +'/.well-known/webfinger?resource=acct:'+	23	+ 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)
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 < ExternalProfile	2	+class ExternalPerson < ActiveRecord::Base
3		3
4	include Human	4	include Human
5	include ProfileEntity	5	include ProfileEntity
		6	+ include Follower
		7	+
		8	+ has_many :profile_followers
		9	+ has_many :circles, :through => :profile_followers, :as => :profile
		10	+ has_many :owned_circles, as: :owner, :class_name => "Circle"
6		11
7	validates_uniqueness_of :identifier, scope: :source	12	validates_uniqueness_of :identifier, scope: :source
8		13
	@@ -27,6 +32,13 @@ class ExternalPerson < ExternalProfile		@@ -27,6 +32,13 @@ class ExternalPerson < ExternalProfile
27	_('Public profile')	32	_('Public profile')
28	end	33	end
29		34
		35	+ def avatar
		36	+ "http://#{self.source}/profile/#{self.identifier}/icon/"
		37	+ end
		38	+
		39	+ def url
		40	+ "http://#{self.source}/profile/#{self.identifier}"
		41	+ end
30		42
31	alias :public_profile_url :url	43	alias :public_profile_url :url
32		44
	@@ -68,6 +80,10 @@ class ExternalPerson < ExternalProfile		@@ -68,6 +80,10 @@ class ExternalPerson < ExternalProfile
68	"#{scheme}://#{self.source}"	80	"#{scheme}://#{self.source}"
69	end	81	end
70		82
		83	+ def profile_custom_icon(gravatar_default=nil)
		84	+ self.avatar
		85	+ end
		86	+
71	def preferred_login_redirection	87	def preferred_login_redirection
72	environment.redirection_after_login	88	environment.redirection_after_login
73	end	89	end
	@@ -111,6 +127,26 @@ class ExternalPerson < ExternalProfile		@@ -111,6 +127,26 @@ class ExternalPerson < ExternalProfile
111	"#{jid(options)}/#{self.name}"	127	"#{jid(options)}/#{self.name}"
112	end	128	end
113		129
		130	+ class ExternalPerson::Image
		131	+ def initialize(path)
		132	+ @path = path
		133	+ end
		134	+
		135	+ def public_filename(size = nil)
		136	+ URI.join(@path, size.to_s)
		137	+ end
		138	+
		139	+ def content_type
		140	+ # This is not really going to be used anywhere that matters
		141	+ # so we are hardcodding it here.
		142	+ 'image/png'
		143	+ end
		144	+ end
		145	+
		146	+ def image
		147	+ ExternalPerson::Image.new(avatar)
		148	+ end
		149	+
114	def data_hash(gravatar_default = nil)	150	def data_hash(gravatar_default = nil)
115	friends_list = {}	151	friends_list = {}
116	{	152	{
	@@ -129,4 +165,132 @@ class ExternalPerson < ExternalProfile		@@ -129,4 +165,132 @@ class ExternalPerson < ExternalProfile
129	}	165	}
130	end	166	end
131		167
		168	+ # External Person should respond to all methods in Person and Profile
		169	+ def person_instance_methods
		170	+ methods_and_responses = {
		171	+ enterprises: Enterprise.none, communities: Community.none, friends:
		172	+ Person.none, memberships: Profile.none, friendships: Person.none,
		173	+ following_articles: Article.none, article_followers: ArticleFollower.none,
		174	+ requested_tasks: Task.none, mailings: Mailing.none, scraps_sent:
		175	+ Scrap.none, favorite_enterprise_people: FavoriteEnterprisePerson.none,
		176	+ favorite_enterprises: Enterprise.none, acepted_forums: Forum.none,
		177	+ articles_with_access: Article.none, suggested_profiles:
		178	+ ProfileSuggestion.none, suggested_people: ProfileSuggestion.none,
		179	+ suggested_communities: ProfileSuggestion.none, user: nil,
		180	+ refused_communities: Community.none, has_permission?: false,
		181	+ has_permission_with_admin?: false, has_permission_without_admin?: false,
		182	+ has_permission_with_plugins?: false, has_permission_without_plugins?:
		183	+ false, memberships_by_role: Person.none, can_change_homepage?: false,
		184	+ can_control_scrap?: false, receives_scrap_notification?: false,
		185	+ can_control_activity?: false, can_post_content?: false,
		186	+ suggested_friend_groups: [], friend_groups: [], add_friend: nil,
		187	+ already_request_friendship?: false, remove_friend: nil,
		188	+ presence_of_required_fields: nil, active_fields: [], required_fields: [],
		189	+ signup_fields: [], default_set_of_blocks: [], default_set_of_boxes: [],
		190	+ default_set_of_articles: [], cell_phone: nil, comercial_phone: nil,
		191	+ nationality: nil, schooling: nil, contact_information: nil, sex: nil,
		192	+ birth_date: nil, jabber_id: nil, personal_website: nil, address_reference:
		193	+ nil, district: nil, schooling_status: nil, formation: nil,
		194	+ custom_formation: nil, area_of_study: nil, custom_area_of_study: nil,
		195	+ professional_activity: nil, organization_website: nil, organization: nil,
		196	+ photo: nil, city: nil, state: nil, country: nil, zip_code: nil,
		197	+ address_line2: nil, copy_communities_from: nil,
		198	+ has_organization_pending_tasks?: false, organizations_with_pending_tasks:
		199	+ Organization.none, pending_tasks_for_organization: Task.none,
		200	+ build_contact: nil, is_a_friend?: false, ask_to_join?: false, refuse_join:
		201	+ nil, blocks_to_expire_cache: [], cache_keys: [], communities_cache_key: '',
		202	+ friends_cache_key: '', manage_friends_cache_key: '',
		203	+ relationships_cache_key: '', is_member_of?: false,
		204	+ each_friend: nil, is_last_admin?: false, is_last_admin_leaving?: false,
		205	+ leave: nil, last_notification: nil, notification_time: 0, notifier: nil,
		206	+ remove_suggestion: nil, allow_invitation_from?: false, in_social_circle?: false,
		207	+ allow_followers: false, in_circles: Circle.none, followers: [], in_circle?: false
		208	+ }
		209	+
		210	+ derivated_methods = generate_derivated_methods(methods_and_responses)
		211	+ derivated_methods.merge(methods_and_responses)
		212	+ end
		213	+
		214	+ def profile_instance_methods
		215	+ methods_and_responses = {
		216	+ role_assignments: RoleAssignment.none, favorite_enterprises:
		217	+ Enterprise.none, memberships: Profile.none, friendships: Profile.none,
		218	+ tasks: Task.none, suggested_profiles: ProfileSuggestion.none,
		219	+ suggested_people: ProfileSuggestion.none, suggested_communities:
		220	+ ProfileSuggestion.none, public_profile: true, nickname: nil, custom_footer:
		221	+ '', custom_header: '', address: '', zip_code: '', contact_phone: '',
		222	+ image_builder: nil, description: '', closed: false, template_id: nil, lat:
		223	+ nil, lng: nil, is_template: false, fields_privacy: {}, preferred_domain_id:
		224	+ nil, category_ids: [], country: '', city: '', state: '',
		225	+ national_region_code: '', redirect_l10n: false, notification_time: 0,
		226	+ custom_url_redirection: nil, email_suggestions: false,
		227	+ allow_members_to_invite: false, invite_friends_only: false, secret: false,
		228	+ profile_admin_mail_notification: false, redirection_after_login: nil,
		229	+ profile_activities: ProfileActivity.none, action_tracker_notifications:
		230	+ ActionTrackerNotification.none, tracked_notifications:
		231	+ ActionTracker::Record.none, scraps_received: Scrap.none, template:
		232	+ Profile.none, comments_received: Comment.none, email_templates:
		233	+ EmailTemplate.none, members: Profile.none, members_like: Profile.none,
		234	+ members_by: Profile.none, members_by_role: Profile.none, scraps:
		235	+ Scrap.none, welcome_page_content: nil, settings: {}, find_in_all_tasks:
		236	+ nil, top_level_categorization: {}, interests: Category.none, geolocation:
		237	+ '', country_name: '', pending_categorizations: [], add_category: false,
		238	+ create_pending_categorizations: false, top_level_articles: Article.none,
		239	+ valid_identifier: true, valid_template: false, create_default_set_of_boxes:
		240	+ true, copy_blocks_from: nil, default_template: nil,
		241	+ template_without_default: nil, template_with_default: nil, apply_template:
		242	+ false, iframe_whitelist: [], recent_documents: Article.none, last_articles:
		243	+ Article.none, is_validation_entity?: false, hostname: nil, own_hostname:
		244	+ nil, article_tags: {}, tagged_with: Article.none,
		245	+ insert_default_article_set: false, copy_articles_from: true,
		246	+ copy_article_tree: nil, copy_article?: false, add_member: false,
		247	+ remove_member: false, add_admin: false, remove_admin: false, add_moderator:
		248	+ false, display_info_to?: true, update_category_from_region: nil,
		249	+ accept_category?: false, custom_header_expanded: '',
		250	+ custom_footer_expanded: '', public?: true, themes: [], find_theme: nil,
		251	+ blogs: Blog.none, blog: nil, has_blog?: false, forums: Forum.none, forum:
		252	+ nil, has_forum?: false, admins: [], settings_field: {}, setting_changed:
		253	+ false, public_content: true, enable_contact?: false, folder_types: [],
		254	+ folders: Article.none, image_galleries: Article.none, image_valid: true,
		255	+ update_header_and_footer: nil, update_theme: nil, update_layout_template:
		256	+ nil, recent_actions: ActionTracker::Record.none, recent_notifications:
		257	+ ActionTracker::Record.none, more_active_label: _('no activity'),
		258	+ more_popular_label: _('no members'), profile_custom_image: nil,
		259	+ is_on_homepage?: false, activities: ProfileActivity.none,
		260	+ may_display_field_to?: true, may_display_location_to?: true, public_fields:
		261	+ {}, followed_by?: false, display_private_info_to?: true, can_view_field?:
		262	+ true, remove_from_suggestion_list: nil, layout_template: 'default',
		263	+ is_admin?: false, add_friend: false, is_a_friend?: false,
		264	+ already_request_friendship?: false
		265	+ }
		266	+
		267	+ derivated_methods = generate_derivated_methods(methods_and_responses)
		268	+ derivated_methods.merge(methods_and_responses)
		269	+ end
		270	+
		271	+ def method_missing(method, *args, &block)
		272	+ if person_instance_methods.keys.include?(method)
		273	+ return person_instance_methods[method]
		274	+ end
		275	+ if profile_instance_methods.keys.include? method
		276	+ return profile_instance_methods[method]
		277	+ end
		278	+ end
		279	+
		280	+ def respond_to_missing?(method_name, include_private = false)
		281	+ person_instance_methods.keys.include?(method_name) \|\|
		282	+ profile_instance_methods.keys.include?(method_name) \|\|
		283	+ super
		284	+ end
		285	+
		286	+ private
		287	+
		288	+ def generate_derivated_methods(methods)
		289	+ derivated_methods = {}
		290	+ methods.keys.each do \|method\|
		291	+ derivated_methods[method.to_s.insert(-1, '?').to_sym] = false
		292	+ derivated_methods[method.to_s.insert(-1, '=').to_sym] = nil
		293	+ end
		294	+ derivated_methods
		295	+ end
132	end	296	end
	@@ -94,7 +94,7 @@ class Person < Profile		@@ -94,7 +94,7 @@ class Person < Profile
94	has_many :following_articles, :class_name => 'Article', :through => :article_followers, :source => :article	94	has_many :following_articles, :class_name => 'Article', :through => :article_followers, :source => :article
95	has_many :friendships, :dependent => :destroy	95	has_many :friendships, :dependent => :destroy
96	has_many :friends, :class_name => 'Person', :through => :friendships	96	has_many :friends, :class_name => 'Person', :through => :friendships
97	- has_many :circles, as: :person	97	+ has_many :owned_circles, as: :owner, :class_name => 'Circle'
98		98
99	scope :online, -> {	99	scope :online, -> {
100	joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)	100	joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
	@@ -5,14 +5,14 @@ class ProfileFollower < ApplicationRecord		@@ -5,14 +5,14 @@ class ProfileFollower < ApplicationRecord
5	attr_accessible :profile, :circle	5	attr_accessible :profile, :circle
6		6
7	#TODO -> user being followed	7	#TODO -> user being followed
8	- belongs_to :profile	8	+ belongs_to :profile, :polymorphic => true
9	belongs_to :circle	9	belongs_to :circle
10		10
11	#TODO -> circle owner	11	#TODO -> circle owner
12	# has_one :person, through: :circle, source_type: "ProfileFollower"	12	# has_one :person, through: :circle, source_type: "ProfileFollower"
13		13
14	def circle_owner	14	def circle_owner
15	- self.circle.person	15	+ self.circle.owner
16	end	16	end
17		17
18	alias follower circle_owner	18	alias follower circle_owner
	@@ -21,7 +21,7 @@ class ProfileFollower < ApplicationRecord		@@ -21,7 +21,7 @@ class ProfileFollower < ApplicationRecord
21	validates :profile_id, :uniqueness => {:scope => :circle_id, :message => "can't put a profile in the same circle twice"}	21	validates :profile_id, :uniqueness => {:scope => :circle_id, :message => "can't put a profile in the same circle twice"}
22		22
23	scope :with_follower, -> person{	23	scope :with_follower, -> person{
24	- joins(:circle).where('circles.person_id = ?', person.id)	24	+ joins(:circle).where('circles.owner_id = ?', person.id)
25	}	25	}
26		26
27	scope :with_profile, -> profile{	27	scope :with_profile, -> profile{
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	<div id="circles-checkboxes">	3	<div id="circles-checkboxes">
4	<% circles.each do \|circle\| %>	4	<% circles.each do \|circle\| %>
5	<div class="circle">	5	<div class="circle">
6	- <%= labelled_check_box circle.name, "circles[#{circle.name}]", circle.id, followed_profile.in_circle?(circle, follower) %>	6	+ <%= labelled_check_box circle.name, "circles[#{circle.name}]", circle.id, followed_profile.in_circle?(circle) %>
7	</div>	7	</div>
8	<% end %>	8	<% end %>
9	</div>	9	</div>
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddsProfileTypeToProfileFollowers < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :profiles_circles, :profile_type, :string, default: "Person"
	4	+ add_index :profiles_circles, [:profile_id, :profile_type]
	5	+ end
	6	+
	7	+ def down
	8	+ remove_column :profiles_circles, :profile_type
	9	+ remove_index :profiles_circles, [:profile_id, :profile_type]
	10	+ end
	11	+end