Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@deltacloud.apache.org
Received-SPF: pass (athena.apache.org: domain of lutter@redhat.com designates
 209.132.183.28 as permitted sender)
Message-ID: <1331673072.2764.92.camel@avon.watzmann.net>
Subject: Re: [PATCH] CIMI - slight hack to prefer content_type of xml when
 CIMI frontend is being used (and client specifies this as accepted type)
From: David Lutterkort <lutter@redhat.com>
To: dev@deltacloud.apache.org
Date: Tue, 13 Mar 2012 14:11:12 -0700
In-Reply-To: <1331655434-19954-1-git-send-email-marios@redhat.com>
References: <1331655434-19954-1-git-send-email-marios@redhat.com>
Organization: Red Hat Inc
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0

On Tue, 2012-03-13 at 18:17 +0200, marios@redhat.com wrote:
> From: marios <marios@redhat.com>
> 
> HTML views for CIMI are being phased out...
> 
> Signed-off-by: marios <marios@redhat.com>
> ---
>  server/lib/sinatra/rack_accept.rb |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/server/lib/sinatra/rack_accept.rb b/server/lib/sinatra/rack_accept.rb
> index b576307..0f179ea 100644
> --- a/server/lib/sinatra/rack_accept.rb
> +++ b/server/lib/sinatra/rack_accept.rb
> @@ -77,9 +77,13 @@ module Rack
>              self[type] = handler
>            end
>            yield wants
> -          @media_type = accepting_formats.to_a.sort { |a,b| a[1]<=>b[1] }.reverse.select do |format, priority|
> -            wants.keys.include?(format) == true
> -          end.first
> +          if ENV['API_FRONTEND'] == "cimi"
> +            @media_type = (accepting_formats.has_key?(:xml) ? [:xml, accepting_formats[:xml]] : nil)
> +          else
> +            @media_type ||= accepting_formats.to_a.sort { |a,b| a[1]<=>b[1] }.reverse.select do |format, priority|
> +              wants.keys.include?(format) == true
> +            end.first
> +          end

Doesn't this break content negotiation ? We can only ignore other
formats if q=1 for application/xml (implicitly or explicitly) In
particular, wouldn't the above break with an Accept header of
'application/json, application/xml;q=0.9' ?

Also, it would be cleaner if the format preference was encoded in each
server.rb (e.g., as an array constant) AFAIK, self at this point is the
Sinatra app.

David