cryx-g5k 0.2.3 → 0.2.4

data/VERSION.yml

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

data/lib/g5k/sinatra/helpers.rb

@@ -16,13 +16,16 @@ module G5K
         parser = options.delete(:parser)
         format = options.delete(:format) || params[:format] || "txt"
         body = {:code => (options[:code] || http_status), :message => options[:message], :title => options[:title]}
+        if defined?(::Sinatra::Application.logger)
+          ::Sinatra::Application.logger.error(body.inspect)
+        end
         content_type format.to_sym, :charset => 'utf-8'
         if (parser)
           body = parser.dump(body)
         else
           body = body.map{|(k,v)| [k,v].join("=")}.sort.join(";")
         end
-        error(http_status, body)
+        throw :halt, [http_status, body]
       end
 
       def compute_etag(*differentiators)

data/spec/sinatra_helpers_spec.rb

@@ -27,7 +27,7 @@ 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(:error).with(404, options.to_json)
+    req.should_receive(:throw).with(:halt, [404, options.to_json])
     req.formatted_error(404, options.merge({:parser => JSON, :format => 'json'}))
   end
   
@@ -35,7 +35,22 @@ describe G5K::Sinatra::Helpers 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.should_receive(:throw).with(:halt, [404, "code=500;message=message;title=title"])
+    req.formatted_error(404, options)    
+  end
+  
+  it "should log the error if a logger is defined in the Sinatra options" do
+    options = {:code => 500, :message => "message", :title => "title"}
+    module Sinatra
+      module Application
+      end
+    end
+    logger = mock('logger')
+    req = Request.new
+    req.stub!(:content_type)
+    req.stub!(:throw)
+    Sinatra::Application.should_receive(:logger).and_return(logger)
+    logger.should_receive(:error).with(options.inspect)
     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.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 -08:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: []