X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FDBIC%2FAPI.pm;h=0331ad9a66a772106cfe9062d022a3781470df1a;hp=2027696445135c8911e0b422956da8882abdd205;hb=d6993542dd4ef970bd0ab87258306ed970cb98c8;hpb=a784948c9995d0481e1168fec40c60cd0acc0864 diff --git a/lib/Catalyst/Controller/DBIC/API.pm b/lib/Catalyst/Controller/DBIC/API.pm index 2027696..0331ad9 100644 --- a/lib/Catalyst/Controller/DBIC/API.pm +++ b/lib/Catalyst/Controller/DBIC/API.pm @@ -15,9 +15,9 @@ use Try::Tiny; use Catalyst::Controller::DBIC::API::Request; use namespace::autoclean; -with 'Catalyst::Controller::DBIC::API::StoredResultSource'; -with 'Catalyst::Controller::DBIC::API::StaticArguments'; -with 'Catalyst::Controller::DBIC::API::RequestArguments' => { static => 1 }; +with 'Catalyst::Controller::DBIC::API::StoredResultSource', + 'Catalyst::Controller::DBIC::API::StaticArguments', + 'Catalyst::Controller::DBIC::API::RequestArguments' => { static => 1 }; __PACKAGE__->config(); @@ -29,24 +29,24 @@ __PACKAGE__->config(); __PACKAGE__->config ( action => { setup => { PathPart => 'artist', Chained => '/api/rpc/rpc_base' } }, # define parent chain action and partpath - class => 'MyAppDB::Artist', # DBIC schema class - create_requires => ['name', 'age'], # columns required to create - create_allows => ['nickname'], # additional non-required columns that create allows - update_allows => ['name', 'age', 'nickname'], # columns that update allows - update_allows => ['name', 'age', 'nickname'], # columns that update allows - select => [qw/name age/], # columns that data returns - prefetch => ['cds'], # relationships that are prefetched when no prefetch param is passed - prefetch_allows => [ # every possible prefetch param allowed + class => 'MyAppDB::Artist', + create_requires => ['name', 'age'], + create_allows => ['nickname'], + update_allows => ['name', 'age', 'nickname'], + update_allows => ['name', 'age', 'nickname'], + select => [qw/name age/], + prefetch => ['cds'], + prefetch_allows => [ 'cds', qw/ cds /, { cds => 'tracks' }, - { cds => [qw/ tracks /] } + { cds => [qw/ tracks /] }, ], - ordered_by => [qw/age/], # order of generated list - search_exposes => [qw/age nickname/, { cds => [qw/title year/] }], # columns that can be searched on via list - data_root => 'data' # defaults to "list" for backwards compatibility - use_json_boolean => 1, # use JSON::Any::true|false in the response instead of strings - return_object => 1, # makes create and update actions return the object + ordered_by => [qw/age/], + search_exposes => [qw/age nickname/, { cds => [qw/title year/] }], + data_root => 'data', + use_json_boolean => 1, + return_object => 1, ); # Provides the following functional endpoints: @@ -374,6 +374,7 @@ sub list =method_protected list_munge_parameters list_munge_parameters is a noop by default. All arguments will be passed through without any manipulation. In order to successfully manipulate the parameters before the search is performed, simply access $c->req->search_parameters|search_attributes (ArrayRef and HashRef respectively), which correspond directly to ->search($parameters, $attributes). Parameter keys will be in already-aliased form. +To store the munged parameters call $c->req->_set_search_parameters($newparams) and $c->req->_set_search_attributes($newattrs). =cut @@ -556,7 +557,7 @@ sub validate_objects { my $err = $_; $c->log->error($err); - $err =~ s/\s+at\s+\/.+\n$//g; + $err =~ s/\s+at\s+.+\n$//g; $self->push_error($c, { message => $err }); $c->detach(); } @@ -611,7 +612,7 @@ sub validate_object foreach my $related_col (@{$allowed_related_cols}) { - if (my $related_col_value = $related_params->{$related_col}) { + if (defined(my $related_col_value = $related_params->{$related_col})) { $values{$key}{$related_col} = $related_col_value; } } @@ -634,7 +635,7 @@ sub validate_object } # check for multiple values - if (ref($value) && !($value == JSON::Any::true || $value == JSON::Any::false)) + if (ref($value) && !(reftype($value) eq reftype(JSON::Any::true))) { require Data::Dumper; die "Multiple values for '${key}': ${\Data::Dumper::Dumper($value)}"; @@ -718,7 +719,7 @@ sub save_object =method_protected update_object_from_params -update_object_from_params iterates through the params to see if any of them are pertinent to relations. If so it calls L with the object, and the relation parameters. Then it calls ->upbdate on the object. +update_object_from_params iterates through the params to see if any of them are pertinent to relations. If so it calls L with the object, and the relation parameters. Then it calls ->update on the object. =cut @@ -729,13 +730,22 @@ sub update_object_from_params foreach my $key (keys %$params) { my $value = $params->{$key}; - if (ref($value) && !($value == JSON::Any::true || $value == JSON::Any::false)) + if (ref($value) && !(reftype($value) eq reftype(JSON::Any::true))) { $self->update_object_relation($c, $object, delete $params->{$key}, $key); } + # accessor = colname + elsif ($object->can($key)) { + $object->$key($value); + } + # accessor != colname + else { + my $accessor = $object->result_source->column_info($key)->{accessor}; + $object->$accessor($value); + } } - $object->update($params); + $object->update(); } =method_protected update_object_relation @@ -748,7 +758,29 @@ sub update_object_relation { my ($self, $c, $object, $related_params, $relation) = @_; my $row = $object->find_related($relation, {} , {}); - $row->update($related_params); + + if ($row) { + foreach my $key (keys %$related_params) { + my $value = $related_params->{$key}; + if (ref($value) && !(reftype($value) eq reftype(JSON::Any::true))) + { + $self->update_object_relation($c, $row, delete $related_params->{$key}, $key); + } + # accessor = colname + elsif ($row->can($key)) { + $row->$key($value); + } + # accessor != colname + else { + my $accessor = $row->result_source->column_info($key)->{accessor}; + $row->$accessor($value); + } + } + $row->update(); + } + else { + $object->create_related($relation, $related_params); + } } =method_protected insert_object_from_params @@ -760,8 +792,22 @@ insert_object_from_params sets the columns for the object, then calls ->insert sub insert_object_from_params { my ($self, $c, $object, $params) = @_; - $object->set_columns($params); + + my %rels; + while (my ($k, $v) = each %{ $params }) { + if (ref($v) && !(reftype($v) eq reftype(JSON::Any::true))) { + $rels{$k} = $v; + } + else { + $object->set_column($k => $v); + } + } + $object->insert; + + while (my ($k, $v) = each %rels) { + $object->create_related($k, $v); + } } =method_protected delete_objects @@ -843,9 +889,15 @@ sub each_object_inflate { my ($self, $c, $object) = @_; - return { $object->get_inflated_columns }; + return { $object->get_columns }; } +=method_protected serialize + +multiple actions forward to serialize which uses Catalyst::Action::Serialize. + +=cut + # from Catalyst::Action::Serialize sub serialize :ActionClass('Serialize') { } @@ -1011,7 +1063,7 @@ Arguments to pass to L when performing search for L =head3 page -Arguments to pass to L when performing search for L. +Arguments to pass to L when performing search for L. =head1 EXTENDING