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 +++++++++++
 users/lib/.webfinger.rb.swp                 | Bin 12288 -> 0 bytes
 users/lib/webfinger/host_meta_presenter.rb  |   9 +++++++++
 4 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 users/app/views/webfinger/host_meta.erb
 create mode 100644 users/app/views/webfinger/host_meta.xml.erb
 delete mode 100644 users/lib/.webfinger.rb.swp

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>
diff --git a/users/lib/.webfinger.rb.swp b/users/lib/.webfinger.rb.swp
deleted file mode 100644
index 09528c6..0000000
Binary files a/users/lib/.webfinger.rb.swp and /dev/null differ
diff --git a/users/lib/webfinger/host_meta_presenter.rb b/users/lib/webfinger/host_meta_presenter.rb
index 3901a28..b48729c 100644
--- a/users/lib/webfinger/host_meta_presenter.rb
+++ b/users/lib/webfinger/host_meta_presenter.rb
@@ -14,4 +14,13 @@ class Webfinger::HostMetaPresenter
   def webfinger_template(path = 'webfinger', query_param='q')
     "#{subject}/#{path}?#{query_param}={uri}"
   end
+
+  def to_json(options)
+    {
+      subject: subject,
+      links: {
+        lrdd: { type: 'application/xrd+xml', template: webfinger_template }
+      }
+    }.to_json(options)
+  end
 end
-- 
cgit v1.2.3