From de48efcf2a6b5fb096fd209b1efea482f743c19c Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 22 Jan 2013 12:02:18 +0100
Subject: some basic webfinger routes, controller, presenters, views

---
 users/app/views/webfinger/host_meta.erb | 11 +++++++++++
 users/app/views/webfinger/search.erb    |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 users/app/views/webfinger/host_meta.erb
 create mode 100644 users/app/views/webfinger/search.erb

(limited to 'users/app/views/webfinger')

diff --git a/users/app/views/webfinger/host_meta.erb b/users/app/views/webfinger/host_meta.erb
new file mode 100644
index 0000000..23b4039
--- /dev/null
+++ b/users/app/views/webfinger/host_meta.erb
@@ -0,0 +1,11 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
+
+    <Subject><%= @host_meta.subject %></Subject>
+
+
+  <Link rel='lrdd'
+        type='application/xrd+xml'
+        template='<%= @host_meta.webfinger_template %>' />
+
+  </XRD>
diff --git a/users/app/views/webfinger/search.erb b/users/app/views/webfinger/search.erb
new file mode 100644
index 0000000..0bcb7e5
--- /dev/null
+++ b/users/app/views/webfinger/search.erb
@@ -0,0 +1,6 @@
+<?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>
+  <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/>
+</XRD>
-- 
cgit v1.2.3


From 31d18779fe1af0c55b72be7bc554302322025ee5 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 22 Jan 2013 15:46:47 +0100
Subject: adding json jrd responses to webfinger

---
 users/app/views/webfinger/search.erb     | 6 ------
 users/app/views/webfinger/search.xml.erb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 users/app/views/webfinger/search.erb
 create mode 100644 users/app/views/webfinger/search.xml.erb

(limited to 'users/app/views/webfinger')

diff --git a/users/app/views/webfinger/search.erb b/users/app/views/webfinger/search.erb
deleted file mode 100644
index 0bcb7e5..0000000
--- a/users/app/views/webfinger/search.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
-  <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/>
-</XRD>
diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb
new file mode 100644
index 0000000..0bcb7e5
--- /dev/null
+++ b/users/app/views/webfinger/search.xml.erb
@@ -0,0 +1,6 @@
+<?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>
+  <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/>
+</XRD>
-- 
cgit v1.2.3


From 40edf176142bd6092f13bd9f9fb72a2c69d4b052 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 22 Jan 2013 16:45:01 +0100
Subject: fixing xml and adding json representation for host_meta

---
 users/app/views/webfinger/host_meta.erb     | 11 -----------
 users/app/views/webfinger/host_meta.xml.erb | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 users/app/views/webfinger/host_meta.erb
 create mode 100644 users/app/views/webfinger/host_meta.xml.erb

(limited to 'users/app/views/webfinger')

diff --git a/users/app/views/webfinger/host_meta.erb b/users/app/views/webfinger/host_meta.erb
deleted file mode 100644
index 23b4039..0000000
--- a/users/app/views/webfinger/host_meta.erb
+++ /dev/null
@@ -1,11 +0,0 @@
- <?xml version='1.0' encoding='UTF-8'?>
-  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
-
-    <Subject><%= @host_meta.subject %></Subject>
-
-
-  <Link rel='lrdd'
-        type='application/xrd+xml'
-        template='<%= @host_meta.webfinger_template %>' />
-
-  </XRD>
diff --git a/users/app/views/webfinger/host_meta.xml.erb b/users/app/views/webfinger/host_meta.xml.erb
new file mode 100644
index 0000000..37c9d1e
--- /dev/null
+++ b/users/app/views/webfinger/host_meta.xml.erb
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
+
+    <Subject><%= @host_meta.subject %></Subject>
+
+
+  <Link rel='lrdd'
+        type='application/xrd+xml'
+        template='<%= @host_meta.webfinger_template %>' />
+
+  </XRD>
-- 
cgit v1.2.3


From b530279a144ad5fb35070952898c8e6ae3ba68ea Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 23 Jan 2013 09:39:50 +0100
Subject: not inluding link to key if there is none

---
 users/app/views/webfinger/search.xml.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'users/app/views/webfinger')

diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb
index 0bcb7e5..270383e 100644
--- a/users/app/views/webfinger/search.xml.erb
+++ b/users/app/views/webfinger/search.xml.erb
@@ -2,5 +2,7 @@
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
   <Subject>acct:<%= @subject.email_identifier %></Subject>
   <Alias>"<%= user_url(@subject.subject) %>"</Alias>
-  <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/>
+  <%- if @subject.key.present? %>
+    <Link rel="public-key" type = 'PGP' href="<%= @subject.key %>"/>
+  <% end %>
 </XRD>
-- 
cgit v1.2.3


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/views/webfinger/search.xml.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'users/app/views/webfinger')

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


From efb9f511f426b9d6f3af63608e77f80c4b823fb0 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 23 Jan 2013 15:52:38 +0100
Subject: added a small test for HostMetaPresenter and using links hash in xml
 view

---
 users/app/views/webfinger/host_meta.xml.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'users/app/views/webfinger')

diff --git a/users/app/views/webfinger/host_meta.xml.erb b/users/app/views/webfinger/host_meta.xml.erb
index 37c9d1e..cfcbcc0 100644
--- a/users/app/views/webfinger/host_meta.xml.erb
+++ b/users/app/views/webfinger/host_meta.xml.erb
@@ -3,9 +3,9 @@
 
     <Subject><%= @host_meta.subject %></Subject>
 
-
-  <Link rel='lrdd'
-        type='application/xrd+xml'
-        template='<%= @host_meta.webfinger_template %>' />
-
+  <%- @host_meta.links.each do |rel, link| %>
+    <Link rel='<%= rel %>'
+      type='<%= link[:type] %>'
+      template='<%= link[:template] %>' />
+  <%- end %>
   </XRD>
-- 
cgit v1.2.3


From 9d053b6c9b61c68bf11f95bcb37631a518f1fba4 Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Thu, 24 Jan 2013 11:38:11 -0800
Subject: Removing aliases from webfinger as the link wouldn't work anyway, and
 don't want to leak ID information.

---
 users/app/views/webfinger/search.xml.erb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'users/app/views/webfinger')

diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb
index 27f26d1..7328552 100644
--- a/users/app/views/webfinger/search.xml.erb
+++ b/users/app/views/webfinger/search.xml.erb
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
   <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 %>
-- 
cgit v1.2.3