nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't parse url from hcard

Browse source 
this is deprecated anyway and is not used anywhere, so we don't need to parse it.
This commit is contained in:
Benjamin Neff 2016-06-22 02:56:22 +02:00
parent 019b93d176
commit da79b72d62
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/diaspora_federation/discovery/h_card.rb
View file

@ -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)

2
spec/lib/diaspora_federation/discovery/h_card_spec.rb
View file

@ -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)