summaryrefslogtreecommitdiff
path: root/lib/rexml/source.rb
diff options
context:
space:
mode:
authorser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-30 16:35:45 +0000
committerser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-30 16:35:45 +0000
commitf8d68a248260e721bf756a17fcac6bf1e218e66f (patch)
tree38e048a85c10ebbe2b7cb84a61ae570ca26ba30a /lib/rexml/source.rb
parent2ffedb5f291d8d420ff3a197bba62bd3b329a1db (diff)
All of the tickets and issues mentioned in this log can be found at:
http://www.germane-software.com/projects/rexml/ticket/# where '#' is the issue or ticket number. * Fixes ticket:3 (Issue38 in Roundup.) However, this needs further testing. * Fixed a couple of bugs in the SAX2 parser, plus a bunch of other changes I don't remember. * More XPath ordering testing added * Fixed the documentation WRT the raw mode of text nodes (ticket:4) * Fixes roundup issue 43: substring-after bug. See: http://www.germane-software.com/cgi-bin/roundup/rexml/issue43 * Fixed issue44, Element#xpath * Patch submitted by an anonymous doner to allow parsing of Tempfiles. I was hoping that, by now, that whole Source thing would have been changed to use duck typing and avoid this sort of issue... but in the meantime, the patch has been applied. * Fixes ticket:30, XPath default namespace bug. The fix was provided by Lucas Nussbaum. * Aliases #size to #length, as per zdennis's request. * Fixes typo from previous commit * Fixes ticket #32 (and adds a unit test) * Merges a user-contributed patch for issue #40 * Changes Date, Version, and Copyright to upper case, to avoid conflicts with the Date class. * Minor, yet incomplete, documentation changes. * Resolves issue #34 (SAX parser change makes it impossible to parse IO feeds.) * Moves parser.source.position() to parser.position() * Improves the build script (less work for me to package a distribution) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/source.rb')
-rw-r--r--lib/rexml/source.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index f599d2276c..ddade5de0e 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -8,11 +8,12 @@ module REXML
# @return a Source, or nil if a bad argument was given
def SourceFactory::create_from arg#, slurp=true
if arg.kind_of? String
- source = Source.new(arg)
+ Source.new(arg)
elsif arg.kind_of? IO
- source = IOSource.new(arg)
+ IOSource.new(arg)
+ elsif arg.kind_of? Source
+ arg
end
- source
end
end
@@ -199,7 +200,7 @@ module REXML
end
def position
- @er_source.pos
+ @er_source.stat.pipe? ? 0 : @er_source.pos
end
# @return the current line in the source