feedtools 0.2.19 → 0.2.20

data/CHANGELOG

@@ -1,3 +1,7 @@
+== FeedTools 0.2.20
+ * fixed some atom namespace bugs
+ * added a summary method to feed items
+ * added some support for the apple-wallpapers elements
 == FeedTools 0.2.19
  * lousy encoding support (as opposed to none at all)
  * xml processing instruction now correctly prefixes generated feeds

data/lib/feed_tools/feed.rb

@@ -1123,7 +1123,9 @@ module FeedTools
           "a/@href"
         ], :select_result_value => true)
         if @link.blank?
-          if FeedTools.is_uri?(self.guid)
+          if FeedTools.is_uri?(self.guid) &&
+              !(self.guid =~ /^urn:uuid:/) &&
+              !(self.guid =~ /^tag:/)
             @link = self.guid
           end
         end
@@ -1305,6 +1307,9 @@ module FeedTools
           if @author.name.blank?
             @author.name = FeedTools.unescape_entities(
               try_xpaths(author_node, [
+                "atom10:name/text()",
+                "atom03:name/text()",
+                "atom:name/text()",
                 "name/text()",
                 "@name"
               ], :select_result_value => true)
@@ -1313,6 +1318,9 @@ module FeedTools
           if @author.email.blank?
             @author.email = FeedTools.unescape_entities(
               try_xpaths(author_node, [
+                "atom10:email/text()",
+                "atom03:email/text()",
+                "atom:email/text()",
                 "email/text()",
                 "@email"
               ], :select_result_value => true)
@@ -1321,7 +1329,13 @@ module FeedTools
           if @author.url.blank?
             @author.url = FeedTools.unescape_entities(
               try_xpaths(author_node, [
+                "atom10:url/text()",
+                "atom03:url/text()",
+                "atom:url/text()",
                 "url/text()",
+                "atom10:uri/text()",
+                "atom03:uri/text()",
+                "atom:uri/text()",
                 "uri/text()",
                 "@url",
                 "@uri",
@@ -1499,7 +1513,13 @@ module FeedTools
     def updated
       if @updated.nil?
         updated_string = try_xpaths(self.channel_node, [
+          "atom10:updated/text()",
+          "atom03:updated/text()",
+          "atom:updated/text()",
           "updated/text()",
+          "atom10:modified/text()",
+          "atom03:modified/text()",
+          "atom:modified/text()",
           "modified/text()"
         ], :select_result_value => true)
         unless updated_string.blank?
@@ -1520,8 +1540,14 @@ module FeedTools
     def published
       if @published.nil?
         published_string = try_xpaths(self.channel_node, [
+          "atom10:published/text()",
+          "atom03:published/text()",
+          "atom:published/text()",
           "published/text()",
           "pubDate/text()",
+          "atom10:issued/text()",
+          "atom03:issued/text()",
+          "atom:issued/text()",
           "issued/text()",
           "dc:date/text()"
         ], :select_result_value => true)
@@ -1577,6 +1603,7 @@ module FeedTools
         image_nodes = try_xpaths_all(self.channel_node, [
           "image",
           "logo",
+          "apple-wallpapers:image",
           "atom10:link",
           "atom03:link",
           "atom:link",
@@ -1587,7 +1614,8 @@ module FeedTools
             image = FeedTools::Feed::Image.new
             image.url = try_xpaths(image_node, [
               "url/text()",
-              "@rdf:resource"
+              "@rdf:resource",
+              "text()"
             ], :select_result_value => true)
             if image.url.blank? && (image_node.name == "logo" ||
                 (image_node.attributes['type'].to_s =~ /^image/) == 0)

data/lib/feed_tools/feed_item.rb

@@ -344,6 +344,9 @@ module FeedTools
       if @content.nil?
         repair_entities = false
         content_node = try_xpaths(self.root_node, [
+          "atom10:content",
+          "atom03:content",
+          "atom:content",
           "content:encoded",
           "content",
           "fullitem",
@@ -353,6 +356,9 @@ module FeedTools
           "description",
           "tagline",
           "subtitle",
+          "atom10:summary",
+          "atom03:summary",
+          "atom:summary",
           "summary",
           "abstract",
           "blurb",
@@ -411,6 +417,85 @@ module FeedTools
     def content=(new_content)
       @content = new_content
     end
+
+    # Returns the feed item summary
+    def summary
+      if @summary.nil?
+        repair_entities = false
+        summary_node = try_xpaths(self.root_node, [
+          "atom10:summary",
+          "atom03:summary",
+          "atom:summary",
+          "summary",
+          "abstract",
+          "blurb",
+          "description",
+          "tagline",
+          "subtitle",
+          "fullitem",
+          "xhtml:body",
+          "body",
+          "content:encoded",
+          "encoded",
+          "atom10:content",
+          "atom03:content",
+          "atom:content",
+          "content",
+          "info"
+        ])
+        if summary_node.nil?
+          return nil
+        end
+        summary_type = try_xpaths(summary_node, "@type",
+          :select_result_value => true)
+        summary_mode = try_xpaths(summary_node, "@mode",
+          :select_result_value => true)
+        summary_encoding = try_xpaths(summary_node, "@encoding",
+          :select_result_value => true)
+
+        # Note that we're checking for misuse of type, mode and encoding here
+        if !summary_encoding.blank?
+          @summary =
+            "[Embedded data objects are not currently supported.]"
+        elsif summary_node.cdatas.size > 0
+          @summary = summary_node.cdatas.first.value
+        elsif summary_type == "base64" || summary_mode == "base64" ||
+            summary_encoding == "base64"
+          @summary = Base64.decode64(summary_node.inner_xml.strip)
+        elsif summary_type == "xhtml" || summary_mode == "xhtml" ||
+            summary_type == "xml" || summary_mode == "xml" ||
+            summary_type == "application/xhtml+xml"
+          @summary = summary_node.inner_xml
+        elsif summary_type == "escaped" || summary_mode == "escaped"
+          @summary = FeedTools.unescape_entities(
+            summary_node.inner_xml)
+        else
+          @summary = summary_node.inner_xml
+          repair_entities = true
+        end
+        if @summary.blank?
+          @summary = self.itunes_summary
+        end
+        if @summary.blank?
+          @summary = self.itunes_subtitle
+        end
+
+        unless @summary.blank?
+          @summary = FeedTools.sanitize_html(@summary, :strip)
+          @summary = FeedTools.unescape_entities(@summary) if repair_entities
+          @summary = FeedTools.tidy_html(@summary)
+        end
+
+        @summary = @summary.strip unless @summary.nil?
+        @summary = nil if @summary.blank?
+      end
+      return @summary
+    end
+
+    # Sets the feed item summary
+    def summary=(new_summary)
+      @summary = new_summary
+    end
     
     # Returns the contents of the itunes:summary element
     def itunes_summary
@@ -497,7 +582,9 @@ module FeedTools
           "a/@href"
         ], :select_result_value => true)
         if @link.blank?
-          if FeedTools.is_uri? self.guid
+          if FeedTools.is_uri?(self.guid) &&
+              !(self.guid =~ /^urn:uuid:/) &&
+              !(self.guid =~ /^tag:/)
             @link = self.guid
           end
         end
@@ -601,6 +688,7 @@ module FeedTools
         image_nodes = try_xpaths_all(self.root_node, [
           "image",
           "logo",
+          "apple-wallpapers:image",
           "atom10:link",
           "atom03:link",
           "atom:link",
@@ -611,7 +699,8 @@ module FeedTools
             image = FeedTools::Feed::Image.new
             image.url = try_xpaths(image_node, [
               "url/text()",
-              "@rdf:resource"
+              "@rdf:resource",
+              "text()"
             ], :select_result_value => true)
             if image.url.blank? && (image_node.name == "logo" ||
                 (image_node.attributes['type'].to_s =~ /^image/) == 0)
@@ -1215,6 +1304,9 @@ module FeedTools
           if @author.name.blank?
             @author.name = FeedTools.unescape_entities(
               try_xpaths(author_node, [
+                "atom10:name/text()",
+                "atom03:name/text()",
+                "atom:name/text()",
                 "name/text()",
                 "@name"
               ], :select_result_value => true)
@@ -1223,6 +1315,9 @@ module FeedTools
           if @author.email.blank?
             @author.email = FeedTools.unescape_entities(
               try_xpaths(author_node, [
+                "atom10:email/text()",
+                "atom03:email/text()",
+                "atom:email/text()",
                 "email/text()",
                 "@email"
               ], :select_result_value => true)
@@ -1231,7 +1326,13 @@ module FeedTools
           if @author.url.blank?
             @author.url = FeedTools.unescape_entities(
               try_xpaths(author_node, [
+                "atom10:url/text()",
+                "atom03:url/text()",
+                "atom:url/text()",
                 "url/text()",
+                "atom10:uri/text()",
+                "atom03:uri/text()",
+                "atom:uri/text()",
                 "uri/text()",
                 "@url",
                 "@uri",
@@ -1921,8 +2022,6 @@ module FeedTools
       end
     end
     
-    alias_method :summary, :content
-    alias_method :summary=, :content=
     alias_method :abstract, :content
     alias_method :abstract=, :content=
     alias_method :description, :content

data/lib/feed_tools.rb

@@ -32,7 +32,7 @@ FEED_TOOLS_ENV = ENV['FEED_TOOLS_ENV'] ||
                  ENV['RAILS_ENV'] ||
                  'development' # :nodoc:
 
-FEED_TOOLS_VERSION = "0.2.19"
+FEED_TOOLS_VERSION = "0.2.20"
 
 FEED_TOOLS_NAMESPACES = {
   "admin" => "http://webns.net/mvcb/",

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'feedtools'
-PKG_VERSION   = '0.2.19'
+PKG_VERSION   = '0.2.20'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -91,7 +91,8 @@ Rake::TestTask.new("rss_test") { |t|
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Feed Tools -- caching system for xml news feeds"
-  rdoc.options << '--line-numbers --inline-source --accessor cattr_accessor=object'
+  rdoc.options << '--line-numbers' << '--inline-source' <<
+    '--accessor' << 'cattr_accessor=object'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: feedtools
 version: !ruby/object:Gem::Version 
-  version: 0.2.19
+  version: 0.2.20
 date: 2006-01-21 00:00:00 -05:00
 summary: "Parsing, generation, and caching system for xml news feeds."
 require_paths: