Changeset 234
- Timestamp:
- 05/10/07 19:02:44 (2 years ago)
- Files:
-
- trunk/Rakefile (modified) (2 diffs)
- trunk/lib/merb/merb_controller.rb (modified) (1 diff)
- trunk/lib/merb/merb_request.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Rakefile
r226 r234 135 135 desc 'Run all tests, specs and finish with rcov' 136 136 task :aok do 137 sh %{rake specs }137 sh %{rake specs;rake rcov} 138 138 end 139 139 … … 147 147 desc "RCov" 148 148 Spec::Rake::SpecTask.new('rcov') do |t| 149 t.spec_opts = ["--format", "specdoc"] 149 150 t.spec_files = FileList['specs/**/*_spec.rb'] 150 151 t.libs = ['lib', 'server/lib' ] trunk/lib/merb/merb_controller.rb
r225 r234 65 65 @method = @params.delete(:_method).downcase.intern 66 66 end 67 @request = Request.new(@env, @method )67 @request = Request.new(@env, @method, request) 68 68 69 69 MERB_LOGGER.info("Params: #{params.inspect}\nCookies: #{cookies.inspect}") trunk/lib/merb/merb_request.rb
r232 r234 3 3 class Request 4 4 attr_accessor :env 5 def initialize(env, method )5 def initialize(env, method, request) 6 6 @env = env 7 7 @method = method 8 @request = request 8 9 end 10 11 def raw_post 12 @request.rewind 13 @request.read 14 end 9 15 10 16 # returns true if the request is an ajax request.
