Author: acid2
Date: 2009-06-28 15:10:10 +0000 (Sun, 28 Jun 2009)
New Revision: 11785
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroup.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Create.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm
mb_server/trunk/t/data_artist.t
mb_server/trunk/t/data_label.t
mb_server/trunk/t/data_releasegroup.t
mb_server/trunk/t/edit_artist_create.t
mb_server/trunk/t/edit_label_create.t
mb_server/trunk/t/edit_label_edit.t
Log:
Use '_id' naming convention in edits.
This is consistent with the naming in entities, and also allows entering
edits in controllers to be much more automatic (HTML::FormHandler can
create the hash required automatically, instead of typing it out by
hand)
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -129,9 +129,9 @@
enddate_year => $artist->{end_date}->{year},
enddate_month => $artist->{end_date}->{month},
enddate_day => $artist->{end_date}->{day},
- country => $artist->{country},
- type => $artist->{type},
- gender => $artist->{gender},
+ country => $artist->{country_id},
+ type => $artist->{type_id},
+ gender => $artist->{gender_id},
comment => $artist->{comment},
);
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -125,8 +125,8 @@
enddate_month => $label->{end_date}->{month},
enddate_day => $label->{end_date}->{day},
comment => $label->{comment},
- country => $label->{country},
- type => $label->{type},
+ country => $label->{country_id},
+ type => $label->{type_id},
labelcode => $label->{label_code},
);
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroup.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroup.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroup.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -120,7 +120,7 @@
my %row = (
artist_credit => $group->{artist_credit},
comment => $group->{comment},
- type => $group->{type},
+ type => $group->{type_id},
);
if ($group->{name})
Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Create.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Create.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Create.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -39,9 +39,9 @@
name => Str,
gid => Optional[Str],
sort_name => Optional[Str],
- type => Optional[Int],
- gender => Optional[Int],
- country => Optional[Int],
+ type_id => Optional[Int],
+ gender_id => Optional[Int],
+ country_id => Optional[Int],
comment => Optional[Str],
begin_date => Optional[Dict[
year => Int,
Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -34,9 +34,9 @@
=> as Dict[
name => Optional[Str],
sort_name => Optional[Str],
- type => Optional[Maybe[Int]],
- gender => Optional[Maybe[Int]],
- country => Optional[Maybe[Int]],
+ type_id => Optional[Maybe[Int]],
+ gender_id => Optional[Maybe[Int]],
+ country_id => Optional[Maybe[Int]],
comment => Optional[Maybe[Str]],
begin_date => Optional[Dict[
year => Int,
@@ -70,9 +70,6 @@
sub _mapping
{
return (
- type => 'type_id',
- gender => 'gender_id',
- country => 'country_id',
begin_date => _date_closure('begin_date'),
end_date => _date_closure('end_date'),
);
Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -19,7 +19,7 @@
isa => Dict[
name => Str,
sort_name => Optional[Str],
- type => Optional[Int],
+ type_id => Optional[Int],
label_code => Optional[Int],
begin_date => Optional[Dict[
year => Int,
@@ -31,7 +31,7 @@
month => Optional[Int],
day => Optional[Int]
]],
- country => Optional[Int],
+ country_id => Optional[Int],
comment => Optional[Str],
]
);
Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -34,9 +34,9 @@
=> as Dict[
name => Optional[Str],
sort_name => Optional[Str],
- type => Optional[Maybe[Int]],
+ type_id => Optional[Maybe[Int]],
label_code => Optional[Maybe[Int]],
- country => Optional[Maybe[Int]],
+ country_id => Optional[Maybe[Int]],
comment => Optional[Maybe[Str]],
begin_date => Optional[Dict[
year => Int,
@@ -70,9 +70,6 @@
sub _mapping
{
return (
- type => 'type_id',
- gender => 'gender_id',
- country => 'country_id',
begin_date => _date_closure('begin_date'),
end_date => _date_closure('end_date'),
);
Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm 2009-06-28 15:10:10 UTC (rev 11785)
@@ -37,7 +37,7 @@
subtype 'ReleaseGroupHash'
=> as Dict[
name => Optional[Str],
- type => Optional[Maybe[Int]],
+ type_id => Optional[Maybe[Int]],
artist_credit => ArrayRef,
comment => Optional[Maybe[Str]],
];
@@ -53,8 +53,6 @@
sub _mapping
{
return (
- type => 'type_id',
- comment => 'comment',
artist_credit => sub { artist_credit_to_ref(shift->artist_credit) }
);
}
Modified: mb_server/trunk/t/data_artist.t
===================================================================
--- mb_server/trunk/t/data_artist.t 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/t/data_artist.t 2009-06-28 15:10:10 UTC (rev 11785)
@@ -77,7 +77,7 @@
$artist = $artist_data->insert({
name => 'Queen',
sort_name => 'David Bowie',
- type => 2,
+ type_id => 2,
begin_date => { year => 2000, month => 1 },
});
isa_ok($artist, 'MusicBrainz::Server::Entity::Artist');
Modified: mb_server/trunk/t/data_label.t
===================================================================
--- mb_server/trunk/t/data_label.t 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/t/data_label.t 2009-06-28 15:10:10 UTC (rev 11785)
@@ -54,8 +54,8 @@
$label = $label_data->insert({
name => 'RAM Records',
sort_name => 'RAM Records',
- type => 1,
- country => 1,
+ type_id => 1,
+ country_id => 1,
end_date => { year => 2000, month => 05 }
});
isa_ok($label, 'MusicBrainz::Server::Entity::Label');
Modified: mb_server/trunk/t/data_releasegroup.t
===================================================================
--- mb_server/trunk/t/data_releasegroup.t 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/t/data_releasegroup.t 2009-06-28 15:10:10 UTC (rev 11785)
@@ -62,7 +62,7 @@
$rg = $rg_data->insert({
name => 'My Demons',
artist_credit => 2,
- type => 1,
+ type_id => 1,
comment => 'Dubstep album',
});
ok(defined $rg);
Modified: mb_server/trunk/t/edit_artist_create.t
===================================================================
--- mb_server/trunk/t/edit_artist_create.t 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/t/edit_artist_create.t 2009-06-28 15:10:10 UTC (rev 11785)
@@ -28,7 +28,7 @@
my $edit = $edit_data->create(
edit_type => $EDIT_ARTIST_CREATE,
name => 'Junior Boys',
- gender => 1,
+ gender_id => 1,
comment => 'Canadian electronica duo',
editor_id => 1
);
@@ -42,7 +42,7 @@
ok(defined $edit->id);
is_deeply($edit->to_hash, {
name => 'Junior Boys',
- gender => 1,
+ gender_id => 1,
comment => 'Canadian electronica duo',
artist_id => $edit->artist_id,
});
Modified: mb_server/trunk/t/edit_label_create.t
===================================================================
--- mb_server/trunk/t/edit_label_create.t 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/t/edit_label_create.t 2009-06-28 15:10:10 UTC (rev 11785)
@@ -30,7 +30,7 @@
edit_type => $EDIT_LABEL_CREATE,
name => '!K7',
sort_name => '!K7 Recordings',
- type => 1,
+ type_id => 1,
comment => 'Funky record label',
label_code => 7306,
editor_id => 1
Modified: mb_server/trunk/t/edit_label_edit.t
===================================================================
--- mb_server/trunk/t/edit_label_edit.t 2009-06-27 18:18:07 UTC (rev 11784)
+++ mb_server/trunk/t/edit_label_edit.t 2009-06-28 15:10:10 UTC (rev 11785)
@@ -30,7 +30,7 @@
label => $label,
name => 'Warped Records',
comment => 'Weird electronica record label',
- country => 1,
+ country_id => 1,
);
isa_ok($edit, 'MusicBrainz::Server::Edit::Label::Edit');
is($edit->entity_model, 'Label');
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
