svenfuchs / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails - forked for implementing I18n patch
Homepage: http://rubyonrails.org
Clone URL: git://github.com/svenfuchs/rails.git 
Simple changes to bring AWS up to date with view_paths and render :text. 
Tests still fail though. [Koz]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7916 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
NZKoz (author)
Mon Oct 15 01:59:48 -0700 2007
commit  ff4f90c81ad00241040c0c2ae2be1b937abfa063
tree    3157ea8127e278ed2990fddc450e610de98c2f96
parent  3397d971ffbeb3870d4223fabcb85cd97a9d79a9
0
actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb 
...
41
42
43
44
 
45
46
47
...
101
102
103
104
 
105
106
107
...
158
159
160
161
 
162
163
164
 
...
41
42
43
 
44
45
46
47
...
101
102
103
 
104
105
106
107
...
158
159
160
 
161
162
163
164
 
0
@@ -41,7 +41,7 @@ module ActionWebService # :nodoc:
0
             allowed_methods = self.class.web_service_api ? (self.class.web_service_api.allowed_http_methods || []) : [ :post ]
0
             allowed_methods = allowed_methods.map{|m| m.to_s.upcase }
0
             if !allowed_methods.include?(method)
0
-              render_text("#{method} not supported", "500 #{method} not supported")
0
+              render :text => "#{method} not supported", :status=>500
0
               return
0
             end
0
             exception = nil
0
@@ -101,7 +101,7 @@ module ActionWebService # :nodoc:
0
                 message = "Exception raised"
0
                 backtrace = ""
0
               end
0
-              render_text("Internal protocol error: #{message}#{backtrace}", "500 Internal Protocol Error")
0
+              render :text => "Internal protocol error: #{message}#{backtrace}", :status => 500
0
             end
0
           end
0
 
0
@@ -158,7 +158,7 @@ module ActionWebService # :nodoc:
0
               log_error(e) unless logger.nil?
0
             end
0
           when :post
0
-            render_text('POST not supported', '500 POST not supported')
0
+            render :text => 'POST not supported', :status => 500
0
           end
0
         end
0
 
0
actionwebservice/lib/action_web_service/scaffolding.rb 
...
109
110
111
112
 
113
114
 
115
116
117
118
 
119
120
 
121
122
123
 
...
109
110
111
 
112
113
 
114
115
116
117
 
118
119
 
120
121
122
123
 
0
@@ -109,15 +109,15 @@ module ActionWebService
0
               customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
0
               default_template = scaffold_path(action)
0
               if template_exists?(customized_template)
0
-                content = @template.render_file(customized_template)
0
+                content = @template.render :file => customized_template
0
               else
0
-                content = @template.render_file(default_template, false)
0
+                content = @template.render :file => default_template
0
               end
0
               @template.instance_variable_set("@content_for_layout", content)
0
               if self.active_layout.nil?
0
-                render_file(scaffold_path("layout"))
0
+                render :file => scaffold_path("layout")
0
               else
0
-                render_file(self.active_layout, "200 OK", true)
0
+                render :file => self.active_layout
0
               end
0
             end
0
 
0
actionwebservice/test/scaffolded_controller_test.rb 
...
5
6
7
8
 
9
10
11
 
...
5
6
7
 
8
9
10
11
 
0
@@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map|
0
   map.connect ':controller/:action/:id'
0
 end
0
 
0
-ActionController::Base.view_load_paths = [ '.' ]
0
+ActionController::Base.view_paths = [ '.' ]
0
 
0
 class ScaffoldPerson < ActionWebService::Struct
0
   member :id,     :int

Comments

    No one has commented yet.