X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/82377214c736d6a579dd56a24cfab6f1864ac1fa..59de2e860c5aa1ca949b8587564f3a29318ed930:/services/api/app/controllers/arvados/v1/schema_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 16d83a0a34..80b2cb6694 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -1,6 +1,6 @@
 class Arvados::V1::SchemaController < ApplicationController
   skip_before_filter :find_object_by_uuid
-  skip_before_filter :login_required
+  skip_before_filter :require_auth_scope_all
 
   def show
     classes = Rails.cache.fetch 'arvados_v1_schema' do
@@ -31,7 +31,8 @@ class Arvados::V1::SchemaController < ApplicationController
         id: "arvados:v1",
         name: "arvados",
         version: "v1",
-        revision: "20130226",
+        revision: "20131114",
+        generatedAt: Time.now.iso8601,
         title: "Arvados API",
         description: "The API to interact with Arvados.",
         documentationLink: "https://redmine.clinicalfuture.com/projects/arvados/",
@@ -87,8 +88,6 @@ class Arvados::V1::SchemaController < ApplicationController
       }
       
       ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|
-        next if k == ApiClientAuthorization
-        next if k == ApiClient
         begin
           ctl_class = "Arvados::V1::#{k.to_s.pluralize}Controller".constantize
         rescue
@@ -208,6 +207,16 @@ class Arvados::V1::SchemaController < ApplicationController
                   type: "string",
                   description: "Query string for searching #{k.to_s.underscore.pluralize}.",
                   location: "query"
+                },
+                where: {
+                  type: "object",
+                  description: "Conditions for filtering #{k.to_s.underscore.pluralize}.",
+                  location: "query"
+                },
+                order: {
+                  type: "string",
+                  description: "Order in which to return matching #{k.to_s.underscore.pluralize}.",
+                  location: "query"
                 }
               },
               response: {
@@ -226,11 +235,19 @@ class Arvados::V1::SchemaController < ApplicationController
               parameters: {
                 k.to_s.underscore => {
                   type: "object",
-                  required: true,
+                  required: false,
                   location: "query",
                   properties: object_properties
                 }
               },
+              request: {
+                required: false,
+                properties: {
+                  k.to_s => {
+                    "$ref" => k.to_s
+                  }
+                }
+              },
               response: {
                 "$ref" => k.to_s
               },
@@ -252,11 +269,19 @@ class Arvados::V1::SchemaController < ApplicationController
                 },
                 k.to_s.underscore => {
                   type: "object",
-                  required: true,
+                  required: false,
                   location: "query",
                   properties: object_properties
                 }
               },
+              request: {
+                required: false,
+                properties: {
+                  k.to_s => {
+                    "$ref" => k.to_s
+                  }
+                }
+              },
               response: {
                 "$ref" => k.to_s
               },
@@ -291,13 +316,16 @@ class Arvados::V1::SchemaController < ApplicationController
         d_methods = discovery[:resources][k.to_s.underscore.pluralize][:methods]
         Rails.application.routes.routes.each do |route|
           action = route.defaults[:action]
-          httpMethod = (route.verb && route.verb.length > 0) ? route.verb : 'GET'
-          if route.defaults[:controller] == 'arvados/v1/' + k.to_s.underscore.pluralize and
+          httpMethod = ['GET', 'POST', 'PUT', 'DELETE'].map { |method|
+            method if route.verb.match(method)
+          }.compact.first
+          if httpMethod and
+              route.defaults[:controller] == 'arvados/v1/' + k.to_s.underscore.pluralize and
               !d_methods[action.to_sym] and
               ctl_class.action_methods.include? action
             method = {
               id: "arvados.#{k.to_s.underscore.pluralize}.#{action}",
-              path: route.path.sub('/arvados/v1/','').sub('(.:format)','').sub(/:(uu?)id/,'{uuid}'),
+              path: route.path.spec.to_s.sub('/arvados/v1/','').sub('(.:format)','').sub(/:(uu)?id/,'{uuid}'),
               httpMethod: httpMethod,
               description: "#{route.defaults[:action]} #{k.to_s.underscore.pluralize}",
               parameters: {},