feedtools 0.2.25 → 0.2.26

data/CHANGELOG

@@ -1,3 +1,7 @@
+== FeedTools 0.2.26
+ * added support for retarded, ugly Radio redirects
+ * improved autodiscovery support
+ * fixed lazy evaluation issue
 == FeedTools 0.2.25
  * fixed self reference href bug
  * fixed primary link assignment heuristic

data/lib/feed_tools/database_feed_cache.rb

@@ -21,6 +21,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require 'rubygems'
+require 'active_record'
+
 #= database_feed_cache.rb
 #
 # The <tt>DatabaseFeedCache</tt> is the default caching mechanism for

data/lib/feed_tools/feed.rb

@@ -45,7 +45,7 @@ module FeedTools
       @href = nil
       @id = nil
       @title = nil
-      @description = nil
+      @subtitle = nil
       @link = nil
       @last_retrieved = nil
       @time_to_live = nil
@@ -158,7 +158,35 @@ module FeedTools
             end
             self.update!
           end
+        else
+          ugly_redirect = FeedTools::XmlHelper.try_xpaths(self.xml_document, [
+            "redirect/newLocation/text()"
+          ], :select_result_value => true)
+          if !ugly_redirect.blank?
+            self.feed_data = nil
+            self.href = ugly_redirect
+            if FeedTools.feed_cache.nil?
+              self.cache_object = nil
+            else
+              self.cache_object =
+                FeedTools.feed_cache.find_by_href(ugly_redirect)
+            end
+            self.update!
+          end
         end
+        
+        # Reset everything that needs to be reset.
+        @xml_document = nil
+        @encoding_from_feed_data = nil
+        @root_node = nil
+        @channel_node = nil
+        @id = nil
+        @title = nil
+        @subtitle = nil
+        @copyright = nil
+        @link = nil
+        @time_to_live = nil
+        @entries = nil
       end
     end
   
@@ -331,7 +359,7 @@ module FeedTools
     
     # Returns the encoding that the feed was parsed with
     def encoding
-      if @encoding.nil?
+      if @encoding.blank?
         unless self.http_headers.blank?
           @encoding = "utf-8"
         else
@@ -344,8 +372,9 @@ module FeedTools
     # Returns the encoding of feed calculated only from the xml data.
     # I.e., the encoding we would come up with if we ignore RFC 3023.
     def encoding_from_feed_data
-      if @encoding_from_feed_data.nil?
+      if @encoding_from_feed_data.blank?
         raw_data = self.feed_data
+        return nil if raw_data.nil?
         encoding_from_xml_instruct = 
           raw_data.scan(
             /^<\?xml [^>]*encoding="([\w]*)"[^>]*\?>/
@@ -404,6 +433,24 @@ module FeedTools
       unless self.cache_object.nil?
         self.cache_object.feed_data = new_feed_data
       end
+      ugly_redirect = FeedTools::XmlHelper.try_xpaths(self.xml_document, [
+        "redirect/newLocation/text()"
+      ], :select_result_value => true)
+      if !ugly_redirect.blank?
+        for var in self.instance_variables
+          self.instance_variable_set(var, nil)
+        end
+        @http_headers = {}
+        @feed_data = nil
+        self.href = ugly_redirect
+        if FeedTools.feed_cache.nil?
+          self.cache_object = nil
+        else
+          self.cache_object =
+            FeedTools.feed_cache.find_by_href(ugly_redirect)
+        end
+        self.update!
+      end
     end
     
     # Returns the feed's raw data as utf-8.
@@ -744,6 +791,7 @@ module FeedTools
               end
             end
           end
+          
           # rdf:about is ordered last because a lot of people put the url to
           # the feed inside it instead of a link to their blog.
           # Ordering it last gives them as many chances as humanly possible
@@ -755,7 +803,8 @@ module FeedTools
             "feed/@rdf:resource",
             "feed/@resource",
             "@rdf:about",
-            "@about"
+            "@about",
+            "newLocation/text()"
           ], :select_result_value => true) do |result|
             override_href.call(FeedTools::UriHelper.normalize_url(result))
           end
@@ -2439,6 +2488,10 @@ module FeedTools
         # The cache is disabled for this feed, do nothing.
         return
       end
+      if self.feed_data.blank? && self.http_headers.blank?
+        # There's no data, nothing to save.
+        return
+      end
       if self.http_headers['content-type'] =~ /text\/html/ ||
           self.http_headers['content-type'] =~ /application\/xhtml\+xml/
         if self.title.nil? && self.link.nil? && self.entries.blank?

data/lib/feed_tools/monkey_patch.rb

@@ -553,7 +553,13 @@ module REXML # :nodoc:
 			parser.variables = variables
 			path = "*" unless path
 			element = [element] unless element.kind_of? Array
-			parser.parse(path, element)
+			retried = false
+			begin
+  			parser.parse(path, element)
+  		rescue NoMethodError => error
+  		  retry if !retried
+  		  raise error
+  		end
     end
 
     def self.liberal_first(element, path=nil, namespaces={},
@@ -563,7 +569,13 @@ module REXML # :nodoc:
       parser.variables = variables
       path = "*" unless path
       element = [element] unless element.kind_of? Array
-      parser.parse(path, element)[0]
+			retried = false
+			begin
+        parser.parse(path, element)[0]
+  		rescue NoMethodError => error
+  		  retry if !retried
+  		  raise error
+  		end
     end
 
     def self.liberal_each(element, path=nil, namespaces={},
@@ -573,7 +585,13 @@ module REXML # :nodoc:
 			parser.variables = variables
 			path = "*" unless path
 			element = [element] unless element.kind_of? Array
-			parser.parse(path, element).each( &block )
+			retried = false
+			begin
+  			parser.parse(path, element).each( &block )
+  		rescue NoMethodError => error
+  		  retry if !retried
+  		  raise error
+  		end
     end
   end
   

data/lib/feed_tools/version.rb

@@ -2,7 +2,7 @@ module FeedTools
   module FEED_TOOLS_VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 25
+    TINY  = 26
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/unit/rss_test.rb

@@ -20,6 +20,18 @@ class RssTest < Test::Unit::TestCase
     }
   end
   
+  def test_radio_redirection
+    with_feed(:from_data => <<-FEED
+      <redirect>
+        <newLocation>http://www.slashdot.org/index.rss</newLocation>
+      </redirect>
+    FEED
+    ) { |feed|
+      assert_not_nil feed.href
+      assert_not_nil feed.title
+    }
+  end
+  
   def test_feed_title
     with_feed(:from_file => 'wellformed/rss/channel_title.xml') { |feed|
       assert_equal("Example feed", feed.title)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: feedtools
 version: !ruby/object:Gem::Version 
-  version: 0.2.25
-date: 2006-07-08 00:00:00 -04:00
+  version: 0.2.26
+date: 2006-07-20 00:00:00 -04:00
 summary: Parsing, generation, and caching system for xml news feeds.
 require_paths: 
 - lib