Introduce OStatus::TagManager (#5008)
This commit is contained in:
Akihiko Odaki
Eugen Rochko
parent
df1ce2350c
commit
bb4d005a83
31 changed files with 308 additions and 297 deletions
|
|
@ -17,7 +17,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
follow_request_salmon = serialize(follow_request)
|
||||
|
||||
object_type = follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with request_friend type' do
|
||||
|
|
@ -26,7 +26,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
follow_request_salmon = serialize(follow_request)
|
||||
|
||||
verb = follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:request_friend]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:request_friend]
|
||||
end
|
||||
|
||||
it 'appends activity:object with target account' do
|
||||
|
|
@ -44,13 +44,13 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
it 'adds namespaces' do
|
||||
element = serialize
|
||||
|
||||
expect(element['xmlns']).to eq TagManager::XMLNS
|
||||
expect(element['xmlns:thr']).to eq TagManager::THR_XMLNS
|
||||
expect(element['xmlns:activity']).to eq TagManager::AS_XMLNS
|
||||
expect(element['xmlns:poco']).to eq TagManager::POCO_XMLNS
|
||||
expect(element['xmlns:media']).to eq TagManager::MEDIA_XMLNS
|
||||
expect(element['xmlns:ostatus']).to eq TagManager::OS_XMLNS
|
||||
expect(element['xmlns:mastodon']).to eq TagManager::MTDN_XMLNS
|
||||
expect(element['xmlns']).to eq OStatus::TagManager::XMLNS
|
||||
expect(element['xmlns:thr']).to eq OStatus::TagManager::THR_XMLNS
|
||||
expect(element['xmlns:activity']).to eq OStatus::TagManager::AS_XMLNS
|
||||
expect(element['xmlns:poco']).to eq OStatus::TagManager::POCO_XMLNS
|
||||
expect(element['xmlns:media']).to eq OStatus::TagManager::MEDIA_XMLNS
|
||||
expect(element['xmlns:ostatus']).to eq OStatus::TagManager::OS_XMLNS
|
||||
expect(element['xmlns:mastodon']).to eq OStatus::TagManager::MTDN_XMLNS
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
mentioned = element.nodes.find do |node|
|
||||
node.name == 'link' &&
|
||||
node[:rel] == 'mentioned' &&
|
||||
node['ostatus:object-type'] == TagManager::TYPES[:person]
|
||||
node['ostatus:object-type'] == OStatus::TagManager::TYPES[:person]
|
||||
end
|
||||
|
||||
expect(mentioned[:href]).to eq 'https://cb6e6126.ngrok.io/users/username'
|
||||
|
|
@ -188,7 +188,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
author = OStatus::AtomSerializer.new.author(account)
|
||||
|
||||
object_type = author.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:person]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:person]
|
||||
end
|
||||
|
||||
it 'appends email element with username and domain for local account' do
|
||||
|
|
@ -358,9 +358,9 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
mentioned_person = entry.nodes.find do |node|
|
||||
node.name == 'link' &&
|
||||
node[:rel] == 'mentioned' &&
|
||||
node['ostatus:object-type'] == TagManager::TYPES[:collection]
|
||||
node['ostatus:object-type'] == OStatus::TagManager::TYPES[:collection]
|
||||
end
|
||||
expect(mentioned_person[:href]).to eq TagManager::COLLECTIONS[:public]
|
||||
expect(mentioned_person[:href]).to eq OStatus::TagManager::COLLECTIONS[:public]
|
||||
end
|
||||
|
||||
it 'does not append link element for the public collection if status is not publicly visible' do
|
||||
|
|
@ -371,8 +371,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
entry.nodes.each do |node|
|
||||
if node.name == 'link' &&
|
||||
node[:rel] == 'mentioned' &&
|
||||
node['ostatus:object-type'] == TagManager::TYPES[:collection]
|
||||
expect(mentioned_collection[:href]).not_to eq TagManager::COLLECTIONS[:public]
|
||||
node['ostatus:object-type'] == OStatus::TagManager::TYPES[:collection]
|
||||
expect(mentioned_collection[:href]).not_to eq OStatus::TagManager::COLLECTIONS[:public]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -506,7 +506,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
status = Fabricate(:status)
|
||||
entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
|
||||
object_type = entry.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:note]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:note]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with object type' do
|
||||
|
|
@ -515,7 +515,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
|
||||
|
||||
object_type = entry.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(object_type.text).to eq TagManager::VERBS[:post]
|
||||
expect(object_type.text).to eq OStatus::TagManager::VERBS[:post]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with target if present' do
|
||||
|
|
@ -739,8 +739,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
time_after = Time.now
|
||||
|
||||
expect(block_salmon.id.text).to(
|
||||
eq(TagManager.instance.unique_tag(time_before.utc, block.id, 'Block'))
|
||||
.or(eq(TagManager.instance.unique_tag(time_after.utc, block.id, 'Block')))
|
||||
eq(OStatus::TagManager.instance.unique_tag(time_before.utc, block.id, 'Block'))
|
||||
.or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, block.id, 'Block')))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -769,7 +769,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
|
||||
|
||||
object_type = block_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with block' do
|
||||
|
|
@ -778,7 +778,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
|
||||
|
||||
verb = block_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:block]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:block]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with target account' do
|
||||
|
|
@ -826,8 +826,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
time_after = Time.now
|
||||
|
||||
expect(unblock_salmon.id.text).to(
|
||||
eq(TagManager.instance.unique_tag(time_before.utc, block.id, 'Block'))
|
||||
.or(eq(TagManager.instance.unique_tag(time_after.utc, block.id, 'Block')))
|
||||
eq(OStatus::TagManager.instance.unique_tag(time_before.utc, block.id, 'Block'))
|
||||
.or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, block.id, 'Block')))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -856,7 +856,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
|
||||
|
||||
object_type = unblock_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with block' do
|
||||
|
|
@ -865,7 +865,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
|
||||
|
||||
verb = unblock_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:unblock]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:unblock]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with target account' do
|
||||
|
|
@ -934,7 +934,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
|
||||
|
||||
verb = favourite_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:favorite]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:favorite]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with status' do
|
||||
|
|
@ -1005,8 +1005,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
time_after = Time.now
|
||||
|
||||
expect(unfavourite_salmon.id.text).to(
|
||||
eq(TagManager.instance.unique_tag(time_before.utc, favourite.id, 'Favourite'))
|
||||
.or(eq(TagManager.instance.unique_tag(time_after.utc, favourite.id, 'Favourite')))
|
||||
eq(OStatus::TagManager.instance.unique_tag(time_before.utc, favourite.id, 'Favourite'))
|
||||
.or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, favourite.id, 'Favourite')))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -1034,7 +1034,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
|
||||
|
||||
verb = unfavourite_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:unfavorite]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:unfavorite]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with status' do
|
||||
|
|
@ -1117,7 +1117,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
|
||||
|
||||
object_type = follow_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with follow' do
|
||||
|
|
@ -1126,7 +1126,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
|
||||
|
||||
verb = follow_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:follow]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:follow]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with target account' do
|
||||
|
|
@ -1190,8 +1190,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
time_after = Time.now
|
||||
|
||||
expect(unfollow_salmon.id.text).to(
|
||||
eq(TagManager.instance.unique_tag(time_before.utc, follow.id, 'Follow'))
|
||||
.or(eq(TagManager.instance.unique_tag(time_after.utc, follow.id, 'Follow')))
|
||||
eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow.id, 'Follow'))
|
||||
.or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, follow.id, 'Follow')))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -1234,7 +1234,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
|
||||
|
||||
object_type = unfollow_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with follow' do
|
||||
|
|
@ -1244,7 +1244,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
|
||||
|
||||
verb = unfollow_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:unfollow]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:unfollow]
|
||||
end
|
||||
|
||||
it 'appends activity:object element with target account' do
|
||||
|
|
@ -1338,8 +1338,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
time_after = Time.now
|
||||
|
||||
expect(authorize_follow_request_salmon.id.text).to(
|
||||
eq(TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest'))
|
||||
.or(eq(TagManager.instance.unique_tag(time_after.utc, follow_request.id, 'FollowRequest')))
|
||||
eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest'))
|
||||
.or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, follow_request.id, 'FollowRequest')))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -1359,7 +1359,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
|
||||
|
||||
object_type = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with authorize' do
|
||||
|
|
@ -1368,7 +1368,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
|
||||
|
||||
verb = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:authorize]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:authorize]
|
||||
end
|
||||
|
||||
it 'returns element whose rendered view creates follow from follow request when processed' do
|
||||
|
|
@ -1407,8 +1407,8 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
time_after = Time.now
|
||||
|
||||
expect(reject_follow_request_salmon.id.text).to(
|
||||
eq(TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest'))
|
||||
.or(TagManager.instance.unique_tag(time_after.utc, follow_request.id, 'FollowRequest'))
|
||||
eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest'))
|
||||
.or(OStatus::TagManager.instance.unique_tag(time_after.utc, follow_request.id, 'FollowRequest'))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
@ -1424,14 +1424,14 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
follow_request = Fabricate(:follow_request)
|
||||
reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
|
||||
object_type = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:activity]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with authorize' do
|
||||
follow_request = Fabricate(:follow_request)
|
||||
reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
|
||||
verb = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(verb.text).to eq TagManager::VERBS[:reject]
|
||||
expect(verb.text).to eq OStatus::TagManager::VERBS[:reject]
|
||||
end
|
||||
|
||||
it 'returns element whose rendered view deletes follow request when processed' do
|
||||
|
|
@ -1503,7 +1503,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
entry = OStatus::AtomSerializer.new.object(status)
|
||||
|
||||
object_type = entry.nodes.find { |node| node.name == 'activity:object-type' }
|
||||
expect(object_type.text).to eq TagManager::TYPES[:note]
|
||||
expect(object_type.text).to eq OStatus::TagManager::TYPES[:note]
|
||||
end
|
||||
|
||||
it 'appends activity:verb element with verb' do
|
||||
|
|
@ -1512,7 +1512,7 @@ RSpec.describe OStatus::AtomSerializer do
|
|||
entry = OStatus::AtomSerializer.new.object(status)
|
||||
|
||||
object_type = entry.nodes.find { |node| node.name == 'activity:verb' }
|
||||
expect(object_type.text).to eq TagManager::VERBS[:post]
|
||||
expect(object_type.text).to eq OStatus::TagManager::VERBS[:post]
|
||||
end
|
||||
|
||||
it 'appends link element for an alternative' do
|
||||
|
|
|
|||
70
spec/lib/ostatus/tag_manager_spec.rb
Normal file
70
spec/lib/ostatus/tag_manager_spec.rb
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
describe OStatus::TagManager do
|
||||
describe '#unique_tag' do
|
||||
it 'returns a unique tag' do
|
||||
expect(OStatus::TagManager.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status'
|
||||
end
|
||||
end
|
||||
|
||||
describe '#unique_tag_to_local_id' do
|
||||
it 'returns the ID part' do
|
||||
expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status', 'Status')).to eql '12'
|
||||
end
|
||||
|
||||
it 'returns nil if it is not local id' do
|
||||
expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:remote,2000-01-01:objectId=12:objectType=Status', 'Status')).to eq nil
|
||||
end
|
||||
|
||||
it 'returns nil if it is not expected type' do
|
||||
expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Block', 'Status')).to eq nil
|
||||
end
|
||||
|
||||
it 'returns nil if it does not have object ID' do
|
||||
expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectType=Status', 'Status')).to eq nil
|
||||
end
|
||||
end
|
||||
|
||||
describe '#local_id?' do
|
||||
it 'returns true for a local ID' do
|
||||
expect(OStatus::TagManager.instance.local_id?('tag:cb6e6126.ngrok.io;objectId=12:objectType=Status')).to be true
|
||||
end
|
||||
|
||||
it 'returns false for a foreign ID' do
|
||||
expect(OStatus::TagManager.instance.local_id?('tag:foreign.tld;objectId=12:objectType=Status')).to be false
|
||||
end
|
||||
end
|
||||
|
||||
describe '#uri_for' do
|
||||
subject { OStatus::TagManager.instance.uri_for(target) }
|
||||
|
||||
context 'comment object' do
|
||||
let(:target) { Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reply: true) }
|
||||
|
||||
it 'returns the unique tag for status' do
|
||||
expect(target.object_type).to eq :comment
|
||||
is_expected.to eq target.uri
|
||||
end
|
||||
end
|
||||
|
||||
context 'note object' do
|
||||
let(:target) { Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reply: false, thread: nil) }
|
||||
|
||||
it 'returns the unique tag for status' do
|
||||
expect(target.object_type).to eq :note
|
||||
is_expected.to eq target.uri
|
||||
end
|
||||
end
|
||||
|
||||
context 'person object' do
|
||||
let(:target) { Fabricate(:account, username: 'alice') }
|
||||
|
||||
it 'returns the URL for account' do
|
||||
expect(target.object_type).to eq :person
|
||||
is_expected.to eq 'https://cb6e6126.ngrok.io/users/alice'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue