feedtools 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,15 @@
+== FeedTools 0.2.4
+ * fixed bug in the sqlite table creation query
+ * greatly improved image support
+ * improved cdf support (still needs way more work)
+ * support for text input elements
+ * now possible to force retrieval from the cache only
+ * increased the flexibility of the database caching implementation
+ * feed attributes accessible through the keys and values collections
+ * minor coding style changes
+ * fixed really dumb typo in the podcast? and vidlog? methods
+ * fixed exception from missing titles and descriptions
+ * now passes all of mark pilgrim's well-formed rss tests
 == FeedTools 0.2.3
  * fixed omission of get parameters from http requests
 == FeedTools 0.2.2

data/lib/feed_tools.rb

@@ -25,7 +25,7 @@ FEED_TOOLS_ENV = ENV['FEED_TOOLS_ENV'] ||
                  ENV['RAILS_ENV'] ||
                  'production' # :nodoc:
 
-FEED_TOOLS_VERSION = "0.2.3"
+FEED_TOOLS_VERSION = "0.2.4"
 
 $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")
@@ -75,7 +75,7 @@ require 'yaml'
 #  => "News for nerds, stuff that matters"
 #  slashdot_feed.link       
 #  => "http://slashdot.org/"
-#  slashdot_feed.items.first.find_node("slash:hitparade/text()").to_s
+#  slashdot_feed.items.first.find_node("slash:hitparade/text()").value
 #  => "43,37,28,23,11,3,1"
 module FeedTools
   
@@ -150,7 +150,7 @@ module FeedTools
       begin
         ActiveRecord::Base.connection.execute "select id, url, title, " +
           "link, xml_data, http_headers, last_retrieved " +
-          "from feeds limit 1"
+          "from #{self.table_name()} limit 1"
       rescue ActiveRecord::StatementInvalid
         return false
       rescue
@@ -163,7 +163,7 @@ module FeedTools
     def DatabaseFeedCache.create_table
       unless DatabaseFeedCache.table_exists?
         feeds_mysql = <<-SQL_END
-          CREATE TABLE `feeds` (
+          CREATE TABLE `#{self.table_name()}` (
             `id`              int(10) unsigned NOT NULL auto_increment,
             `url`             varchar(255) default NULL,
             `title`           varchar(255) default NULL,
@@ -175,19 +175,18 @@ module FeedTools
           ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
         SQL_END
         feeds_sqlite = <<-SQL_END
-          CREATE TABLE 'feeds' (
+          CREATE TABLE '#{self.table_name()}' (
             'id'              INTEGER PRIMARY KEY NOT NULL,
             'url'             VARCHAR(255) DEFAULT NULL,
             'title'           VARCHAR(255) DEFAULT NULL,
             'link'            VARCHAR(255) DEFAULT NULL,
-            'image_link'      VARCHAR(255) DEFAULT NULL,
             'xml_data'        TEXT DEFAULT NULL,
             'http_headers'    TEXT DEFAULT NULL,
             'last_retrieved'  DATETIME DEFAULT NULL,
           );
         SQL_END
         feeds_psql = <<-SQL_END
-          CREATE TABLE feeds (
+          CREATE TABLE #{self.table_name()} (
             id                SERIAL PRIMARY KEY NOT NULL,
             url               varchar(255) default NULL,
             title             varchar(255) default NULL,
@@ -206,7 +205,7 @@ module FeedTools
           table_creation_sql = feeds_psql
         end
         if table_creation_sql.nil?
-          raise "Could not build feed_items table."
+          raise "Could not build #{self.table_name()} table."
         else
           connection.execute table_creation_sql
         end
@@ -219,24 +218,86 @@ module FeedTools
   end
 
   # Quick method of enabling small classes to have their attributes
-  # accessible as a dictionary.
-  module AttributeDictionary # :nodoc:
-    # Access the attributes as a dictionary
+  # accessible as a dictionary.  These methods should not be used whenever
+  # performance is going to be an issue.  They exist almost entirely for the
+  # purposes of aesthetics and/or debugging.
+  module AttributeDictionary
+    # Access the attributes as a dictionary.
     def [](key)
-      # Assignment, and destructive methods should not be
-      # accessed like this.
-      return nil if key[-1..-1] == "=" || key[-1..-1] == "!"
-      return nil unless self.method(key).arity == 0
+      return nil unless self.keys.include? key
       return self.send(key)
     end
 
-    # Access the attributes as a dictionary
+    # Access the attributes as a dictionary.
     def []=(key, value)
-      # Assignment, and destructive methods should not be
-      # accessed like this.
-      return nil if key[-1..-1] == "=" || key[-1..-1] == "!"
-      return nil unless self.method(key + "=").arity == 1
-      return self.send(key + "=", value)      
+      pseudo_key = key
+      pseudo_key = key[0..-2] if key[-1..-1] == "?"
+      return nil unless self.method(pseudo_key + "=").arity == 1
+      local_keys = self.keys
+      unless local_keys.include?(key) || local_keys.include?(pseudo_key)
+        return nil
+      end
+      return self.send(pseudo_key + "=", value)      
+    end
+    
+    # Access the attributes as a dictionary.
+    def keys
+      key_methods = []
+      for key in self.methods
+        # Quick-n-dirty hack to speed things up and keep the list clean
+        if self.method(key).arity == 0 && key[-1..-1] != "=" &&
+            key[-1..-1] != "!" && key[0..1] != "__" &&
+            key[0..2] != "to_" && key[-5..-1] != "_node" &&
+            key != "cache_object" && key != "save" && key != "xml" &&
+            key != "xml_data" && key != "expired?" && key != "live?" &&
+            key != "feed"
+          superfluous_ancestors = self.class.ancestors
+          superfluous_ancestors = superfluous_ancestors[1..-1]
+          superfluous = false
+          for ancestor in superfluous_ancestors
+            if ancestor.instance_methods.include? key
+              superfluous = true
+              break              
+            end
+          end
+          next if superfluous
+          key_methods << key
+        end
+      end
+      return key_methods.sort
+    end
+    
+    # Access the attributes as a dictionary.
+    # Please note that this method may cause a nearly complete parse of a
+    # feed.  This will be very slow.
+    def values
+      return self.keys.map { |key| self[key] }
+    end
+    
+    # Access the attributes as a dictionary.
+    # Please note that this method may cause a complete parse of a feed.
+    # This will be very slow.
+    def to_hash
+      attribute_hash = {}
+      for key in keys
+        value = self[key]
+        if value.respond_to? :to_hash
+          value = value.to_hash
+        end
+        if value.respond_to? :to_ary
+          new_value = []
+          for item in value.to_ary
+            if item.respond_to? :to_hash
+              new_value << item.to_hash
+            else
+              new_value << item
+            end
+          end
+          value = new_value
+        end
+        attribute_hash[key] = value
+      end
+      return attribute_hash
     end
   end
 
@@ -278,6 +339,22 @@ module FeedTools
     @feed_cache = new_feed_cache
   end
   
+  # Returns true if FeedTools should only retrieve from the cache and avoid
+  # pulling feeds from their remote location.
+  def FeedTools.cache_only?
+    @cache_only = false if @cache_only.nil?
+    return @cache_only
+  end
+  
+  # Sets whether or not FeedTools should retrieve feeds from remote locations
+  # or if it should rely on the cache only.
+  def FeedTools.cache_only=(new_cache_only)
+    if new_cache_only != true && new_cache_only != false
+      raise ArgumentError, "Must be either true or false."
+    end
+    @cache_only = new_cache_only
+  end
+  
   # Returns true if FeedTools.feed_cache is not nil and a connection with
   # the cache has been successfully established.  Also returns false if an
   # error is raised while trying to determine the status of the cache.
@@ -613,37 +690,29 @@ module FeedTools
   end
 
   class Feed
-    include REXML
+    include REXML # :nodoc:
     include AttributeDictionary
     
     # Represents a feed/feed item's category
     class Category
+      include AttributeDictionary
+      
       # The category term value
       attr_accessor :term
       # The categorization scheme
       attr_accessor :scheme
       # A human-readable description of the category
       attr_accessor :label
-
-      # Relays any unknown methods to the term so that you can treat the
-      # category object as a string
-      def method_missing(msg, *params)
-        self.term.send(msg, params)
-      end
-
-      # Relays the to_s method to the term field
-      def to_s
-        self.term.to_s
-      end
-
-      # Relays the inspect method to the term field
-      def inspect
-        self.term.inspect
-      end
+      
+      alias_method :value, :term
+      alias_method :category, :term
+      alias_method :domain, :scheme
     end
     
     # Represents a feed/feed item's author
     class Author
+      include AttributeDictionary
+
       # The author's real name
       attr_accessor :name
       # The author's email address
@@ -652,26 +721,51 @@ module FeedTools
       attr_accessor :url
       # The raw value of the author tag if present
       attr_accessor :raw
-      
-      # Relays any unknown methods to the name so that you can treat the
-      # author object as a string
-      def method_missing(msg, *params)
-        self.name.send(msg, params)
-      end
-      
-      # Relays the to_s method to the name field
-      def to_s
-        self.name.to_s
-      end
+    end
+    
+    # Represents a feed's image
+    class Image
+      include AttributeDictionary
 
-      # Relays the inspect method to the name field
-      def inspect
-        self.name.inspect
-      end
+      # The image's title
+      attr_accessor :title
+      # The image's description
+      attr_accessor :description
+      # The image's url
+      attr_accessor :url
+      # The url to link the image to
+      attr_accessor :link
+      # The width of the image
+      attr_accessor :width
+      # The height of the image
+      attr_accessor :height
+      # The style of the image
+      # Possible values are "icon", "image", or "image-wide"
+      attr_accessor :style
+    end
+
+    # Represents a feed's text input element.
+    # Be aware that this will be ignored for feed generation.  It's a
+    # pointless element that aggregators usually ignore and it doesn't have an
+    # equivalent in all feeds types.
+    class TextInput
+      include AttributeDictionary
+
+      # The label of the Submit button in the text input area.
+      attr_accessor :title
+      # The description explains the text input area.
+      attr_accessor :description
+      # The URL of the CGI script that processes text input requests.
+      attr_accessor :link
+      # The name of the text object in the text input area.
+      attr_accessor :name
     end
     
     # Represents a feed's cloud.
+    # Be aware that this will be ignored for feed generation.
     class Cloud
+      include AttributeDictionary
+
       # The domain of the cloud.
       attr_accessor :domain
       # The path for the cloud.
@@ -684,7 +778,19 @@ module FeedTools
       # The procedure to use to request notification.
       attr_accessor :register_procedure
     end
-        
+    
+    # Represents a simple hyperlink
+    class Link
+      include AttributeDictionary
+
+      # The url that is being linked to
+      attr_accessor :url
+      # The content of the hyperlink
+      attr_accessor :value
+      
+      alias_method :href, :url
+    end
+    
     # Loads the feed specified by the url, pulling the data from the cache if it hasn't expired.
     def Feed.open(url)
       # clean up the url
@@ -693,19 +799,19 @@ module FeedTools
       # create and load the new feed
       feed = Feed.new
       feed.url = url
-      feed.update
+      feed.update!
       return feed
     end
         
     # Loads the feed from the remote url if the feed has expired from the cache or cannot be
     # retrieved from the cache for some reason.
-    def update
+    def update!
       if self.http_headers.nil? && !(self.cache_object.nil?) &&
           !(self.cache_object.http_headers.nil?)
         @http_headers = YAML.load(self.cache_object.http_headers)
       end
-      if expired?
-        load_remote_feed
+      if expired? && !FeedTools.cache_only?
+        load_remote_feed!
       else
         @live = false
       end
@@ -715,7 +821,7 @@ module FeedTools
     # field to be set.  If an etag or the last_modified date has been set,
     # attempts to use them to prevent unnecessary reloading of identical
     # content.
-    def load_remote_feed
+    def load_remote_feed!
       @live = true
       if self.http_headers.nil? && !(self.cache_object.nil?) &&
           !(self.cache_object.http_headers.nil?)
@@ -970,6 +1076,10 @@ module FeedTools
     # Returns the root node of the feed.
     def root_node
       if @root_node.nil?
+        # TODO: Fix this so that added content at the end of the file doesn't
+        # break this stuff.
+        # E.g.: http://smogzer.tripod.com/smog.rdf
+        # ===================================================================
         @root_node = xml.root
       end
       return @root_node
@@ -979,6 +1089,9 @@ module FeedTools
     def channel_node
       if @channel_node.nil?
         @channel_node = XPath.first(root_node, "channel")
+        if @channel_node == nil
+          @channel_node = XPath.first(root_node, "CHANNEL")
+        end
         if @channel_node == nil
           @channel_node = XPath.first(root_node, "feedinfo")
         end
@@ -1039,6 +1152,8 @@ module FeedTools
           @feed_type = "atom"
         when "rdf:rdf"
           @feed_type = "rss"
+        when "rdf"
+          @feed_type = "rss"
         when "rss"
           @feed_type = "rss"
         when "channel"
@@ -1053,6 +1168,58 @@ module FeedTools
       @feed_type = new_feed_type
     end
     
+    # Returns the version number of the feed type.
+    # Intentionally does not differentiate between the Netscape and Userland
+    # versions of RSS 0.91.
+    def feed_version
+      if @feed_version.nil?
+        version = nil
+        begin
+          version = XPath.first(root_node, "@version").to_s.strip.to_f
+        rescue
+        end
+        version = nil if version == 0.0
+        default_namespace = XPath.first(root_node, "@xmlns").to_s.strip
+        case self.feed_type
+        when "atom"
+          if default_namespace == "http://www.w3.org/2005/Atom"
+            @feed_version = 1.0
+          elsif version != nil
+            @feed_version = version
+          elsif default_namespace == "http://purl.org/atom/ns#"
+            @feed_version = 0.3
+          end
+        when "rss"
+          if default_namespace == "http://my.netscape.com/rdf/simple/0.9/"
+            @feed_version = 0.9
+          elsif default_namespace == "http://purl.org/rss/1.0/"
+            @feed_version = 1.0
+          elsif default_namespace == "http://purl.org/net/rss1.1#"
+            @feed_version = 1.1
+          elsif version != nil
+            case version
+            when 2.1
+              @feed_version = 2.0
+            when 2.01
+              @feed_version = 2.0
+            else
+              @feed_version = version
+            end
+          end
+        when "cdf"
+          @feed_version = 0.4
+        when "!okay/news"
+          @feed_version = nil
+        end
+      end
+      return @feed_version
+    end
+
+    # Sets the default feed version
+    def feed_version=(new_feed_version)
+      @feed_version = new_feed_version
+    end
+
     # Returns the feed's unique id
     def id
       if @id.nil?
@@ -1089,19 +1256,27 @@ module FeedTools
     def title
       if @title.nil?
         repair_entities = false
-        if XPath.first(channel_node, "title/@type").to_s == "xhtml" || 
-            XPath.first(channel_node, "title/@mode").to_s == "xhtml" ||
-            XPath.first(channel_node, "title/@type").to_s == "xml" || 
-            XPath.first(channel_node, "title/@mode").to_s == "xml" ||
-            XPath.first(channel_node, "title/@type").to_s ==
-              "application/xhtml+xml"
-          @title = XPath.first(channel_node, "title").inner_xml
-        elsif XPath.first(channel_node, "title/@type").to_s == "escaped" ||
-            XPath.first(channel_node, "title/@mode").to_s == "escaped"
+        title_node = XPath.first(channel_node, "title")
+        if title_node.nil?
+          title_node = XPath.first(channel_node, "dc:title")
+        end
+        if title_node.nil?
+          title_node = XPath.first(channel_node, "TITLE")
+        end
+        if title_node.nil?
+          return nil
+        end
+        if XPath.first(title_node, "@type").to_s == "xhtml" || 
+            XPath.first(title_node, "@mode").to_s == "xhtml" ||
+            XPath.first(title_node, "@type").to_s == "xml" || 
+            XPath.first(title_node, "@mode").to_s == "xml" ||
+            XPath.first(title_node, "@type").to_s == "application/xhtml+xml"
+          @title = title_node.inner_xml
+        elsif XPath.first(title_node, "@type").to_s == "escaped" ||
+            XPath.first(title_node, "@mode").to_s == "escaped"
           @title = FeedTools.unescape_entities(
-            XPath.first(channel_node, "title/text()").to_s)
+            XPath.first(title_node, "text()").to_s)
         else
-          title_node = XPath.first(channel_node, "title")
           @title = title_node.inner_xml
           repair_entities = true
         end
@@ -1141,6 +1316,9 @@ module FeedTools
         if description_node.nil?
           description_node = XPath.first(channel_node, "abstract")
         end
+        if description_node.nil?
+          description_node = XPath.first(channel_node, "ABSTRACT")
+        end
         if description_node.nil?
           description_node = XPath.first(channel_node, "info")
         end
@@ -1160,6 +1338,9 @@ module FeedTools
           description_node = XPath.first(channel_node, "body")
           @bozo = true unless description_node.nil?
         end
+        if description_node.nil?
+          return nil
+        end
         unless description_node.nil?
           if XPath.first(description_node, "@encoding").to_s != ""
             @description =
@@ -1195,7 +1376,6 @@ module FeedTools
           @description = FeedTools.tidy_html(@description)
         end
 
-        @description.gsub!(/\n/, " ") if @description.size < 80
         @description = @description.strip unless @description.nil?
         @description = nil if @description == ""
       end
@@ -1263,6 +1443,15 @@ module FeedTools
         if @link == ""
           @link = XPath.first(channel_node, "@href").to_s
         end
+        if @link == ""
+          @link = XPath.first(channel_node, "@HREF").to_s
+        end
+        if @link == ""
+          @link = XPath.first(channel_node, "a/@href").to_s
+        end
+        if @link == ""
+          @link = XPath.first(channel_node, "A/@HREF").to_s
+        end
         if @link == ""
           if FeedTools.is_url? self.guid
             @link = self.guid
@@ -1290,39 +1479,6 @@ module FeedTools
       end
     end
 
-    # Returns the feed image link
-    def image_link
-      if @image_link.nil?
-        # get the feed image link from the xml document
-        @image_link = XPath.first(channel_node, "image/url/text()").to_s
-        if @image_link == ""
-          @image_link = XPath.first(channel_node, "image/@rdf:resource").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(channel_node, "link[@type='image/jpeg']/@href").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(channel_node, "link[@type='image/gif']/@href").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(channel_node, "link[@type='image/png']/@href").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(channel_node, "logo[@style='image']/@href").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(channel_node, "logo/@href").to_s
-        end
-        @image_link = FeedTools.normalize_url(@image_link)
-      end
-      return @image_link
-    end
-
-    # Sets the feed image link
-    def image_link=(new_image_link)
-      @image_link = new_image_link
-    end
-
     # Returns the url to the icon file for this feed.
     #
     # This method uses the url from the link field in order to avoid grabbing
@@ -1348,10 +1504,19 @@ module FeedTools
             "icon/text()").to_s
         end
         if @icon_link == ""
+          @icon_link = XPath.first(channel_node,
+            "logo[@style='icon']/@href").to_s
+        end
+        if @icon_link == ""
+          @icon_link = XPath.first(channel_node,
+            "LOGO[@STYLE='ICON']/@HREF").to_s
+        end
+        if @icon_link == "" && self.link != nil && self.link != ""
           link_uri = URI.parse(FeedTools.normalize_url(self.link))
           @icon_link =
             link_uri.scheme + "://" + link_uri.host + "/favicon.ico"
         end
+        icon_link = nil if icon_link == ""
       end
       return @icon_link
     end
@@ -1375,6 +1540,10 @@ module FeedTools
           @author.raw = FeedTools.unescape_entities(
             XPath.first(channel_node, "dc:author/text()").to_s)
         end
+        if @author.raw == ""
+          @author.raw = FeedTools.unescape_entities(
+            XPath.first(channel_node, "managingEditor/text()").to_s)
+        end
         unless @author.raw == ""
           raw_scan = @author.raw.scan(
             /(.*)\((\b[A-Z0-9._%-\+]+@[A-Z0-9._%-]+\.[A-Z]{2,4}\b)\)/i)
@@ -1456,6 +1625,10 @@ module FeedTools
         # Set the author name
         @publisher.raw = FeedTools.unescape_entities(
           XPath.first(channel_node, "dc:publisher/text()").to_s)
+        if @publisher.raw == ""
+          @publisher.raw = FeedTools.unescape_entities(
+            XPath.first(channel_node, "webMaster/text()").to_s)
+        end
         unless @publisher.raw == ""
           raw_scan = @publisher.raw.scan(
             /(.*)\((\b[A-Z0-9._%-\+]+@[A-Z0-9._%-]+\.[A-Z]{2,4}\b)\)/i)
@@ -1529,6 +1702,119 @@ module FeedTools
       return @itunes_author
     end
 
+    # Returns a list of the feed's categories
+    def categories
+      if @categories.nil?
+        @categories = []
+        category_nodes = XPath.match(channel_node, "category")
+        if category_nodes.nil? || category_nodes.empty?
+          category_nodes = XPath.match(channel_node, "dc:subject")
+        end
+        unless category_nodes.nil?
+          for category_node in category_nodes
+            category = FeedTools::Feed::Category.new
+            category.term = XPath.first(category_node, "@term").to_s
+            if category.term == ""
+              category.term = XPath.first(category_node, "text()").to_s
+            end
+            category.term.strip! unless category.term.nil?
+            category.term = nil if category.term == ""
+            category.label = XPath.first(category_node, "@label").to_s
+            category.label.strip! unless category.label.nil?
+            category.label = nil if category.label == ""
+            category.scheme = XPath.first(category_node, "@scheme").to_s
+            if category.scheme == ""
+              category.scheme = XPath.first(category_node, "@domain").to_s
+            end
+            category.scheme.strip! unless category.scheme.nil?
+            category.scheme = nil if category.scheme == ""
+            @categories << category
+          end
+        end
+      end
+      return @categories
+    end
+    
+    # Returns a list of the feed's images
+    def images
+      if @images.nil?
+        @images = []
+        image_nodes = XPath.match(channel_node, "image")
+        if image_nodes.nil? || image_nodes.empty?
+          image_nodes = XPath.match(channel_node, "link")
+        end
+        if image_nodes.nil? || image_nodes.empty?
+          image_nodes = XPath.match(channel_node, "logo")
+        end
+        if image_nodes.nil? || image_nodes.empty?
+          image_nodes = XPath.match(channel_node, "LOGO")
+        end
+        unless image_nodes.nil?
+          for image_node in image_nodes
+            image = FeedTools::Feed::Image.new
+            image.url = XPath.first(image_node, "url/text()").to_s
+            if image.url == ""
+              image.url = XPath.first(image_node, "@rdf:resource").to_s
+            end
+            if image.url == "" && (image_node.name == "logo" ||
+                (image_node.attributes['type'] =~ /^image/) == 0)
+              image.url = XPath.first(image_node, "@href").to_s
+            end
+            if image.url == "" && image_node.name == "LOGO"
+              image.url = XPath.first(image_node, "@HREF").to_s
+            end
+            image.url.strip! unless image.url.nil?
+            image.url = nil if image.url == ""
+            image.title = XPath.first(image_node, "title/text()").to_s
+            image.title.strip! unless image.title.nil?
+            image.title = nil if image.title == ""
+            image.description =
+              XPath.first(image_node, "description/text()").to_s
+            image.description.strip! unless image.description.nil?
+            image.description = nil if image.description == ""
+            image.link = XPath.first(image_node, "link/text()").to_s
+            image.link.strip! unless image.link.nil?
+            image.link = nil if image.link == ""
+            image.height = XPath.first(image_node, "height/text()").to_s.to_i
+            image.height = nil if image.height <= 0
+            image.width = XPath.first(image_node, "width/text()").to_s.to_i
+            image.width = nil if image.width <= 0
+            image.style = XPath.first(image_node, "@style").to_s.downcase
+            if image.style == ""
+              image.style = XPath.first(image_node, "@STYLE").to_s.downcase
+            end
+            image.style.strip! unless image.style.nil?
+            image.style = nil if image.style == ""
+            @images << image
+          end
+        end
+      end
+      return @images
+    end
+    
+    # Returns the feed's text input field
+    def text_input
+      if @text_input.nil?
+        @text_input = FeedTools::Feed::TextInput.new
+        text_input_node = XPath.first(channel_node, "textInput")
+        unless text_input_node.nil?
+          @text_input.title =
+            XPath.first(text_input_node, "title/text()").to_s
+          @text_input.title = nil if @text_input.title == ""
+          @text_input.description =
+            XPath.first(text_input_node, "description/text()").to_s
+          @text_input.description = nil if @text_input.description == ""
+          @text_input.link =
+            XPath.first(text_input_node, "link/text()").to_s
+          @text_input.link = nil if @text_input.link == ""
+          @text_input.name =
+            XPath.first(text_input_node, "name/text()").to_s
+          @text_input.name = nil if @text_input.name == ""
+        end
+      end
+      return @text_input
+    end
+        
     # Returns the feed's copyright information
     def copyright
       if @copyright.nil?
@@ -1696,7 +1982,7 @@ module FeedTools
     end
     
     # Returns true if this feed contains explicit material.
-    def explicit
+    def explicit?
       if @explicit.nil?
         if XPath.first(channel_node,
               "media:adult/text()").to_s.downcase == "true" ||
@@ -1724,9 +2010,18 @@ module FeedTools
         if raw_items == nil || raw_items == []
           raw_items = XPath.match(channel_node, "item")
         end
+        if raw_items == nil || raw_items == []
+          raw_items = XPath.match(channel_node, "ITEM")
+        end
+        if raw_items == nil || raw_items == []
+          raw_items = XPath.match(root_node, "ITEM")
+        end
         if raw_items == nil || raw_items == []
           raw_items = XPath.match(channel_node, "entry")
         end
+        if raw_items == nil || raw_items == []
+          raw_items = XPath.match(root_node, "entry")
+        end
         
         # create the individual feed items
         @items = []
@@ -1767,7 +2062,7 @@ module FeedTools
     # True if this feed contains audio content enclosures
     def podcast?
       podcast = false
-      $test_feed.items.each do |item|
+      self.items.each do |item|
         item.enclosures.each do |enclosure|
           podcast = true if enclosure.audio?
         end
@@ -1778,7 +2073,7 @@ module FeedTools
     # True if this feed contains video content enclosures
     def vidlog?
       vidlog = false
-      $test_feed.items.each do |item|
+      self.items.each do |item|
         item.enclosures.each do |enclosure|
           vidlog = true if enclosure.video?
         end
@@ -1805,7 +2100,7 @@ module FeedTools
     end
     
     # Forces this feed to expire.
-    def expire
+    def expire!
       self.last_retrieved = Time.mktime(1970)
       self.save
     end
@@ -1817,11 +2112,11 @@ module FeedTools
     end
 
     # Generates xml based on the content of the feed
-    def build_xml(feed_type=(self.feed_type or "rss"), version=0.0,
+    def build_xml(feed_type=(self.feed_type or "rss"), version=nil,
         xml_builder=Builder::XmlMarkup.new(:indent => 2))
-      if feed_type == "rss" && version == 0.0
+      if feed_type == "rss" && (version == nil || version == 0.0)
         version = 1.0
-      elsif feed_type == "atom" && version == 0.0
+      elsif feed_type == "atom" && (version == nil || version == 0.0)
         version = 0.3
       end
       if feed_type == "rss" && (version == 0.9 || version == 1.0 || version == 1.1)
@@ -1838,8 +2133,9 @@ module FeedTools
             else
               xml_builder.link
             end
-            unless image_link.nil? || image_link == ""
-              xml_builder.image("rdf:resource" => CGI.escapeHTML(image_link))
+            unless images.nil? || images.empty?
+              xml_builder.image("rdf:resource" => CGI.escapeHTML(
+                images.first.url))
             end
             unless description.nil? || description == ""
               xml_builder.description(description)
@@ -1866,18 +2162,30 @@ module FeedTools
             end
             build_xml_hook(feed_type, version, xml_builder)
           end
-          unless image_link.nil? || image_link == ""
-            xml_builder.image("rdf:about" => CGI.escapeHTML(image_link)) do
-              unless title.nil? || title == ""
-                xml_builder.title(title)
+          unless images.nil? || images.empty?
+            best_image = nil
+            for image in self.images
+              if image.link != nil
+                best_image = image
+                break
+              end
+            end
+            best_image = images.first if best_image.nil?
+            xml_builder.image("rdf:about" => CGI.escapeHTML(best_image.url)) do
+              if best_image.title != nil && best_image.title != ""
+                xml_builder.title(best_image.title)
+              elsif self.title != nil && self.title != ""
+                xml_builder.title(self.title)
               else
                 xml_builder.title
               end
-              unless image_link.nil? || image_link == ""
-                xml_builder.url(image_link)
+              unless best_image.url.nil? || best_image.url == ""
+                xml_builder.url(best_image.url)
               end
-              unless link.nil? || link == ""
-                xml_builder.link(link)
+              if best_image.link != nil && best_image.link != ""
+                xml_builder.link(best_image.link)
+              elsif self.link != nil && self.link != ""
+                xml_builder.link(self.link)
               else
                 xml_builder.link
               end
@@ -1891,7 +2199,7 @@ module FeedTools
         end
       elsif feed_type == "rss"
         # normal rss format
-        return xml_builder.rss("version" => version.to_s) do
+        return xml_builder.rss("version" => version) do
           unless title.nil? || title == ""
             xml_builder.title(title)
           end
@@ -1913,7 +2221,7 @@ module FeedTools
       elsif feed_type == "atom"
         # normal atom format
         return xml_builder.feed("xmlns" => "http://purl.org/atom/ns#",
-            "version" => version.to_s,
+            "version" => version,
             "xml:lang" => language) do
           unless title.nil? || title == ""
             xml_builder.title(title,
@@ -2112,12 +2420,18 @@ module FeedTools
         end
         return false
       end
+      
+      alias_method :link, :url
+      alias_method :link=, :url=
     end
-    EnclosureCategory = Struct.new( "EnclosureCategory", :category, :scheme, :label )
+    
+    # TODO: Make these actual classes instead of structs
+    # ==================================================
     EnclosureHash = Struct.new( "EnclosureHash", :hash, :type )
     EnclosurePlayer = Struct.new( "EnclosurePlayer", :url, :height, :width )
     EnclosureCredit = Struct.new( "EnclosureCredit", :name, :role )
-    EnclosureThumbnail = Struct.new( "EnclosureThumbnail", :url, :height, :width )
+    EnclosureThumbnail = Struct.new( "EnclosureThumbnail", :url, :height,
+      :width )
 
     # Returns the parent feed of this feed item
     def feed
@@ -2186,19 +2500,27 @@ module FeedTools
     def title
       if @title.nil?
         repair_entities = false
-        if XPath.first(root_node, "title/@type").to_s == "xhtml" || 
-            XPath.first(root_node, "title/@mode").to_s == "xhtml" ||
-            XPath.first(root_node, "title/@type").to_s == "xml" || 
-            XPath.first(root_node, "title/@mode").to_s == "xml" ||
-            XPath.first(root_node, "title/@type").to_s ==
-              "application/xhtml+xml"
-          @title = XPath.first(root_node, "title").inner_xml
-        elsif XPath.first(root_node, "title/@type").to_s == "escaped" ||
-            XPath.first(root_node, "title/@mode").to_s == "escaped"
+        title_node = XPath.first(root_node, "title")
+        if title_node.nil?
+          title_node = XPath.first(root_node, "dc:title")
+        end
+        if title_node.nil?
+          title_node = XPath.first(root_node, "TITLE")
+        end
+        if title_node.nil?
+          return nil
+        end
+        if XPath.first(title_node, "@type").to_s == "xhtml" || 
+            XPath.first(title_node, "@mode").to_s == "xhtml" ||
+            XPath.first(title_node, "@type").to_s == "xml" || 
+            XPath.first(title_node, "@mode").to_s == "xml" ||
+            XPath.first(title_node, "@type").to_s == "application/xhtml+xml"
+          @title = title_node.inner_xml
+        elsif XPath.first(title_node, "@type").to_s == "escaped" ||
+            XPath.first(title_node, "@mode").to_s == "escaped"
           @title = FeedTools.unescape_entities(
-            XPath.first(root_node, "title/text()").to_s)
+            XPath.first(title_node, "text()").to_s)
         else
-          title_node = XPath.first(root_node, "title")
           @title = title_node.inner_xml
           repair_entities = true
         end
@@ -2252,16 +2574,25 @@ module FeedTools
         if description_node.nil?
           description_node = XPath.first(root_node, "abstract")
         end
+        if description_node.nil?
+          description_node = XPath.first(root_node, "ABSTRACT")
+        end
         if description_node.nil?
           description_node = XPath.first(root_node, "content:encoded")
         end
         if description_node.nil?
           description_node = XPath.first(root_node, "content")
         end
+        if description_node.nil?
+          description_node = XPath.first(root_node, "fullitem")
+        end
         if description_node.nil?
           description_node = XPath.first(root_node, "info")
           @bozo = true unless description_node.nil?
         end
+        if description_node.nil?
+          return nil
+        end
         unless description_node.nil?
           if XPath.first(description_node, "@encoding").to_s != ""
             @description =
@@ -2297,7 +2628,6 @@ module FeedTools
           @description = FeedTools.tidy_html(@description)
         end
 
-        @description.gsub!(/\n/, " ") if @description.size < 80
         @description = @description.strip unless @description.nil?
         @description = nil if @description == ""
       end
@@ -2385,6 +2715,18 @@ module FeedTools
         if @link == ""
           @link = XPath.first(root_node, "guid[@isPermaLink='true']/text()").to_s
         end
+        if @link == ""
+          @link = XPath.first(root_node, "@href").to_s
+        end
+        if @link == ""
+          @link = XPath.first(root_node, "a/@href").to_s
+        end
+        if @link == ""
+          @link = XPath.first(root_node, "@HREF").to_s
+        end
+        if @link == ""
+          @link = XPath.first(root_node, "A/@HREF").to_s
+        end
         if @link == ""
           if FeedTools.is_url? self.guid
             @link = self.guid
@@ -2410,7 +2752,7 @@ module FeedTools
       @link = new_link
     end
     
-    # Returns the feed comment link
+    # Returns the feed item comment link
     def comment_link
       if @comment_link.nil?
         # get the feed comment link from the xml document
@@ -2423,64 +2765,104 @@ module FeedTools
       return @comment_link
     end
 
-    # Sets the feed comment link
+    # Sets the feed item comment link
     def comment_link=(new_comment_link)
       @comment_link = new_comment_link
     end
     
-    # Returns the feed image link
-    def image_link
-      if @image_link.nil?
-        # get the feed image link from the xml document
-        if @image_link == ""
-          @image_link = XPath.first(root_node, "link[@type='image/jpeg']/@href").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(root_node, "link[@type='image/gif']/@href").to_s
-        end
-        if @image_link == ""
-          @image_link = XPath.first(root_node, "link[@type='image/png']/@href").to_s
+    # Returns a list of the feed item's categories
+    def categories
+      if @categories.nil?
+        @categories = []
+        category_nodes = XPath.match(root_node, "category")
+        if category_nodes.nil? || category_nodes.empty?
+          category_nodes = XPath.match(root_node, "dc:subject")
+        end
+        unless category_nodes.nil?
+          for category_node in category_nodes
+            category = FeedTools::Feed::Category.new
+            category.term = XPath.first(category_node, "@term").to_s
+            if category.term == ""
+              category.term = XPath.first(category_node, "text()").to_s
+            end
+            category.term.strip! unless category.term.nil?
+            category.term = nil if category.term == ""
+            category.label = XPath.first(category_node, "@label").to_s
+            category.label.strip! unless category.label.nil?
+            category.label = nil if category.label == ""
+            category.scheme = XPath.first(category_node, "@scheme").to_s
+            if category.scheme == ""
+              category.scheme = XPath.first(category_node, "@domain").to_s
+            end
+            category.scheme.strip! unless category.scheme.nil?
+            category.scheme = nil if category.scheme == ""
+            @categories << category
+          end
         end
-        # The following two should technically never occur, but have been included
-        # simply because I've seen both occuring in the wild at least once.
-        if @image_link == ""
-          @image_link = XPath.first(root_node, "image/url/text()").to_s
+      end
+      return @categories
+    end
+    
+    # Returns a list of the feed items's images
+    def images
+      if @images.nil?
+        @images = []
+        image_nodes = XPath.match(root_node, "link")
+        if image_nodes.nil? || image_nodes.empty?
+          image_nodes = XPath.match(root_node, "logo")
         end
-        if @image_link == ""
-          @image_link = XPath.first(root_node, "image/@rdf:resource").to_s
+        if image_nodes.nil? || image_nodes.empty?
+          image_nodes = XPath.match(root_node, "LOGO")
         end
-        if @image_link == ""
-          # If there's only a media thumbnail, we can just borrow it.  Technically, this isn't
-          # ideal, but chances are very good that anything that makes use of this image is
-          # simply not going to care anyhow.
-          @image_link = XPath.first(root_node, "media:thumbnail/@url").to_s
-          if @image_link == ""
-            @media_image_link = @image_link
-          end
+        if image_nodes.nil? || image_nodes.empty?
+          image_nodes = XPath.match(root_node, "image")
         end
-        if @image_link == ""
-          # If there's only an itunes image, we can just borrow it.  See comment above regarding
-          # less-than-ideal-ness.
-          if @itunes_image_link == ""
-            @image_link = XPath.first(root_node, "itunes:image/@href").to_s
-            if @image_link == ""
-              @image_link = XPath.first(root_node, "itunes:link[@rel='image']/@href").to_s
+        unless image_nodes.nil?
+          for image_node in image_nodes
+            image = FeedTools::Feed::Image.new
+            image.url = XPath.first(image_node, "url/text()").to_s
+            if image.url != ""
+              self.feed.bozo = true
             end
-            @itunes_image_link = @image_link
-          else
-            @image_link = @itunes_image_link            
+            if image.url == ""
+              image.url = XPath.first(image_node, "@rdf:resource").to_s
+            end
+            if image.url == "" && (image_node.name == "logo" ||
+                (image_node.attributes['type'] =~ /^image/) == 0)
+              image.url = XPath.first(image_node, "@href").to_s
+            end
+            if image.url == "" && image_node.name == "LOGO"
+              image.url = XPath.first(image_node, "@HREF").to_s
+            end
+            image.url.strip! unless image.url.nil?
+            image.url = nil if image.url == ""
+            image.title = XPath.first(image_node, "title/text()").to_s
+            image.title.strip! unless image.title.nil?
+            image.title = nil if image.title == ""
+            image.description =
+              XPath.first(image_node, "description/text()").to_s
+            image.description.strip! unless image.description.nil?
+            image.description = nil if image.description == ""
+            image.link = XPath.first(image_node, "link/text()").to_s
+            image.link.strip! unless image.link.nil?
+            image.link = nil if image.link == ""
+            image.height = XPath.first(image_node, "height/text()").to_s.to_i
+            image.height = nil if image.height <= 0
+            image.width = XPath.first(image_node, "width/text()").to_s.to_i
+            image.width = nil if image.width <= 0
+            image.style = XPath.first(image_node, "@style").to_s.downcase
+            if image.style == ""
+              image.style = XPath.first(image_node, "@STYLE").to_s.downcase
+            end
+            image.style.strip! unless image.style.nil?
+            image.style = nil if image.style == ""
+            @images << image
           end
         end
-        @image_link = FeedTools.normalize_url(@image_link)
       end
-      return @image_link
-    end
-
-    # Sets the feed image link
-    def image_link=(new_image_link)
-      @image_link = new_image_link
+      return @images
     end
-
+    
     # Returns the feed item itunes image link
     #
     # If it's not present, falls back to the normal image link.
@@ -2494,9 +2876,6 @@ module FeedTools
         if @itunes_image_link == ""
           @itunes_image_link = XPath.first(root_node, "itunes:link[@rel='image']/@href").to_s
         end
-        if @itunes_image_link == ""
-          @itunes_image_link = self.image_link
-        end
         @itunes_image_link = FeedTools.normalize_url(@itunes_image_link)
       end
       return @itunes_image_link
@@ -2514,9 +2893,6 @@ module FeedTools
       if @media_thumbnail_link.nil?
         # get the feed item itunes image link from the xml document
         @media_thumbnail_link = XPath.first(root_node, "media:thumbnail/@url").to_s
-        if @media_thumbnail_link == ""
-          @media_thumbnail_link = image_link
-        end
         @media_thumbnail_link = FeedTools.normalize_url(@media_thumbnail_link)
       end
       return @media_thumbnail_link
@@ -2527,6 +2903,21 @@ module FeedTools
       @media_thumbnail_link = new_media_thumbnail_link
     end
 
+    # Returns the feed item's copyright information
+    def copyright
+      if @copyright.nil?
+        @copyright = XPath.first(root_node, "dc:rights/text()").to_s
+        @copyright = FeedTools.sanitize_html(@copyright, :strip)
+        @copyright = nil if @copyright == ""
+      end
+      return @copyright
+    end
+
+    # Sets the feed item's copyright information
+    def copyright=(new_copyright)
+      @copyright = new_copyright
+    end
+
     # Returns all feed item enclosures
     def enclosures
       if @enclosures.nil?
@@ -2621,11 +3012,13 @@ module FeedTools
             end
             enclosure.categories = []
             for category in XPath.match(enclosure_node, "media:category")
-              enclosure.categories << EnclosureCategory.new(
-                FeedTools.unescape_entities(category.text),
-                FeedTools.unescape_entities(category.attributes["scheme"].to_s),
+              enclosure.categories << FeedTools::Feed::Category.new
+              enclosure.categories.last.term =
+                FeedTools.unescape_entities(category.text)
+              enclosure.categories.last.scheme =
+                FeedTools.unescape_entities(category.attributes["scheme"].to_s)
+              enclosure.categories.last.label =
                 FeedTools.unescape_entities(category.attributes["label"].to_s)
-              )
               if enclosure.categories.last.scheme == ""
                 enclosure.categories.last.scheme = nil
               end
@@ -2714,11 +3107,13 @@ module FeedTools
             if (enclosure.categories.nil? || enclosure.categories.size == 0)
               enclosure.categories = []
               for category in XPath.match(media_group, "media:category")
-                enclosure.categories << EnclosureCategory.new(
-                  FeedTools.unescape_entities(category.text),
-                  FeedTools.unescape_entities(category.attributes["scheme"].to_s),
+                enclosure.categories << FeedTools::Feed::Category.new
+                enclosure.categories.last.term =
+                  FeedTools.unescape_entities(category.text)
+                enclosure.categories.last.scheme =
+                  FeedTools.unescape_entities(category.attributes["scheme"].to_s)
+                enclosure.categories.last.label =
                   FeedTools.unescape_entities(category.attributes["label"].to_s)
-                )
                 if enclosure.categories.last.scheme == ""
                   enclosure.categories.last.scheme = nil
                 end
@@ -2880,7 +3275,7 @@ module FeedTools
       # if it's missing.
       if @enclosures.size == 1
         if @enclosures.first.duration.nil? || @enclosures.first.duration == 0
-          @enclosures.first.duration = self.duration
+          @enclosures.first.duration = self.itunes_duration
         end
       end
 
@@ -2910,6 +3305,10 @@ module FeedTools
           @author.raw = FeedTools.unescape_entities(
             XPath.first(root_node, "dc:author/text()").to_s)
         end
+        if @author.raw == ""
+          @author.raw = FeedTools.unescape_entities(
+            XPath.first(root_node, "managingEditor/text()").to_s)
+        end
         unless @author.raw == ""
           raw_scan = @author.raw.scan(
             /(.*)\((\b[A-Z0-9._%-\+]+@[A-Z0-9._%-]+\.[A-Z]{2,4}\b)\)/i)
@@ -2983,6 +3382,76 @@ module FeedTools
       end
     end
     
+    # Returns the feed publisher
+    def publisher
+      if @publisher.nil?
+        @publisher = FeedTools::Feed::Author.new
+
+        # Set the author name
+        @publisher.raw = FeedTools.unescape_entities(
+          XPath.first(root_node, "dc:publisher/text()").to_s)
+        if @publisher.raw == ""
+          @publisher.raw = FeedTools.unescape_entities(
+            XPath.first(root_node, "webMaster/text()").to_s)
+        end
+        unless @publisher.raw == ""
+          raw_scan = @publisher.raw.scan(
+            /(.*)\((\b[A-Z0-9._%-\+]+@[A-Z0-9._%-]+\.[A-Z]{2,4}\b)\)/i)
+          if raw_scan.nil? || raw_scan.size == 0
+            raw_scan = @publisher.raw.scan(
+              /(\b[A-Z0-9._%-\+]+@[A-Z0-9._%-]+\.[A-Z]{2,4}\b)\s*\((.*)\)/i)
+            unless raw_scan.size == 0
+              publisher_raw_pair = raw_scan.first.reverse
+            end
+          else
+            publisher_raw_pair = raw_scan.first
+          end
+          if raw_scan.nil? || raw_scan.size == 0
+            email_scan = @publisher.raw.scan(
+              /\b[A-Z0-9._%-\+]+@[A-Z0-9._%-]+\.[A-Z]{2,4}\b/i)
+            if email_scan != nil && email_scan.size > 0
+              @publisher.email = email_scan.first.strip
+            end
+          end
+          unless publisher_raw_pair.nil? || publisher_raw_pair.size == 0
+            @publisher.name = publisher_raw_pair.first.strip
+            @publisher.email = publisher_raw_pair.last.strip
+          else
+            unless @publisher.raw.include?("@")
+              # We can be reasonably sure we are looking at something
+              # that the creator didn't intend to contain an email address if
+              # it got through the preceeding regexes and it doesn't
+              # contain the tell-tale '@' symbol.
+              @publisher.name = @publisher.raw
+            end
+          end
+        end
+
+        @publisher.name = nil if @publisher.name == ""
+        @publisher.raw = nil if @publisher.raw == ""
+        @publisher.email = nil if @publisher.email == ""
+        @publisher.url = nil if @publisher.url == ""
+      end
+      return @publisher
+    end
+
+    # Sets the feed publisher
+    def publisher=(new_publisher)
+      if new_publisher.respond_to?(:name) &&
+          new_publisher.respond_to?(:email) &&
+          new_publisher.respond_to?(:url)
+        # It's a complete Author object, just set it.
+        @publisher = new_publisher
+      else
+        # We're not looking at an Author object, this is probably a string,
+        # default to setting the publisher's name.
+        if @publisher.nil?
+          @publisher = FeedTools::Feed::Author.new
+        end
+        @publisher.name = new_publisher
+      end
+    end
+    
     # Returns the contents of the itunes:author element
     #
     # This inherits from any incorrectly placed channel-level itunes:author
@@ -3026,10 +3495,6 @@ module FeedTools
       @itunes_duration = new_itunes_duration
     end
     
-    # Sets the itunes:summary
-    def itunes_summary=(new_itunes_summary)
-    end
-    
     # Returns the feed item time
     def time
       if @time.nil?
@@ -3054,6 +3519,32 @@ module FeedTools
       @time = new_time
     end
     
+    # Returns the url for posting comments
+    def comments
+      if @comments.nil?
+        @comments = XPath.first(root_node, "comments/text()").to_s
+        @comments = nil if @comments == ""
+      end
+      return @comments
+    end
+    
+    # Sets the url for posting comments
+    def comments=(new_comments)
+      @comments = new_comments
+    end
+    
+    # The source that this post was based on
+    def source
+      if @source.nil?
+        @source = FeedTools::Feed::Link.new
+        @source.url = XPath.first(root_node, "source/@url").to_s
+        @source.url = nil if @source.url == ""
+        @source.value = XPath.first(root_node, "source/text()").to_s
+        @source.value = nil if @source.value == ""
+      end
+      return @source
+    end
+        
     # Returns the feed item tags
     def tags
       # TODO: support the rel="tag" microformat
@@ -3131,7 +3622,7 @@ module FeedTools
               "itunes:explicit/text()").to_s.downcase == "yes" ||
             XPath.first(root_node,
               "itunes:explicit/text()").to_s.downcase == "true" ||
-            feed.explicit
+            feed.explicit?
           @explicit = true
         else
           @explicit = false
@@ -3152,8 +3643,13 @@ module FeedTools
     end
 
     # Generates xml based on the content of the feed item
-    def build_xml(feed_type=(self.feed.feed_type or "rss"), version=0.0,
+    def build_xml(feed_type=(self.feed.feed_type or "rss"), version=nil,
         xml_builder=Builder::XmlMarkup.new(:indent => 2))
+      if feed_type == "rss" && (version == nil || version == 0.0)
+        version = 1.0
+      elsif feed_type == "atom" && (version == nil || version == 0.0)
+        version = 0.3
+      end
       if feed_type == "rss" && (version == 0.9 || version == 1.0 || version == 1.1)
         # RDF-based rss format
         if link.nil?
@@ -3253,6 +3749,8 @@ module FeedTools
     alias_method :tagline=, :description=
     alias_method :subtitle, :description
     alias_method :subtitle=, :description=
+    alias_method :summary, :description
+    alias_method :summary=, :description=
     alias_method :abstract, :description
     alias_method :abstract=, :description=
     alias_method :content, :description
@@ -3264,12 +3762,26 @@ end
 
 module REXML # :nodoc:
   class Element # :nodoc:
-    def inner_xml # :nodoc:
-      result = ""
-      self.each_child do |child|
-        result << child.to_s
+    unless REXML::Element.public_instance_methods.include? :inner_xml
+      def inner_xml # :nodoc:
+        result = ""
+        self.each_child do |child|
+          result << child.to_s
+        end
+        return result
+      end
+    end
+    
+    unless REXML::Element.public_instance_methods.include? :base_uri
+      def base_uri # :nodoc:
+        if not attribute('xml:base')
+          return parent.base_uri
+        elsif parent
+          return URI.join(parent.base_uri, attribute('xml:base').value).to_s
+        else
+          return (attribute('xml:base').value or '')
+        end
       end
-      return result
     end
   end
 end