diff options
| author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-20 04:31:57 +0000 |
|---|---|---|
| committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-20 04:31:57 +0000 |
| commit | 66aeb2f7080dea92703f10546fb3cbcc946f6fa3 (patch) | |
| tree | 4dfe958e610386eb752d60ad26a8f1702e1eb650 /lib/rexml/source.rb | |
| parent | 00190701e0b8cc9ce5dbe9c836e9584d1c1caeb8 (diff) | |
r1479@bean: ser | 2008-01-19 14:26:31 -0500
r1483@bean: ser | 2008-01-19 14:47:23 -0500
Sam's fixes:
* Don't blow up on empty documents
* Add a test case for sorted attributes
* Making the output predictable simplifies unit tests, and doesn't cost
much given that most xml element have few attributes
* Ruby 1.9 revision 14922 is more strict
* Complete Ticket #134
* Fix for ticket #121
* Fix for ticket #124
* Fix for ticket #128
* Fix ticket #133
* Ticket #131 (Support Ruby 1.9)
* Fix for ticket #127
* Fix for ticket #123
* Add missing data needed by test case
r1481@bean (orig r1303): ser | 2008-01-19 17:22:32 -0500
Tagged for release
r1482@bean (orig r1304): ser | 2008-01-19 17:27:10 -0500
Version bump
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/source.rb')
| -rw-r--r-- | lib/rexml/source.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb index 3f14239a35..d4335138a1 100644 --- a/lib/rexml/source.rb +++ b/lib/rexml/source.rb @@ -147,7 +147,7 @@ module REXML # the XML spec. If there is one, we can determine the encoding from # it. @buffer = "" - str = @source.read( 2 ) + str = @source.read( 2 ) || '' if encoding self.encoding = encoding elsif str[0,2] == "\xfe\xff" @@ -161,7 +161,7 @@ module REXML else @line_break = ">" end - super [email protected]( @line_break ) + super( @source.eof? ? str : [email protected]( @line_break ) ) end def scan(pattern, cons=false) @@ -231,7 +231,7 @@ module REXML end def position - @er_source.stat.pipe? ? 0 : @er_source.pos + @er_source.pos rescue 0 end # @return the current line in the source |