kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Simple changes to bring AWS up to date with view_paths and render :text. Tests still fail though. [Koz]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7916 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Michael Koziarski 2007-10-15 08:59:48 +00:00
parent 3397d971ff
commit ff4f90c81a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
View file

@ -41,7 +41,7 @@ module ActionWebService # :nodoc:
allowed_methods = self.class.web_service_api ? (self.class.web_service_api.allowed_http_methods || []) : [ :post ]
allowed_methods = allowed_methods.map{|m| m.to_s.upcase }
if !allowed_methods.include?(method)
render_text("#{method} not supported", "500 #{method} not supported")
render :text => "#{method} not supported", :status=>500
return
end
exception = nil
@ -101,7 +101,7 @@ module ActionWebService # :nodoc:
message = "Exception raised"
backtrace = ""
end
render_text("Internal protocol error: #{message}#{backtrace}", "500 Internal Protocol Error")
render :text => "Internal protocol error: #{message}#{backtrace}", :status => 500
end
end
@ -158,7 +158,7 @@ module ActionWebService # :nodoc:
log_error(e) unless logger.nil?
end
when :post
render_text('POST not supported', '500 POST not supported')
render :text => 'POST not supported', :status => 500
end
end

8
actionwebservice/lib/action_web_service/scaffolding.rb
View file

@ -109,15 +109,15 @@ module ActionWebService
customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
default_template = scaffold_path(action)
if template_exists?(customized_template)
content = @template.render_file(customized_template)
content = @template.render :file => customized_template
else
content = @template.render_file(default_template, false)
content = @template.render :file => default_template
end
@template.instance_variable_set("@content_for_layout", content)
if self.active_layout.nil?
render_file(scaffold_path("layout"))
render :file => scaffold_path("layout")
else
render_file(self.active_layout, "200 OK", true)
render :file => self.active_layout
end
end

2
actionwebservice/test/scaffolded_controller_test.rb
View file

@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map|
map.connect ':controller/:action/:id'
end
ActionController::Base.view_load_paths = [ '.' ]
ActionController::Base.view_paths = [ '.' ]
class ScaffoldPerson < ActionWebService::Struct
member :id, :int