lib/atom/xml/parser.rb in ratom-0.5.2 vs lib/atom/xml/parser.rb in ratom-0.6.0

@@ -259,13 +259,13 @@
                opts = args.size > 1 ? args.last : {}
                
                xml = 
                 case o
                 when String
-                  XML::Reader.new(o)
+                  XML::Reader.string(o)
                 when IO
-                  XML::Reader.new(o.read)
+                  XML::Reader.io(o)
                 when URI
                   raise ArgumentError, "#{class_name}.load only handles http URIs" if o.scheme != 'http'
                   response = nil
                   Net::HTTP.start(o.host, o.port) do |http|
                     request = Net::HTTP::Get.new(o.request_uri)
@@ -281,23 +281,23 @@
                     end
                     response = http.request(request)
                   end
                   case response
                   when Net::HTTPSuccess
-                    XML::Reader.new(response.body)
+                    XML::Reader.string(response.body)
                   when nil
                     raise ArgumentError.new("nil response to #{o}")
                   else
                     raise Atom::LoadError.new(response)
                   end
                 else
                   raise ArgumentError, "#{class_name}.load needs String, URI or IO, got #{o.class.name}"
                 end
 
                 if error_handler
-                  xml.set_error_handler(&error_handler)
+                  XML::Error.set_handler(&error_handler)
                 else
-                  xml.set_error_handler do |reader, message, severity, base, line|
+                  XML::Error.set_handler do |reader, message, severity, base, line|
                     if severity == XML::Reader::SEVERITY_ERROR
                       raise ParseError, "#{message} at #{line} in #{o}"
                     end
                   end
                 end