← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to lib/rexml/formatters/default.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/rexml/formatters/default.rb
21
21
      def write( node, output )
22
22
        case node
23
23
 
24
 
        when Document 
 
24
        when Document
25
25
          if node.xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
26
26
            output = Output.new( output, node.xml_decl.encoding )
27
27
          end
63
63
      def write_element( node, output )
64
64
        output << "<#{node.expanded_name}"
65
65
 
66
 
        node.attributes.to_a.sort_by {|attr| attr.name}.each do |attr|
 
66
        node.attributes.to_a.map { |a|
 
67
          Hash === a ? a.values : a
 
68
        }.flatten.sort_by {|attr| attr.name}.each do |attr|
67
69
          output << " "
68
70
          attr.write( output )
69
71
        end unless node.attributes.empty?
70
72
 
71
73
        if node.children.empty?
72
74
          output << " " if @ie_hack
73
 
          output << "/" 
 
75
          output << "/"
74
76
        else
75
77
          output << ">"
76
78
          node.children.each { |child|