cryx-g5k 0.2.2 → 0.2.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 2
+:patch: 3
 :major: 0

data/lib/g5k/sinatra/helpers.rb

@@ -13,13 +13,14 @@ module G5K
       end
 
       def formatted_error(http_status, options = {})
+        parser = options.delete(:parser)
+        format = options.delete(:format) || params[:format] || "txt"
         body = {:code => (options[:code] || http_status), :message => options[:message], :title => options[:title]}
-        format = options[:format] || params[:format] || "txt"
         content_type format.to_sym, :charset => 'utf-8'
-        if (parser = Parser.select(format.to_sym))
+        if (parser)
           body = parser.dump(body)
         else
-          body.map!{|(k,v)| [k,v].join("=")}.join(";")
+          body = body.map{|(k,v)| [k,v].join("=")}.sort.join(";")
         end
         error(http_status, body)
       end

data/spec/sinatra_helpers_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../lib/g5k/sinatra/helpers'
+
+describe G5K::Sinatra::Helpers do
+  class Request
+    include G5K::Sinatra::Helpers
+    def initialize(options = {})
+      @format = options[:format]
+    end
+    def params; {:format => @format}; end
+  end
+  
+  it "should throw a 406 error if it does not provide the requested format" do
+    req = Request.new(:format => 'json')
+    req.should_receive(:throw).with(:halt, [406, "The accepted types are: xml, js"])
+    req.provides(:xml, :js)
+  end
+  
+  it "should not throw a 406 error if it can provide the requested format" do
+    req = Request.new(:format => 'json')
+    req.should_not_receive(:throw)
+    req.provides(:xml, :json)
+  end
+  
+  it "should format the error with the given parser" do
+    require 'json'
+    options = {:code => 500, :message => "message", :title => "title"}
+    req = Request.new
+    req.should_receive(:content_type).with(:json, :charset => 'utf-8')
+    req.should_receive(:error).with(404, options.to_json)
+    req.formatted_error(404, options.merge({:parser => JSON, :format => 'json'}))
+  end
+  
+  it "should format the error even when no parser is given" do
+    options = {:code => 500, :message => "message", :title => "title"}
+    req = Request.new
+    req.should_receive(:content_type).with(:txt, :charset => 'utf-8')
+    req.should_receive(:error).with(404, "code=500;message=message;title=title")
+    req.formatted_error(404, options)    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cryx-g5k
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -32,11 +32,13 @@ files:
 - lib/g5k/rack/accept_format.rb
 - lib/g5k/rack/jsonp.rb
 - lib/g5k/schema
+- lib/g5k/schema/schema.rb
 - lib/g5k/sinatra
 - lib/g5k/sinatra/helpers.rb
 - lib/g5k.rb
 - spec/g5k_spec.rb
 - spec/parsing_spec.rb
+- spec/sinatra_helpers_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/cryx/g5k