aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-05-31 02:50:02 +0000
committerLeon Breedt <bitserf@gmail.com>2005-05-31 02:50:02 +0000
commit46e68538c08d751554b2c6f512659993ef62c218 (patch)
treea3b21b2056b3e6c7862aae84706633d6bf83bbac
parent19da52d69db92995eb518875b60e72b61f83469a (diff)
downloadrails-46e68538c08d751554b2c6f512659993ef62c218.tar.gz
rails-46e68538c08d751554b2c6f512659993ef62c218.tar.bz2
rails-46e68538c08d751554b2c6f512659993ef62c218.zip
fix scaffolding template paths (Pathname does weird things on Win32)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1375 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionwebservice/CHANGELOG2
-rw-r--r--actionwebservice/TODO18
-rw-r--r--actionwebservice/lib/action_web_service/scaffolding.rb2
3 files changed, 21 insertions, 1 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 7417e22bdf..fd3621f023 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix scaffolding template paths, it was broken on Win32
+
* Fix that functional testing of :layered controllers failed when using the SOAP protocol
* Allow invocation filters in :direct controllers as well, as they have access to more information regarding the web service request than ActionPack filters
diff --git a/actionwebservice/TODO b/actionwebservice/TODO
index c78cffb2e1..7c022c14cb 100644
--- a/actionwebservice/TODO
+++ b/actionwebservice/TODO
@@ -1,6 +1,24 @@
= Post-1.0
+ - Document/Literal SOAP support
+ - URL-based dispatching, URL identifies method
+
- Add :rest dispatching mode, a.l.a. Backpack API. Clean up dispatching
in general. Support vanilla XML-format as a "Rails" protocol?
+ XML::Simple deserialization into params?
+
+ web_service_dispatching_mode :rest
+
+ def method1(params)
+ end
+
+ def method2(params)
+ end
+
+
+ /ws/method1
+ <xml>
+ /ws/method2
+ <yaml>
- Allow locking down a controller to only accept messages for a particular
protocol. This will allow us to generate fully conformant error messages
diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb
index d2e74b095c..ff9a23b1e8 100644
--- a/actionwebservice/lib/action_web_service/scaffolding.rb
+++ b/actionwebservice/lib/action_web_service/scaffolding.rb
@@ -117,7 +117,7 @@ module ActionWebService
end
def scaffold_path(template_name)
- Pathname.new(File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".rhtml").realpath.to_s
+ File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".rhtml"
end
def reset_invocation_response