0
@@ -4,6 +4,7 @@ require 'rake/gempackagetask'
0
 begin
0
   require 'lib/rfeedparser'
0
 rescue LoadError
0
+  module FeedParser; VERSION = 'not loaded'; end
0
   puts "Problem loading rfeedparser; try rake setup"
0
 end
0
 
0
@@ -31,11 +32,10 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency('htmltools', '>= 1.10')
0
   s.add_dependency('htmlentities', '4.0.0')
0
   s.add_dependency('mongrel', '>=1.0.1')
0
-  s.requirements << "Yoshida Masato's Ruby bindings to the Expat XML parser or libxml"
0
+  s.add_dependency('addressable', '>= 1.0.4')
0
+  s.requirements << "Ruby bindings to the Expat XML parser or libxml2 (version 0.5.2 or greater)"
0
 end
0
 
0
-
0
-
0
 Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.need_zip = true
0
 end

0
@@ -66,12 +66,12 @@ require 'rfeedparser/loose_feed_parser'
0
 begin
0
   require 'rfeedparser/libxml_parser'
0
   StrictFeedParser = FeedParser::LibXml::StrictFeedParser
0
-rescue LoadError
0
-  STDERR.puts "Could not load libxml; trying expat"
0
+rescue LoadError, NameError
0
+  STDERR.puts "Could not load libxml; trying expat."
0
   begin
0
     require 'rfeedparser/expat_parser'
0
     StrictFeedParser = FeedParser::Expat::StrictFeedParser
0
-  rescue LoadError
0
+  rescue LoadError, NameError
0
     STDERR.puts "Could not load expat either; will use loose parser."
0
   end
0
 end

0
@@ -29,7 +29,7 @@ module FeedParser
0
        inputdata.setByteStream(StringIO.new(data))
0
        begin
0
          saxparser.parse(inputdata)
0
-       rescue err => XML::SAX::SAXParseException
0
+       rescue XML::SAX::SAXParseException => err
0
          # This does not inherit from StandardError as it should, so
0
          # we have to catch and re-raise specially.
0
          raise err.to_s