From 30f406de954bac1da5fef7cdd753c0af16f11051 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 23 Jan 2013 13:13:41 +0100
Subject: added unit tests for user presenter

changed the way the presenter works. Will need functional testing
---
 users/app/controllers/webfinger_controller.rb |  4 ++--
 users/app/views/webfinger/search.xml.erb      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'users/app')

diff --git a/users/app/controllers/webfinger_controller.rb b/users/app/controllers/webfinger_controller.rb
index f28dd3e..8872802 100644
--- a/users/app/controllers/webfinger_controller.rb
+++ b/users/app/controllers/webfinger_controller.rb
@@ -12,8 +12,8 @@ class WebfingerController < ApplicationController
     username = params[:q].split('@')[0].to_s.downcase
     user = User.find_by_login(username)
     raise RECORD_NOT_FOUND, 'User not found' unless user.present?
-    @subject = Webfinger::UserPresenter.new(user, request)
-    respond_with @subject
+    @presenter = Webfinger::UserPresenter.new(user, request)
+    respond_with @presenter
   end
 
 end
diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb
index 270383e..27f26d1 100644
--- a/users/app/views/webfinger/search.xml.erb
+++ b/users/app/views/webfinger/search.xml.erb
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Subject>acct:<%= @subject.email_identifier %></Subject>
-  <Alias>"<%= user_url(@subject.subject) %>"</Alias>
-  <%- if @subject.key.present? %>
-    <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/>
+  <Subject><%= @presenter.subject %></Subject>
+  <%- @presenter.aliases.each do |user_alias| %>
+    <Alias>"<%= user_alias %>"</Alias>
+  <% end %>
+  <%- @presenter.links.each do |rel, link| %>
+    <Link rel=<%=rel%> type=<%=link[:type]%> href="<%= link[:key] %>"/>
   <% end %>
 </XRD>
-- 
cgit v1.2.3