[mb-commits] branch, mbs-5712, updated. MBS-5713, include alias type in json webservice.
MusicBrainz Git Server <[email protected]> Tue, 15 Jan 2013 10:40:39 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Tv3wd-0002nl-9t@wiley> |
The branch, mbs-5712 has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b94821bdd51e0bde157742458c795ce5831b58d6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=260c15adaf152178d2c40e22e4dc448c4ae0805d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6b566b1aeda2a0f745185dbe06385e108b01b0cb (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e1c5960a5d52ff3fb7e42ebd96eab14d4fc58241 (commit)
Summary of changes:
.../WebService/Serializer/JSON/2/Role/Aliases.pm | 3 +-
.../Server/Controller/WS/2/JSON/BrowseArtists.pm | 22 ++++++++++----------
.../Server/Controller/WS/2/JSON/LookupArtist.pm | 10 ++++----
.../Server/Controller/WS/2/JSON/LookupLabel.pm | 2 +-
.../Server/Controller/WS/2/JSON/LookupRelease.pm | 12 +++++-----
5 files changed, 25 insertions(+), 24 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b94821bdd51e0bde157742458c795ce5831b58d6
Author: warp <[email protected]>
Date: Tue Jan 15 11:40:06 2013 +0100
MBS-5713, include alias type in json webservice.
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 d9fa8fe..0e8cf55 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", 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 },
+ { "sort-name" => "m-flow", name => "m-flow", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "mflo", name => "mflo", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "えむふろう", name => "えむふろう", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "エムフロウ", name => "エムフロウ", locale => JSON::null, primary => JSON::null, type => 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", 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 },
+ { name => "Beat of Angel", "sort-name" => "Beat of Angel", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "BoA Kwon", "sort-name" => "BoA Kwon", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "Kwon BoA", "sort-name" => "Kwon BoA", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "ボア", "sort-name" => "ボア", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "보아", "sort-name" => "보아", locale => JSON::null, primary => JSON::null, type => 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 4180b8e..81db5fa 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", 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 },
+ { name => "Beat of Angel", "sort-name" => "Beat of Angel", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "BoA Kwon", "sort-name" => "BoA Kwon", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "Kwon BoA", "sort-name" => "Kwon BoA", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "ボア", "sort-name" => "ボア", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { name => "보아", "sort-name" => "보아", locale => JSON::null, primary => JSON::null, type => 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 e032529..e46b138 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
@@ -80,7 +80,7 @@ test 'label lookup, inc=aliases' => sub {
ended => JSON::false,
},
aliases => [
- { name => "Planet µ", "sort-name" => "Planet µ", locale => JSON::null, primary => JSON::null }
+ { name => "Planet µ", "sort-name" => "Planet µ", locale => JSON::null, primary => JSON::null, type => 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 38e4d63..5b68f2b 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", 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 },
+ { "sort-name" => "m-flow", name => "m-flow", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "mflo", name => "mflo", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "えむふろう", name => "えむふろう", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "エムフロウ", name => "エムフロウ", locale => JSON::null, primary => JSON::null, type => JSON::null },
],
ipis => [],
}
commit 260c15adaf152178d2c40e22e4dc448c4ae0805d
Author: warp <[email protected]>
Date: Tue Jan 15 11:03:14 2013 +0100
MBS-5713, include alias type in JSON webservice.
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 1998149..483db7e 100644
--- a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
+++ b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
@@ -18,6 +18,7 @@ around serialize => sub {
$item->{locale} = $alias->locale // JSON::null;
$item->{primary} = $alias->locale ? boolean ($alias->primary_for_locale) : JSON::null;
+ $item->{type} = $alias->type ? $alias->type_name : JSON::null;
push @aliases, $item;
}
commit 6b566b1aeda2a0f745185dbe06385e108b01b0cb
Author: warp <[email protected]>
Date: Tue Jan 15 11:02:29 2013 +0100
MBS-5712, semi-colon missing from previous commit.
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 6701891..1998149 100644
--- a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
+++ b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/Aliases.pm
@@ -17,7 +17,7 @@ around serialize => sub {
my $item = { name => $alias->name, "sort-name" => $alias->sort_name };
$item->{locale} = $alias->locale // JSON::null;
- $item->{primary} = $alias->locale ? boolean ($alias->primary_for_locale) : JSON::null
+ $item->{primary} = $alias->locale ? boolean ($alias->primary_for_locale) : JSON::null;
push @aliases, $item;
}
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server
_______________________________________________
MusicBrainz-commits mailing list
[email protected]
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits