From da79b72d622af80aa4c1a68a079a71fc322acafe Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 22 Jun 2016 02:56:22 +0200 Subject: [PATCH] don't parse url from hcard this is deprecated anyway and is not used anywhere, so we don't need to parse it. --- lib/diaspora_federation/discovery/h_card.rb | 5 ++--- spec/lib/diaspora_federation/discovery/h_card_spec.rb | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/diaspora_federation/discovery/h_card.rb b/lib/diaspora_federation/discovery/h_card.rb index b04040b..242d5bf 100644 --- a/lib/diaspora_federation/discovery/h_card.rb +++ b/lib/diaspora_federation/discovery/h_card.rb @@ -60,7 +60,7 @@ module DiasporaFederation # installations). # # @return [String] link to the pod - property :url + property :url, default: nil # @!attribute [r] public_key # When a user is created on the pod, the pod MUST generate a pgp keypair @@ -163,7 +163,6 @@ module DiasporaFederation guid: guid_from_doc(doc), nickname: content_from_doc(doc, :nickname), full_name: content_from_doc(doc, :fn), - url: element_from_doc(doc, :url)["href"], photo_large_url: photo_from_doc(doc, :photo), photo_medium_url: photo_from_doc(doc, :photo_medium), photo_small_url: photo_from_doc(doc, :photo_small), @@ -255,7 +254,7 @@ module DiasporaFederation # @return [Boolean] validation result private_class_method def self.html_document_complete?(doc) !(doc.at_css(SELECTORS[:fn]).nil? || doc.at_css(SELECTORS[:nickname]).nil? || - doc.at_css(SELECTORS[:url]).nil? || doc.at_css(SELECTORS[:photo]).nil?) + doc.at_css(SELECTORS[:photo]).nil?) end private_class_method def self.parse_html_and_validate(html_string) diff --git a/spec/lib/diaspora_federation/discovery/h_card_spec.rb b/spec/lib/diaspora_federation/discovery/h_card_spec.rb index c14cd88..0376373 100644 --- a/spec/lib/diaspora_federation/discovery/h_card_spec.rb +++ b/spec/lib/diaspora_federation/discovery/h_card_spec.rb @@ -124,7 +124,6 @@ HTML expect(hcard.guid).to eq(person.guid) expect(hcard.nickname).to eq(person.nickname) expect(hcard.full_name).to eq(person.full_name) - expect(hcard.url).to eq(person.url) expect(hcard.photo_large_url).to eq(photo_large_url) expect(hcard.photo_medium_url).to eq(photo_medium_url) expect(hcard.photo_small_url).to eq(photo_small_url) @@ -237,7 +236,6 @@ HTML HTML hcard = Discovery::HCard.from_html(historic_html) - expect(hcard.url).to eq(person.url) expect(hcard.photo_large_url).to eq(photo_large_url) expect(hcard.photo_medium_url).to eq(photo_medium_url) expect(hcard.photo_small_url).to eq(photo_small_url)