From 137100dcf38c0da0fe7044a4c92aa06eae02c420 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 13 Apr 2017 07:09:07 -0400 Subject: Clean up well-known routes/controllers (#1649) * Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers --- app/views/xrd/host_meta.xml.ruby | 5 ----- app/views/xrd/webfinger.json.rabl | 17 ----------------- app/views/xrd/webfinger.xml.ruby | 11 ----------- 3 files changed, 33 deletions(-) delete mode 100644 app/views/xrd/host_meta.xml.ruby delete mode 100644 app/views/xrd/webfinger.json.rabl delete mode 100644 app/views/xrd/webfinger.xml.ruby (limited to 'app/views/xrd') diff --git a/app/views/xrd/host_meta.xml.ruby b/app/views/xrd/host_meta.xml.ruby deleted file mode 100644 index 07d026471..000000000 --- a/app/views/xrd/host_meta.xml.ruby +++ /dev/null @@ -1,5 +0,0 @@ -Nokogiri::XML::Builder.new do |xml| - xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do - xml.Link(rel: 'lrdd', type: 'application/xrd+xml', template: @webfinger_template) - end -end.to_xml diff --git a/app/views/xrd/webfinger.json.rabl b/app/views/xrd/webfinger.json.rabl deleted file mode 100644 index e637ed9d3..000000000 --- a/app/views/xrd/webfinger.json.rabl +++ /dev/null @@ -1,17 +0,0 @@ -object @account - -node(:subject) { @canonical_account_uri } - -node(:aliases) do - [TagManager.instance.url_for(@account)] -end - -node(:links) do - [ - { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account) }, - { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }, - { rel: 'salmon', href: api_salmon_url(@account.id) }, - { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" }, - { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}" }, - ] -end diff --git a/app/views/xrd/webfinger.xml.ruby b/app/views/xrd/webfinger.xml.ruby deleted file mode 100644 index 80ac71d27..000000000 --- a/app/views/xrd/webfinger.xml.ruby +++ /dev/null @@ -1,11 +0,0 @@ -Nokogiri::XML::Builder.new do |xml| - xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do - xml.Subject @canonical_account_uri - xml.Alias TagManager.instance.url_for(@account) - xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account)) - xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom')) - xml.Link(rel: 'salmon', href: api_salmon_url(@account.id)) - xml.Link(rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}") - xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}") - end -end.to_xml -- cgit