cryx-g5k 0.2.5 → 0.2.6

data/VERSION.yml

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

data/lib/g5k/rack/accept_format.rb

@@ -33,7 +33,7 @@ module Rack
   
     def call(env)
       req = Rack::Request.new(env)
-      unless req.path_info =~ /(.*)\.(.+)/
+      if ::File.extname(req.path_info).empty?
         accept = env['HTTP_ACCEPT'].scan(/[^;,\s]*\/[^;,\s]*/)[0] rescue ""
         extension =  Rack::Mime::MIME_TYPES.invert[accept] || DEFAULT_EXTENSION
         req.path_info = req.path_info+"#{extension}"

data/spec/sinatra_helpers_spec.rb

@@ -27,16 +27,14 @@ describe G5K::Sinatra::Helpers do
     options = {:code => 500, :message => "message", :title => "title"}
     req = Request.new
     req.should_receive(:content_type).with(:json, :charset => 'utf-8')
-    req.should_receive(:throw).with(:halt, [404, options.to_json])
-    req.formatted_error(404, options.merge({:parser => JSON, :format => 'json'}))
+    req.formatted_error(404, options.merge({:parser => JSON, :format => 'json'})).should == [404, options.to_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(:throw).with(:halt, [404, "code=500;message=message;title=title"])
-    req.formatted_error(404, options)    
+    req.formatted_error(404, options).should == [404, "code=500;message=message;title=title"]
   end
   
   it "should log the error if a logger is defined in the Sinatra options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cryx-g5k
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-13 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: []