watts 0.0.4 → 0.0.5

data/Rakefile

@@ -22,7 +22,7 @@ spec = Gem::Specification.new { |s|
 		"Resource-oriented, Rack-based, minimalist web framework."
 	s.homepage = "http://debu.gs/#{s.name}"
 	%w(metaid).each &s.method(:add_dependency)
-	s.version = '0.0.4'
+	s.version = '0.0.5'
 }
 
 Rake::RDocTask.new(:doc) { |t|

data/lib/watts.rb

@@ -159,6 +159,7 @@ module Watts
 			resource_class, args = match req_path
 
 			if resource_class
+				env = env.merge :watts_app => self
 				res = resource_class.new(env)
 				res.send(rm, *args)
 			else
@@ -253,10 +254,13 @@ module Watts
 
 		to_instance :http_methods
 		attr_new Rack::Response, :response
-		attr_accessor :env, :response
+		attr_accessor :env, :response, :app
 
 		# Every resource, on being instantiated, is given the Rack env.
 		def initialize(env)
+			if app = env.delete(:watts_app)
+				self.app = app
+			end
 			self.env = env
 			self.response = Rack::Response.new
 		end
@@ -275,11 +279,19 @@ module Watts
 			]
 		end
 
+		def request
+			@request ||= Rack::Request.new(env)
+		end
+
 		# By default, we return "405 Method Not Allowed" and set the Allow:
 		# header appropriately.
 		def default_http_method(*args)
+			s = 'Method not allowed.'
 			[405,
-				{ 'Allow' => http_methods.join(', ') },
+				{ 'Allow' => http_methods.join(', '),
+				  'Content-Type' => 'text/plain',
+				  'Content-Length' => s.bytesize.to_s,
+				},
 				['Method not allowed.']]
 		end
 	end
@@ -304,7 +316,7 @@ module Watts
 			body = view_class.new.send(view_method, *args)
 			[200,
 				{'Content-Type' => 'text/html',
-				 'Content-Length' => body.length.to_s},
+				 'Content-Length' => body.bytesize.to_s},
 			 [body]]
 		end
 	end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Pete Elmore
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency