Fixed the ordering of attributes in the xml-decleration of Builder #540 [woeye]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 17 insertions, 6 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index f66d6bbd96..c00d72230e 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed the ordering of attributes in the xml-decleration of Builder #540 [woeye]
+
 * Added @request.raw_post as a convenience access to @request.env['RAW_POST_DATA'] #534 [Tobias Luetke]
 
 * Added support for automatic id-based indexing for lists of items #532 [dblack]. Example:
diff --git a/actionpack/lib/action_view/vendor/builder/xmlmarkup.rb b/actionpack/lib/action_view/vendor/builder/xmlmarkup.rb
index 716ff52535..4f82704c20 100644
--- a/actionpack/lib/action_view/vendor/builder/xmlmarkup.rb
+++ b/actionpack/lib/action_view/vendor/builder/xmlmarkup.rb
@@ -221,7 +221,7 @@ module Builder
     # For example:
     #
     #    xml.instruct!
-    #        #=> <?xml encoding="UTF-8" version="1.0"?>
+    #        #=> <?xml version="1.0" encoding="UTF-8"?>
     #    xml.instruct! :aaa, :bbb=>"ccc"
     #        #=> <?aaa bbb="ccc"?>
     #
@@ -231,7 +231,12 @@ module Builder
 	a = { :version=>"1.0", :encoding=>"UTF-8" }
 	attrs = a.merge attrs
       end
-      _special("<?#{directive_tag}", "?>", nil, attrs)
+      _special(
+	"<?#{directive_tag}",
+	"?>",
+	nil,
+	attrs,
+	[:version, :encoding, :standalone])
     end
 
     private
@@ -245,11 +250,11 @@ module Builder
     end
     
     # Insert special instruction. 
-    def _special(open, close, data=nil, attrs=nil)
+    def _special(open, close, data=nil, attrs=nil, order=[])
       _indent
       @target << open
       @target << data if data
-      _insert_attributes(attrs) if attrs
+      _insert_attributes(attrs, order) if attrs
       @target << close
       _newline
     end
@@ -269,10 +274,14 @@ module Builder
     end
 
     # Insert the attributes (given in the hash).
-    def _insert_attributes(attrs)
+    def _insert_attributes(attrs, order=[])
       return if attrs.nil?
+      order.each do |k|
+	v = attrs[k]
+	@target << %{ #{k}="#{v}"} if v
+      end
       attrs.each do |k, v|
-	@target << %{ #{k}="#{v}"}
+	@target << %{ #{k}="#{v}"} unless order.member?(k)
       end
     end