bats 0.0.7 → 0.0.8

data/README

@@ -16,7 +16,7 @@ require 'bats'
 
 class App < Bats
 	get '/' do
-		statusCode( 200 ).body 'Flap flap flap'
+		s( 200 ).body 'Flap flap flap'
 	end
 end
 

data/lib/bats.rb

@@ -24,14 +24,14 @@ class Bats
 	
 	def self.redirect l, isTemporary = true
 		i = ( isTemporary ) ? '307' : '301'
-		statusCode( i ).headers( :Location => l )
+		s( i ).headers( :Location => l )
 	end
 
-	def self.statusCode i
+	def self.s i
 		Class.new( ::HTTPResponse.const_get( "Status#{i}" ) )
 	end
 
-	def statusCode i
+	def s i
 		Class.new( ::HTTPResponse.const_get( "Status#{i}" ) )
 	end
 
@@ -60,7 +60,7 @@ class Bats
 				end
 			end
 		end
-		route ||= statusCode( 404 )
+		route ||= s( 404 )
 		args = ( matches ) ? [ env, *matches ] : [ env ]
 		begin
 			route = route.call( args ) if route.kind_of?( Proc )
@@ -68,7 +68,7 @@ class Bats
 		rescue
 			b = '<h1>Ooops... The code broke.</h1>'
 			b += "<h3>#{$!.to_s}</h3>#{$!.backtrace.join( '<br/>' )}"
-			route = statusCode(500).body b
+			route = s(500).body b
 			route.call( env )
 		end
 	end

data/lib/bats/modules/httpresponse.rb

@@ -6,21 +6,22 @@ module HTTPResponse
 	class Response
 		extend ::Wizarding
 		
-		traits :status, :headers, :body
+		traits :body, :headers, :status
+
+		def self.call env; new.call( env ); end
 		
-		def self.headers h
-			@traits[ :headers ] ||= {}
-			@traits[ :headers ].merge!( h )
+		def self.h h
+			@traits[:headers].merge!( h )
+			self
 		end
 		
-		def self.body b
-			headers 'Content-Length' => b.length
-			@traits[ :body ] = b
+		def self.b b
+			@traits[:body] = b
+			self
 		end
 
-		def self.call env; new.call( env ); end
-
 		def call env
+			@headers.merge! 'Content-Length' => @body.length
 			[ @status, @headers, @body ]
 		end
 	end
@@ -38,4 +39,4 @@ module HTTPResponse
 		)
 	end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bats
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Hans Oksendahl