strelka 0.0.1.pre.199 → 0.0.1.pre.200

data/lib/strelka/app/errors.rb

@@ -148,6 +148,7 @@ module Strelka::App::Errors
 		# If the app or any plugins threw a finish, look for a handler for the status code
 		# and call it if one is found.
 		if status_response
+			request.notes[:status_info] = status_response
 			response = request.response
 			status = status_response[:status]
 			self.log.info "[:errors] Handling a status response: %d" % [ status ]

data/lib/strelka/app.rb

@@ -331,6 +331,7 @@ class Strelka::App < Mongrel2::Handler
 		status_code, message = status_info.values_at( :status, :message )
 		self.log.info "Non-OK response: %d (%s)" % [ status_code, message ]
 
+		request.notes[:status_info] = status_info
 		response = request.response
 		response.reset
 		response.status = status_code

data/spec/strelka/app/errors_spec.rb

@@ -50,7 +50,7 @@ describe Strelka::App::Errors do
 			end
 		end
 
-		it "has its auth config inherited by subclasses" do
+		it "has its status handlers inherited by subclasses" do
 			@app.on_status HTTP::OK do
 				'blap'
 			end
@@ -157,6 +157,25 @@ describe Strelka::App::Errors do
 			res.body.should == 'Error:  JAMBA'
 		end
 
+		it "sets the error status info in the transaction notes when the response is handled by a status-handler" do
+			@app.class_eval do
+				on_status do |res, info|
+					res.body = '(%d) Filthy banana' % [ info[:status] ]
+					return res
+				end
+
+				get do |req|
+					finish_with HTTP::BAD_REQUEST, "Your sandwich is missing something."
+				end
+			end
+
+			req = @request_factory.get( '/foom' )
+			res = @app.new.handle( req )
+
+			res.notes[:status_info].should include( :status, :message, :headers )
+			res.notes[:status_info][:status].should == HTTP::BAD_REQUEST
+			res.notes[:status_info][:message].should == "Your sandwich is missing something."
+		end
 
 		context "template-style handlers" do
 

data/spec/strelka/app_spec.rb

@@ -236,6 +236,25 @@ describe Strelka::App do
 		res.body.should == "You aren't allowed to look at that.\n"
 	end
 
+	it "sets the error status info in the transaction notes for error responses" do
+		forbidden_plugin = Module.new do
+			def self::name; "Strelka::App::Forbidden"; end
+			extend Strelka::Plugin
+			def handle_request( r )
+				finish_with( HTTP::FORBIDDEN, "You aren't allowed to look at that." )
+				fail "Shouldn't be reached."
+			end
+		end
+		@app.plugin( forbidden_plugin )
+
+		res = @app.new.handle( @req )
+
+		res.notes.should include( :status_info )
+		res.notes[:status_info].should include( :status, :message, :headers )
+		res.notes[:status_info][:status].should == HTTP::FORBIDDEN
+		res.notes[:status_info][:message].should == "You aren't allowed to look at that."
+	end
+
 
 	it "provides a declarative for setting the default content type of responses" do
 		@app.class_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.199
+  version: 0.0.1.pre.200
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70346770348920 !ruby/object:Gem::Requirement
+  requirement: &70139550821000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770348920
+  version_requirements: *70139550821000
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70346770348380 !ruby/object:Gem::Requirement
+  requirement: &70139550820480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770348380
+  version_requirements: *70139550820480
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70346770347880 !ruby/object:Gem::Requirement
+  requirement: &70139550819940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770347880
+  version_requirements: *70139550819940
 - !ruby/object:Gem::Dependency
   name: formvalidator
-  requirement: &70346770347340 !ruby/object:Gem::Requirement
+  requirement: &70139550819420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770347340
+  version_requirements: *70139550819420
 - !ruby/object:Gem::Dependency
   name: inversion
-  requirement: &70346770346760 !ruby/object:Gem::Requirement
+  requirement: &70139550818880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770346760
+  version_requirements: *70139550818880
 - !ruby/object:Gem::Dependency
   name: mongrel2
-  requirement: &70346770346280 !ruby/object:Gem::Requirement
+  requirement: &70139550818380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '0.20'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770346280
+  version_requirements: *70139550818380
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70346770345820 !ruby/object:Gem::Requirement
+  requirement: &70139550817900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70346770345820
+  version_requirements: *70139550817900
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70346899262780 !ruby/object:Gem::Requirement
+  requirement: &70139550877520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346899262780
+  version_requirements: *70139550877520
 - !ruby/object:Gem::Dependency
   name: pluginfactory
-  requirement: &70346899262200 !ruby/object:Gem::Requirement
+  requirement: &70139550876960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346899262200
+  version_requirements: *70139550876960
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70346899261640 !ruby/object:Gem::Requirement
+  requirement: &70139550876400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70346899261640
+  version_requirements: *70139550876400
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70346899261120 !ruby/object:Gem::Requirement
+  requirement: &70139550875880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70346899261120
+  version_requirements: *70139550875880
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70346899260640 !ruby/object:Gem::Requirement
+  requirement: &70139550875380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70346899260640
+  version_requirements: *70139550875380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70346899260100 !ruby/object:Gem::Requirement
+  requirement: &70139550874860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70346899260100
+  version_requirements: *70139550874860
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
-  requirement: &70346899259600 !ruby/object:Gem::Requirement
+  requirement: &70139550874320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70346899259600
+  version_requirements: *70139550874320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70346899259040 !ruby/object:Gem::Requirement
+  requirement: &70139550873780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,10 +202,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70346899259040
+  version_requirements: *70139550873780
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70346899258540 !ruby/object:Gem::Requirement
+  requirement: &70139550873300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,7 +213,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70346899258540
+  version_requirements: *70139550873300
 description: ! 'Strelka is a framework for creating and deploying Mongrel2 web applications
 
   in Ruby, and for managing a Mongrel2 cluster.