feed_discover 0.1.0 → 0.2.0

data/lib/feed_discover.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+#--
 #Copyright (C) 2007 Ben Coffey (me@inelegant.org) <http://inelegant.org/>
 #
 #This program is free software; you can redistribute it and/or
@@ -15,25 +16,26 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# FeedDiscover performs feed autodiscovery on the given URL. 
+#++
+#FeedDiscover performs feed autodiscovery on the given URL. 
 #
-# Feed autodiscovery is a process of using standardised heruitsics
-# to determine the Atom/RSS feed(s) associated with a given X?HTML
-# document. The process is being standardised for Atom feeds via the 
-# IETF: http://tools.ietf.org/html/draft-ietf-atompub-autodiscovery 
-# We use the same approach for RSS feeds.
+#Feed autodiscovery is a process of using standardised heruitsics
+#to determine the Atom/RSS feed(s) associated with a given X?HTML
+#document. The process is being standardised for Atom feeds via the 
+#IETF: http://tools.ietf.org/html/draft-ietf-atompub-autodiscovery 
+#We use the same approach for RSS feeds.
 #
-# When feeds cannot be discovered using the above method, we use a
-# broader, thus less accurate, method of looking for hyperlinks whose
-# URLs end with an extension typical of feeds. This feature is experimental.
+#When feeds cannot be discovered using the above method, we use a
+#broader, thus less accurate, method of looking for hyperlinks whose
+#URLs end with an extension typical of feeds. This feature is experimental.
 #
-# Author:: Ben Coffey  (mailto:me@inelegant.org)
-# Copyright:: Copyright (c) 2007 Ben Coffey
-# License:: GPL
+#Author:: Ben Coffey  (mailto:me@inelegant.org)
+#Copyright:: Copyright (c) 2007 Ben Coffey
+#License:: GPL
 
 require 'rubygems'
 require 'uri'
-require 'simple_http'
+require 'open-uri'
 
 class Array #:nodoc: all
   def to_h(default=nil) 
@@ -111,14 +113,14 @@ class FeedDiscover
   VALID_EXT = /\.(?:rss|xml|rdf)$/
 
   def autodiscover
-    res = SimpleHttp.new @url
-    #TODO: How to handle exceptions?
-    @body = res.get || return
+    res = open(@url)
+    @body = res.read || return
+    @url = res.base_uri
     #If the URL that we were called with is already a feed (IOW,
     #its MIME type matches one of the keys of VALID_MIME_TYPE), 
     #just return it. Autodiscovery is only specified for X?HTML
     #documents.
-    if VALID_MIME_TYPE[res.response_headers['content-type']]
+    if VALID_MIME_TYPE[res.content_type.match(/(^[^; ]+)/)[0]]
       @feeds << @url.to_s
       return
     end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: feed_discover
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 date: 2007-05-18 00:00:00 +01:00
 summary: A library for performing feed autodiscovery on X?HTML pages
 require_paths: 
@@ -52,15 +52,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.4
     version: 
-- !ruby/object:Gem::Dependency 
-  name: simplehttp
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.1
-    version: 
 - !ruby/object:Gem::Dependency 
   name: htmlentities
   version_requirement: