2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809

[arvados.git] / sdk / perl / lib / Arvados / ResourceMethod.pm

diff --git a/sdk/perl/lib/Arvados/ResourceMethod.pm b/sdk/perl/lib/Arvados/ResourceMethod.pm
index eecc041c65f5fbbf69cb0c8f5eabdc8fe4959b2e..649d779c6755256ed4624315ab7e61897fd92b1b 100644 (file)
--- a/sdk/perl/lib/Arvados/ResourceMethod.pm
+++ b/sdk/perl/lib/Arvados/ResourceMethod.pm
@@ -27,7 +27,18 @@ sub execute
 
     my %body_params;
     my %given_params = @_;
-    while (my ($param_name, $param) = each %{$method->{'parameters'}}) {
+    my %extra_params = %given_params;
+    my %method_params = %{$method->{'parameters'}};
+    if ($method->{'request'}->{'properties'}) {
+        while (my ($prop_name, $prop_value) =
+               each %{$method->{'request'}->{'properties'}}) {
+            if (ref($prop_value) eq 'HASH' && $prop_value->{'$ref'}) {
+                $method_params{$prop_name} = { 'type' => 'object' };
+            }
+        }
+    }
+    while (my ($param_name, $param) = each %method_params) {
+        delete $extra_params{$param_name};
         if ($param->{'required'} && !exists $given_params{$param_name}) {
             croak("Required parameter not supplied: $param_name");
         }
@@ -48,7 +59,7 @@ sub execute
                     if (!exists $given_params{$param_name}->{$property_name}) {
                         ;
                     }
-                    elsif ($given_params{$param_name}->{$property_name} eq undef) {
+                    elsif (!defined $given_params{$param_name}->{$property_name}) {
                         $param_value{$property_name} = JSON::null;
                     }
                     elsif ($property->{'type'} eq 'boolean') {
@@ -65,6 +76,12 @@ sub execute
                     if (ref $property eq '' || $property eq undef) {
                         $param_value{$property_name} = $property;
                     }
+                    elsif (ref $property eq 'HASH') {
+                        $param_value{$property_name} = {};
+                        while (my ($k, $v) = each %$property) {
+                            $param_value{$property_name}->{$k} = $v;
+                        }
+                    }
                 }
             }
             $body_params{$param_name} = \%param_value;
@@ -74,8 +91,13 @@ sub execute
             $body_params{$param_name} = $given_params{$param_name};
         }
     }
+    if (%extra_params) {
+        croak("Unsupported parameter(s) passed to API call /$path: \"" . join('", "', keys %extra_params) . '"');
+    }
     my $r = $self->{'resourceAccessor'}->{'api'}->new_request;
-    $r->set_uri($self->{'resourceAccessor'}->{'api'}->{'discoveryDocument'}->{'baseUrl'} . "/" . $path);
+    my $base_uri = $self->{'resourceAccessor'}->{'api'}->{'discoveryDocument'}->{'baseUrl'};
+    $base_uri =~ s:/$::;
+    $r->set_uri($base_uri . "/" . $path);
     $r->set_method($method->{'httpMethod'});
     $r->set_auth_token($self->{'resourceAccessor'}->{'api'}->{'authToken'});
     $r->set_query_params(\%body_params) if %body_params;
@@ -83,7 +105,7 @@ sub execute
     my $data, $headers;
     my ($status_number, $status_phrase) = $r->get_status();
     if ($status_number != 200) {
-        croak("API call failed: $status_number $status_phrase\n". $r->get_body());
+        croak("API call /$path failed: $status_number $status_phrase\n". $r->get_body());
     }
     $data = $r->get_body();
     $headers = $r->get_headers();