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

Send new property names in XML

Browse source 
Second step of #29
This commit is contained in:
Benjamin Neff 2017-04-27 23:31:10 +02:00
parent 87033e4cd6
commit 52a8c89d4c
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
21 changed files with 31 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/diaspora_federation/entity.rb
View file

@ -296,8 +296,7 @@ module DiasporaFederation
# Create simple node, fill it with text and append to root
def simple_node(doc, name, value)
xml_name = self.class.xml_names[name]
Nokogiri::XML::Element.new(xml_name ? xml_name.to_s : name, doc).tap do |node|
Nokogiri::XML::Element.new(name.to_s, doc).tap do |node|
node.content = value.gsub(INVALID_XML_REGEX, "\uFFFD") unless value.empty?
end
end

1
spec/integration/comment_integration_spec.rb
View file

@ -185,6 +185,7 @@ XML
context "relaying on bobs pod" do
before do
skip("TODO: expect new format as output")
expect_callback(:fetch_public_key, author).and_return(author_key.public_key)
expect_callback(:fetch_private_key, parent.author).and_return(parent_key)
expect_callback(:fetch_related_entity, "Post", parent_guid).and_return(parent)

2
spec/lib/diaspora_federation/entities/account_deletion_spec.rb
View file

@ -4,7 +4,7 @@ module DiasporaFederation
let(:xml) { <<-XML }
<account_deletion>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
</account_deletion>
XML

2
spec/lib/diaspora_federation/entities/account_migration_spec.rb
View file

@ -19,7 +19,7 @@ module DiasporaFederation
<account_migration>
<author>#{data[:author]}</author>
<profile>
<diaspora_handle>#{data[:profile].author}</diaspora_handle>
<author>#{data[:profile].author}</author>
<first_name>#{data[:profile].first_name}</first_name>
<last_name/>
<image_url>#{data[:profile].image_url}</image_url>

2
spec/lib/diaspora_federation/entities/comment_spec.rb
View file

@ -15,7 +15,7 @@ module DiasporaFederation
let(:xml) { <<-XML }
<comment>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<parent_guid>#{parent.guid}</parent_guid>
<text>#{data[:text]}</text>

4
spec/lib/diaspora_federation/entities/conversation_spec.rb
View file

@ -29,11 +29,11 @@ module DiasporaFederation
let(:xml) { <<-XML }
<conversation>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{parent.guid}</guid>
<subject>#{data[:subject]}</subject>
<created_at>#{data[:created_at].utc.iso8601}</created_at>
<participant_handles>#{data[:participants]}</participant_handles>
<participants>#{data[:participants]}</participants>
#{data[:messages].map {|a| indent(a.to_xml.to_s, 2) }.join("\n")}
</conversation>
XML

4
spec/lib/diaspora_federation/entities/like_spec.rb
View file

@ -14,10 +14,10 @@ module DiasporaFederation
let(:xml) { <<-XML }
<like>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<parent_guid>#{parent.guid}</parent_guid>
<target_type>#{parent.entity_type}</target_type>
<parent_type>#{parent.entity_type}</parent_type>
<positive>#{data[:positive]}</positive>
<author_signature>#{data[:author_signature]}</author_signature>
<parent_author_signature>#{data[:parent_author_signature]}</parent_author_signature>

2
spec/lib/diaspora_federation/entities/message_spec.rb
View file

@ -4,7 +4,7 @@ module DiasporaFederation
let(:xml) { <<-XML }
<message>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<text>#{data[:text]}</text>
<created_at>#{data[:created_at].utc.iso8601}</created_at>

4
spec/lib/diaspora_federation/entities/participation_spec.rb
View file

@ -12,10 +12,10 @@ module DiasporaFederation
let(:xml) { <<-XML }
<participation>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<parent_guid>#{parent.guid}</parent_guid>
<target_type>#{parent.entity_type}</target_type>
<parent_type>#{parent.entity_type}</parent_type>
</participation>
XML

4
spec/lib/diaspora_federation/entities/person_spec.rb
View file

@ -5,10 +5,10 @@ module DiasporaFederation
let(:xml) { <<-XML }
<person>
<guid>#{data[:guid]}</guid>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<url>#{data[:url]}</url>
<profile>
<diaspora_handle>#{data[:profile].author}</diaspora_handle>
<author>#{data[:profile].author}</author>
<first_name>#{data[:profile].first_name}</first_name>
<last_name/>
<image_url>#{data[:profile].image_url}</image_url>

2
spec/lib/diaspora_federation/entities/photo_spec.rb
View file

@ -5,7 +5,7 @@ module DiasporaFederation
let(:xml) { <<-XML }
<photo>
<guid>#{data[:guid]}</guid>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<public>#{data[:public]}</public>
<created_at>#{data[:created_at].utc.iso8601}</created_at>
<remote_photo_path>#{data[:remote_photo_path]}</remote_photo_path>

2
spec/lib/diaspora_federation/entities/poll_participation_spec.rb
View file

@ -13,7 +13,7 @@ module DiasporaFederation
let(:xml) { <<-XML }
<poll_participation>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<parent_guid>#{parent.guid}</parent_guid>
<poll_answer_guid>#{data[:poll_answer_guid]}</poll_answer_guid>

2
spec/lib/diaspora_federation/entities/profile_spec.rb
View file

@ -4,7 +4,7 @@ module DiasporaFederation
let(:xml) { <<-XML }
<profile>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<first_name>#{data[:first_name]}</first_name>
<last_name/>
<image_url>#{data[:image_url]}</image_url>

2
spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
View file

@ -26,7 +26,7 @@ module DiasporaFederation
<parent_author_signature>#{data[:parent_author_signature]}</parent_author_signature>
<target_guid>#{data[:target_guid]}</target_guid>
<target_type>#{data[:target_type]}</target_type>
<sender_handle>#{data[:author]}</sender_handle>
<author>#{data[:author]}</author>
<target_author_signature/>
</relayable_retraction>
XML

2
spec/lib/diaspora_federation/entities/relayable_spec.rb
View file

@ -133,7 +133,7 @@ module DiasporaFederation
describe "#to_xml" do
let(:expected_xml) { <<-XML }
<some_relayable>
<diaspora_handle>#{author}</diaspora_handle>
<author>#{author}</author>
<guid>#{guid}</guid>
<parent_guid>#{parent_guid}</parent_guid>
<property>#{property}</property>

4
spec/lib/diaspora_federation/entities/request_spec.rb
View file

@ -4,8 +4,8 @@ module DiasporaFederation
let(:xml) { <<-XML }
<request>
<sender_handle>#{data[:author]}</sender_handle>
<recipient_handle>#{data[:recipient]}</recipient_handle>
<author>#{data[:author]}</author>
<recipient>#{data[:recipient]}</recipient>
</request>
XML

4
spec/lib/diaspora_federation/entities/reshare_spec.rb
View file

@ -5,11 +5,11 @@ module DiasporaFederation
let(:xml) { <<-XML }
<reshare>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<created_at>#{data[:created_at].utc.iso8601}</created_at>
<provider_display_name>#{data[:provider_display_name]}</provider_display_name>
<root_diaspora_id>#{data[:root_author]}</root_diaspora_id>
<root_author>#{data[:root_author]}</root_author>
<root_guid>#{data[:root_guid]}</root_guid>
<public>#{data[:public]}</public>
</reshare>

6
spec/lib/diaspora_federation/entities/retraction_spec.rb
View file

@ -13,9 +13,9 @@ module DiasporaFederation
let(:xml) { <<-XML }
<retraction>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<post_guid>#{data[:target_guid]}</post_guid>
<type>#{data[:target_type]}</type>
<author>#{data[:author]}</author>
<target_guid>#{data[:target_guid]}</target_guid>
<target_type>#{data[:target_type]}</target_type>
</retraction>
XML

2
spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
View file

@ -16,7 +16,7 @@ module DiasporaFederation
<signed_retraction>
<target_guid>#{data[:target_guid]}</target_guid>
<target_type>#{data[:target_type]}</target_type>
<sender_handle>#{data[:author]}</sender_handle>
<author>#{data[:author]}</author>
<target_author_signature>#{data[:target_author_signature]}</target_author_signature>
</signed_retraction>
XML

8
spec/lib/diaspora_federation/entities/status_message_spec.rb
View file

@ -16,14 +16,14 @@ module DiasporaFederation
let(:xml) { <<-XML }
<status_message>
<diaspora_handle>#{data[:author]}</diaspora_handle>
<author>#{data[:author]}</author>
<guid>#{data[:guid]}</guid>
<created_at>#{data[:created_at].utc.iso8601}</created_at>
<provider_display_name>#{data[:provider_display_name]}</provider_display_name>
<raw_message>#{data[:text]}</raw_message>
<text>#{data[:text]}</text>
<photo>
<guid>#{photo1.guid}</guid>
<diaspora_handle>#{photo1.author}</diaspora_handle>
<author>#{photo1.author}</author>
<public>#{photo1.public}</public>
<created_at>#{photo1.created_at.utc.iso8601}</created_at>
<remote_photo_path>#{photo1.remote_photo_path}</remote_photo_path>
@ -35,7 +35,7 @@ module DiasporaFederation
</photo>
<photo>
<guid>#{photo2.guid}</guid>
<diaspora_handle>#{photo2.author}</diaspora_handle>
<author>#{photo2.author}</author>
<public>#{photo2.public}</public>
<created_at>#{photo2.created_at.utc.iso8601}</created_at>
<remote_photo_path>#{photo2.remote_photo_path}</remote_photo_path>

9
spec/lib/diaspora_federation/entity_spec.rb
View file

@ -455,15 +455,6 @@ XML
context "xml_name" do
let(:hash) { {test: "test", qwer: "qwer"} }
it "uses xml_name for the #to_xml" do
entity = Entities::TestEntityWithXmlName.new(hash)
xml_children = entity.to_xml.children
expect(xml_children).to have_exactly(2).items
xml_children.each do |node|
expect(%w(test asdf)).to include(node.name)
end
end
it "should not use the xml_name for the #to_h" do
entity = Entities::TestEntityWithXmlName.new(hash)
expect(entity.to_h).to eq(hash)