[mb-commits] branch, mbs-5712, created. MBS-5712, always include alias locale and primary flag.
MusicBrainz Git Server <[email protected]> Tue, 15 Jan 2013 09:31:46 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Tv2ry-0001ti-Um@wiley> |
The branch, mbs-5712 has been created
at e1c5960a5d52ff3fb7e42ebd96eab14d4fc58241 (commit)
- Log -----------------------------------------------------------------
commit e1c5960a5d52ff3fb7e42ebd96eab14d4fc58241
Author: warp <[email protected]>
Date: Mon Jan 14 12:14:06 2013 +0100
MBS-5712, always include alias locale and primary flag.
diff --git a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
index 9d723a4..6701891 100644
--- a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
+++ b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
@@ -16,16 +16,13 @@ around serialize => sub {
{
my $item = { name => $alias->name, "sort-name" => $alias->sort_name };
- if ($alias->locale)
- {
- $item->{locale} = $alias->locale;
- $item->{primary} = boolean ($alias->primary_for_locale);
- }
+ $item->{locale} = $alias->locale // JSON::null;
+ $item->{primary} = $alias->locale ? boolean ($alias->primary_for_locale) : JSON::null
push @aliases, $item;
}
- $ret->{aliases} = \@aliases if scalar @aliases;
+ $ret->{aliases} = \@aliases;
return $ret;
};
diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseArtists.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseArtists.pm
index e16c7f0..d9fa8fe 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseArtists.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseArtists.pm
@@ -59,12 +59,12 @@ test 'browse artists via recording' => sub {
},
type => "Group",
aliases => [
- { "sort-name" => "m-flow", name => "m-flow" },
- { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew" },
- { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew" },
- { "sort-name" => "mflo", name => "mflo" },
- { "sort-name" => "えむふろう", name => "えむふろう" },
- { "sort-name" => "エムフロウ", name => "エムフロウ" },
+ { "sort-name" => "m-flow", name => "m-flow", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "mflo", name => "mflo", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "えむふろう", name => "えむふろう", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "エムフロウ", name => "エムフロウ", locale => JSON::null, primary => JSON::null },
],
ipis => [],
},
@@ -81,11 +81,11 @@ test 'browse artists via recording' => sub {
},
type => "Person",
aliases => [
- { name => "Beat of Angel", "sort-name" => "Beat of Angel" },
- { name => "BoA Kwon", "sort-name" => "BoA Kwon" },
- { name => "Kwon BoA", "sort-name" => "Kwon BoA" },
- { name => "ボア", "sort-name" => "ボア" },
- { name => "보아", "sort-name" => "보아" },
+ { name => "Beat of Angel", "sort-name" => "Beat of Angel", locale => JSON::null, primary => JSON::null },
+ { name => "BoA Kwon", "sort-name" => "BoA Kwon", locale => JSON::null, primary => JSON::null },
+ { name => "Kwon BoA", "sort-name" => "Kwon BoA", locale => JSON::null, primary => JSON::null },
+ { name => "ボア", "sort-name" => "ボア", locale => JSON::null, primary => JSON::null },
+ { name => "보아", "sort-name" => "보아", locale => JSON::null, primary => JSON::null },
],
ipis => [],
}]
diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
index b61747e..4180b8e 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
@@ -98,11 +98,11 @@ test 'basic artist lookup, inc=aliases' => sub {
},
type => "Person",
aliases => [
- { name => "Beat of Angel", "sort-name" => "Beat of Angel" },
- { name => "BoA Kwon", "sort-name" => "BoA Kwon" },
- { name => "Kwon BoA", "sort-name" => "Kwon BoA" },
- { name => "ボア", "sort-name" => "ボア" },
- { name => "보아", "sort-name" => "보아" },
+ { name => "Beat of Angel", "sort-name" => "Beat of Angel", locale => JSON::null, primary => JSON::null },
+ { name => "BoA Kwon", "sort-name" => "BoA Kwon", locale => JSON::null, primary => JSON::null },
+ { name => "Kwon BoA", "sort-name" => "Kwon BoA", locale => JSON::null, primary => JSON::null },
+ { name => "ボア", "sort-name" => "ボア", locale => JSON::null, primary => JSON::null },
+ { name => "보아", "sort-name" => "보아", locale => JSON::null, primary => JSON::null },
],
ipis => [],
});
diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupLabel.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupLabel.pm
index 6283cd9..e032529 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupLabel.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupLabel.pm
@@ -79,7 +79,9 @@ test 'label lookup, inc=aliases' => sub {
end => JSON::null,
ended => JSON::false,
},
- aliases => [ { name => "Planet µ", "sort-name" => "Planet µ" } ],
+ aliases => [
+ { name => "Planet µ", "sort-name" => "Planet µ", locale => JSON::null, primary => JSON::null }
+ ],
ipis => [],
});
diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm
index 029b44a..38e4d63 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm
@@ -152,12 +152,12 @@ test 'release lookup with artists + aliases' => sub {
"sort-name" => "m-flo",
disambiguation => "",
aliases => [
- { "sort-name" => "m-flow", name => "m-flow" },
- { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew" },
- { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew" },
- { "sort-name" => "mflo", name => "mflo" },
- { "sort-name" => "えむふろう", name => "えむふろう" },
- { "sort-name" => "エムフロウ", name => "エムフロウ" },
+ { "sort-name" => "m-flow", name => "m-flow", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "mflo", name => "mflo", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "えむふろう", name => "えむふろう", locale => JSON::null, primary => JSON::null },
+ { "sort-name" => "エムフロウ", name => "エムフロウ", locale => JSON::null, primary => JSON::null },
],
ipis => [],
}
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server
_______________________________________________
MusicBrainz-commits mailing list
[email protected]
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits