feedtools 0.2.17 → 0.2.18

data/CHANGELOG

@@ -1,3 +1,11 @@
+== FeedTools 0.2.18
+ * no longer ever polls more often than once every 30 minutes
+ * fixed overlooked improperly refactored enclosure code
+ * fixed issue with inner_xml incorrectly handling xml comments
+ * added helper modules
+ * test cases now implemented using helpers
+ * fixed issue with timeouts
+ * fixed stack overflow while estimating timestamps
 == FeedTools 0.2.17
  * more fixes for timestamping of feed items
  * fixed nil bug in root_node, feed_type, feed_version, build_xml

data/lib/feed_tools.rb

@@ -32,13 +32,13 @@ FEED_TOOLS_ENV = ENV['FEED_TOOLS_ENV'] ||
                  ENV['RAILS_ENV'] ||
                  'production' # :nodoc:
 
-FEED_TOOLS_VERSION = "0.2.17"
+FEED_TOOLS_VERSION = "0.2.18"
 
 FEED_TOOLS_NAMESPACES = {
   "admin" => "http://webns.net/mvcb/",
   "ag" => "http://purl.org/rss/1.0/modules/aggregation/",
   "annotate" => "http://purl.org/rss/1.0/modules/annotate/",
-  "atom" => "http://www.w3.org/2005/Atom",
+  "atom10" => "http://www.w3.org/2005/Atom",
   "atom03" => "http://purl.org/atom/ns#",
   "audio" => "http://media.tangent.org/rss/1.0/",
   "blogChannel" => "http://backend.userland.com/blogChannelModule",
@@ -123,6 +123,7 @@ begin
   require 'cgi'
   require 'pp'
   require 'yaml'
+  require 'base64'
 
   require_gem('activerecord', '>= 1.10.1')
   require_gem('uuidtools', '>= 0.1.2')
@@ -611,25 +612,42 @@ module FeedTools
   end
   
   # Creates a merged "planet" feed from a set of urls.
-  def FeedTools.build_merged_feed(url_array)
+  #
+  # Options are:
+  # * <tt>:multi_threaded</tt> - If set to true, feeds will
+  #   be retrieved concurrently.  Not recommended when used
+  #   in conjunction with the DatabaseFeedCache as it will
+  #   open multiple connections to the database.
+  def FeedTools.build_merged_feed(url_array, options = {})
+    validate_options([ :multi_threaded ],
+                     options.keys)
+    options = { :multi_threaded => false }.merge(options)
     return nil if url_array.nil?
     merged_feed = FeedTools::Feed.new
     retrieved_feeds = []
-    feed_threads = []
-    url_array.each do |feed_url|
-      feed_threads << Thread.new do
+    if options[:multi_threaded]
+      feed_threads = []
+      url_array.each do |feed_url|
+        feed_threads << Thread.new do
+          feed = Feed.open(feed_url)
+          retrieved_feeds << feed
+        end
+      end
+      feed_threads.each do |thread|
+        thread.join
+      end
+    else
+      url_array.each do |feed_url|
         feed = Feed.open(feed_url)
         retrieved_feeds << feed
       end
     end
-    feed_threads.each do |thread|
-      thread.join
-    end
     retrieved_feeds.each do |feed|
       merged_feed.entries.concat(
         feed.entries.collect do |entry|
-          entry.title = "#{feed.title}: #{entry.title}"
-          entry
+          new_entry = entry.dup
+          new_entry.title = "#{feed.title}: #{entry.title}"
+          new_entry
         end )
     end
     return merged_feed
@@ -642,7 +660,11 @@ module REXML # :nodoc:
       def inner_xml # :nodoc:
         result = ""
         self.each_child do |child|
-          result << child.to_s
+          if child.kind_of? REXML::Comment
+            result << "<!--" + child.to_s + "-->"
+          else
+            result << child.to_s
+          end
         end
         return result
       end

data/lib/feed_tools/database_feed_cache.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2005 Robert Aman
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 #= database_feed_cache.rb
 #
 # The <tt>DatabaseFeedCache</tt> is the default caching mechanism for
@@ -22,6 +45,7 @@ module FeedTools
     def DatabaseFeedCache.initialize_cache
       # Establish a connection if we don't already have one
       begin
+        ActiveRecord::Base.default_timezone = :utc
         ActiveRecord::Base.connection
       rescue
         begin

data/lib/feed_tools/feed.rb

@@ -1,7 +1,38 @@
+#--
+# Copyright (c) 2005 Robert Aman
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'feed_tools/helpers/generic_helper'
+
 module FeedTools
   # The <tt>FeedTools::Feed</tt> class represents a web feed's structure.
-  class Feed    
-    include REXML # :nodoc:
+  class Feed
+    # :stopdoc:
+    include REXML
+    class << self
+      include GenericHelper
+      private :validate_options
+    end
+    # :startdoc:
   
     # Represents a feed/feed item's category
     class Category
@@ -115,17 +146,7 @@ module FeedTools
       @items = nil
       @live = false
     end
-  
-    # Raises an exception if an invalid option has been specified to
-    # prevent misspellings from slipping through 
-    def Feed.validate_options(valid_option_keys, supplied_option_keys)
-      unknown_option_keys = supplied_option_keys - valid_option_keys
-      unless unknown_option_keys.empty?
-        raise ArgumentError, "Unknown options: #{unknown_option_keys}"
-      end
-    end
-    class << self; private :validate_options; end
-  
+          
     # Loads the feed specified by the url, pulling the data from the
     # cache if it hasn't expired.
     # Options are:
@@ -319,6 +340,8 @@ module FeedTools
             end
           rescue SocketError
             raise FeedAccessError, 'Socket error prevented feed retrieval'
+          rescue Timeout::Error
+            raise FeedAccessError, 'Timeout while attempting to retrieve feed'
           end
         end
       
@@ -699,9 +722,16 @@ module FeedTools
         unless channel_node.nil?
           @id = XPath.first(channel_node, "id/text()").to_s
           if @id == ""
-            @id = XPath.first(channel_node, "atom:id/text()",
+            @id = XPath.first(channel_node, "atom10:id/text()",
+              FEED_TOOLS_NAMESPACES).to_s
+          end
+          if @id == ""
+            @id = XPath.first(channel_node, "atom03:id/text()",
               FEED_TOOLS_NAMESPACES).to_s
           end
+          if @id == ""
+            @id = XPath.first(channel_node, "atom:id/text()").to_s
+          end
           if @id == ""
             @id = XPath.first(channel_node, "guid/text()").to_s
           end
@@ -711,9 +741,16 @@ module FeedTools
             @id = XPath.first(root_node, "id/text()").to_s
           end
           if @id == ""
-            @id = XPath.first(root_node, "atom:id/text()",
+            @id = XPath.first(channel_node, "atom10:id/text()",
+              FEED_TOOLS_NAMESPACES).to_s
+          end
+          if @id == ""
+            @id = XPath.first(channel_node, "atom03:id/text()",
               FEED_TOOLS_NAMESPACES).to_s
           end
+          if @id == ""
+            @id = XPath.first(channel_node, "atom:id/text()").to_s
+          end
           if @id == ""
             @id = XPath.first(root_node, "guid/text()").to_s
           end
@@ -757,7 +794,7 @@ module FeedTools
           @url = nil if @url == ""
         end
         if override_url.call
-          @url = XPath.first(channel_node, "atom:link[@rel='self']/@href",
+          @url = XPath.first(channel_node, "atom10:link[@rel='self']/@href",
             FEED_TOOLS_NAMESPACES).to_s
           @url = nil if @url == ""
         end
@@ -805,7 +842,22 @@ module FeedTools
       if @title.nil?
         unless channel_node.nil?
           repair_entities = false
-          title_node = XPath.first(channel_node, "title")
+          title_node = XPath.first(channel_node, "atom10:title",
+            FEED_TOOLS_NAMESPACES)
+          if title_node.nil?
+            title_node = XPath.first(channel_node, "title")
+          end
+          if title_node.nil?
+            title_node = XPath.first(channel_node, "atom03:title",
+              FEED_TOOLS_NAMESPACES)
+          end
+          if title_node.nil?
+            title_node = XPath.first(channel_node, "atom:title")
+          end
+          if title_node.nil?
+            title_node = XPath.first(channel_node, "dc:title",
+              FEED_TOOLS_NAMESPACES)
+          end
           if title_node.nil?
             title_node = XPath.first(channel_node, "dc:title")
           end
@@ -816,16 +868,21 @@ module FeedTools
         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_type = XPath.first(title_node, "@type").to_s
+        title_mode = XPath.first(title_node, "@mode").to_s
+        title_encoding = XPath.first(title_node, "@encoding").to_s
+        
+        # Note that we're checking for misuse of type, mode and encoding here
+        if title_type == "base64" || title_mode == "base64" ||
+            title_encoding == "base64"
+          @title = Base64.decode64(title_node.inner_xml.strip)
+        elsif title_type == "xhtml" || title_mode == "xhtml" ||
+            title_type == "xml" || title_mode == "xml" ||
+            title_type == "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"
+        elsif title_type == "escaped" || title_mode == "escaped"
           @title = FeedTools.unescape_entities(
-            XPath.first(title_node, "text()").to_s)
+            title_node.inner_xml)
         else
           @title = title_node.inner_xml
           repair_entities = true
@@ -900,27 +957,29 @@ module FeedTools
         if description_node.nil?
           return nil
         end
-        unless description_node.nil?
-          if XPath.first(description_node, "@encoding").to_s != ""
-            @description =
-              "[Embedded data objects are not currently supported.]"
-          elsif description_node.cdatas.size > 0
-            @description = description_node.cdatas.first.value
-          elsif XPath.first(description_node, "@type").to_s == "xhtml" || 
-              XPath.first(description_node, "@mode").to_s == "xhtml" ||
-              XPath.first(description_node, "@type").to_s == "xml" || 
-              XPath.first(description_node, "@mode").to_s == "xml" ||
-              XPath.first(description_node, "@type").to_s ==
-                "application/xhtml+xml"
-            @description = description_node.inner_xml
-          elsif XPath.first(description_node, "@type").to_s == "escaped" ||
-              XPath.first(description_node, "@mode").to_s == "escaped"
-            @description = FeedTools.unescape_entities(
-              description_node.inner_xml)
-          else
-            @description = description_node.inner_xml
-            repair_entities = true
-          end
+        description_type = XPath.first(description_node, "@type").to_s
+        description_mode = XPath.first(description_node, "@mode").to_s
+        description_encoding = XPath.first(description_node, "@encoding").to_s
+
+        # Note that we're checking for misuse of type, mode and encoding here
+        if description_encoding != ""
+          @description =
+            "[Embedded data objects are not currently supported.]"
+        elsif description_node.cdatas.size > 0
+          @description = description_node.cdatas.first.value
+        elsif description_type == "base64" || description_mode == "base64" ||
+            description_encoding == "base64"
+          @description = Base64.decode64(description_node.inner_xml.strip)
+        elsif description_type == "xhtml" || description_mode == "xhtml" ||
+            description_type == "xml" || description_mode == "xml" ||
+            description_type == "application/xhtml+xml"
+          @description = description_node.inner_xml
+        elsif description_type == "escaped" || description_mode == "escaped"
+          @description = FeedTools.unescape_entities(
+            description_node.inner_xml)
+        else
+          @description = description_node.inner_xml
+          repair_entities = true
         end
         if @description == ""
           @description = self.itunes_summary
@@ -1106,18 +1165,34 @@ module FeedTools
       if @author.nil?
         @author = FeedTools::Feed::Author.new
         unless channel_node.nil?
-          author_node = XPath.first(channel_node, "author")
+          author_node = XPath.first(channel_node, "atom10:author",
+            FEED_TOOLS_NAMESPACES)
+          if author_node.nil?
+            author_node = XPath.first(channel_node, "atom03:author",
+              FEED_TOOLS_NAMESPACES)
+          end
+          if author_node.nil?
+            author_node = XPath.first(channel_node, "atom:author")
+          end
+          if author_node.nil?
+            author_node = XPath.first(channel_node, "author")
+          end
           if author_node.nil?
             author_node = XPath.first(channel_node, "managingEditor")
           end
+          if author_node.nil?
+            author_node = XPath.first(channel_node, "dc:author",
+              FEED_TOOLS_NAMESPACES)
+          end
           if author_node.nil?
             author_node = XPath.first(channel_node, "dc:author")
           end
           if author_node.nil?
-            author_node = XPath.first(channel_node, "dc:creator")
+            author_node = XPath.first(channel_node, "dc:creator",
+              FEED_TOOLS_NAMESPACES)
           end
           if author_node.nil?
-            author_node = XPath.first(channel_node, "atom:author")
+            author_node = XPath.first(channel_node, "dc:creator")
           end
         end
         unless author_node.nil?
@@ -1316,7 +1391,7 @@ module FeedTools
         end
         begin
           if time_string != nil && time_string != ""
-            @time = Time.parse(time_string)
+            @time = Time.parse(time_string).gmtime
           else
             @time = Time.now.gmtime
           end
@@ -1342,7 +1417,7 @@ module FeedTools
           end
         end
         if updated_string != nil && updated_string != ""
-          @updated = Time.parse(updated_string) rescue nil
+          @updated = Time.parse(updated_string).gmtime rescue nil
         else
           @updated = nil
         end
@@ -1371,7 +1446,7 @@ module FeedTools
           end
         end
         if issued_string != nil && issued_string != ""
-          @issued = Time.parse(issued_string) rescue nil
+          @issued = Time.parse(issued_string).gmtime rescue nil
         else
           @issued = nil
         end
@@ -1400,7 +1475,7 @@ module FeedTools
           end
         end
         if published_string != nil && published_string != ""
-          @published = Time.parse(published_string) rescue nil
+          @published = Time.parse(published_string).gmtime rescue nil
         else
           @published = nil
         end
@@ -1531,20 +1606,70 @@ module FeedTools
     # Returns the feed's copyright information
     def copyright
       if @copyright.nil?
-        unless channel_node.nil?
-          @copyright = XPath.first(channel_node, "copyright/text()").to_s
-          if @copyright == ""
-            @copyright = XPath.first(channel_node, "rights/text()").to_s
+        unless root_node.nil?
+          repair_entities = false
+          copyright_node = XPath.first(channel_node, "dc:rights")
+          if copyright_node.nil?
+            copyright_node = XPath.first(channel_node, "dc:rights",
+              FEED_TOOLS_NAMESPACES)
+          end
+          if copyright_node.nil?
+            copyright_node = XPath.first(channel_node, "rights",
+              FEED_TOOLS_NAMESPACES)
           end
-          if @copyright == ""
-            @copyright = XPath.first(channel_node, "dc:rights/text()").to_s
+          if copyright_node.nil?
+            copyright_node = XPath.first(channel_node, "copyright",
+              FEED_TOOLS_NAMESPACES)
           end
-          if @copyright == ""
-            @copyright = XPath.first(channel_node, "copyrights/text()").to_s
+          if copyright_node.nil?
+            copyright_node = XPath.first(channel_node, "atom03:copyright",
+              FEED_TOOLS_NAMESPACES)
           end
+          if copyright_node.nil?
+            copyright_node = XPath.first(channel_node, "atom10:copyright",
+              FEED_TOOLS_NAMESPACES)
+          end
+          if copyright_node.nil?
+            copyright_node = XPath.first(channel_node, "copyrights",
+              FEED_TOOLS_NAMESPACES)
+          end
+        end
+        if copyright_node.nil?
+          return nil
+        end
+        copyright_type = XPath.first(copyright_node, "@type").to_s
+        copyright_mode = XPath.first(copyright_node, "@mode").to_s
+        copyright_encoding = XPath.first(copyright_node, "@encoding").to_s
+
+        # Note that we're checking for misuse of type, mode and encoding here
+        if copyright_encoding != ""
+          @copyright =
+            "[Embedded data objects are not currently supported.]"
+        elsif copyright_node.cdatas.size > 0
+          @copyright = copyright_node.cdatas.first.value
+        elsif copyright_type == "base64" || copyright_mode == "base64" ||
+            copyright_encoding == "base64"
+          @copyright = Base64.decode64(copyright_node.inner_xml.strip)
+        elsif copyright_type == "xhtml" || copyright_mode == "xhtml" ||
+            copyright_type == "xml" || copyright_mode == "xml" ||
+            copyright_type == "application/xhtml+xml"
+          @copyright = copyright_node.inner_xml
+        elsif copyright_type == "escaped" || copyright_mode == "escaped"
+          @copyright = FeedTools.unescape_entities(
+            copyright_node.inner_xml)
+        else
+          @copyright = copyright_node.inner_xml
+          repair_entities = true
+        end
+
+        unless @copyright.nil?
           @copyright = FeedTools.sanitize_html(@copyright, :strip)
-          @copyright = nil if @copyright == ""
+          @copyright = FeedTools.unescape_entities(@copyright) if repair_entities
+          @copyright = FeedTools.tidy_html(@copyright)
         end
+
+        @copyright = @copyright.strip unless @copyright.nil?
+        @copyright = nil if @copyright == ""
       end
       return @copyright
     end
@@ -1596,15 +1721,16 @@ module FeedTools
                 @time_to_live = update_frequency.to_i.year
               elsif update_frequency.to_i >= 3000
                 # Normally, this should default to minutes, but realistically,
-                # if they meant minutes, you're rarely going to see a value higher
-                # than 120.  If we see >= 3000, we're either dealing with a stupid
-                # pseudo-spec that decided to use seconds, or we're looking at
-                # someone who only has weekly updated content.  Worst case, we
-                # misreport the time, and we update too often.  Best case, we
-                # avoid accidentally updating the feed only once a year.  In the
-                # interests of being pragmatic, and since the problem we avoid
-                # is a far greater one than the one we cause, just run the check
-                # and hope no one actually gets hurt.
+                # if they meant minutes, you're rarely going to see a value
+                # higher than 120.  If we see >= 3000, we're either dealing
+                # with a stupid pseudo-spec that decided to use seconds, or
+                # we're looking at someone who only has weekly updated
+                # content.  Worst case, we misreport the time, and we update
+                # too often.  Best case, we avoid accidentally updating the
+                # feed only once a year.  In the interests of being pragmatic,
+                # and since the problem we avoid is a far greater one than
+                # the one we cause, just run the check and hope no one
+                # actually gets hurt.
                 @time_to_live = update_frequency.to_i
               else
                 @time_to_live = update_frequency.to_i.minute
@@ -1628,7 +1754,8 @@ module FeedTools
               @time_to_live = @time_to_live + update_frequency_hours.to_i.hour
             end
             if update_frequency_minutes != ""
-              @time_to_live = @time_to_live + update_frequency_minutes.to_i.minute
+              @time_to_live = @time_to_live +
+                update_frequency_minutes.to_i.minute
             end
             if update_frequency_seconds != ""
               @time_to_live = @time_to_live + update_frequency_seconds.to_i
@@ -1790,7 +1917,6 @@ module FeedTools
             new_item = FeedItem.new
             new_item.feed_data = item_node.to_s
             new_item.feed_data_type = self.feed_data_type
-            new_item.feed = self
             @items << new_item
           end
         end
@@ -1802,9 +1928,30 @@ module FeedTools
       end
       return @items
     end
+
+    # Sets the items array to a new array.
+    def items=(new_items)
+      for item in new_items
+        unless item.kind_of? FeedTools::FeedItem
+          raise ArgumentError,
+            "You should only add FeedItem objects to the items array."
+        end
+      end
+      @items = new_items
+    end
+    
+    # Syntactic sugar for appending feed items to a feed.
+    def <<(new_item)
+      @items ||= []
+      unless new_item.kind_of? FeedTools::FeedItem
+        raise ArgumentError,
+          "You should only add FeedItem objects to the items array."
+      end
+      @items << new_item
+    end
   
-    # The time that the feed was last requested from the remote server.  Nil if it has
-    # never been pulled, or if it was created from scratch.
+    # The time that the feed was last requested from the remote server.  Nil
+    # if it has never been pulled, or if it was created from scratch.
     def last_retrieved
       unless self.cache_object.nil?
         @last_retrieved = self.cache_object.last_retrieved
@@ -1850,8 +1997,13 @@ module FeedTools
     # True if the feed has expired and must be reacquired from the remote
     # server.
     def expired?
-      return self.last_retrieved == nil ||
-        (self.last_retrieved + self.time_to_live) < Time.now.gmtime
+      if (self.last_retrieved == nil)
+        return true
+      elsif (self.time_to_live < 30.minutes)
+        return (self.last_retrieved + 30.minutes) < Time.now.gmtime
+      else
+        return (self.last_retrieved + self.time_to_live) < Time.now.gmtime
+      end
     end
   
     # Forces this feed to expire.
@@ -1914,16 +2066,19 @@ module FeedTools
               xml_builder.tag!("dc:language", language)
             end
             xml_builder.tag!("syn:updatePeriod", "hourly")
-            xml_builder.tag!("syn:updateFrequency", (time_to_live / 1.hour).to_s)
+            xml_builder.tag!("syn:updateFrequency",
+              (time_to_live / 1.hour).to_s)
             xml_builder.tag!("syn:updateBase", Time.mktime(1970).iso8601)
             xml_builder.items do
               xml_builder.tag!("rdf:Seq") do
                 unless items.nil?
                   for item in items
                     if item.link.nil?
-                      raise "Cannot generate an rdf-based feed with a nil item link field."
+                      raise "Cannot generate an rdf-based feed with a nil " +
+                        "item link field."
                     end
-                    xml_builder.tag!("rdf:li", "rdf:resource" => CGI.escapeHTML(item.link))
+                    xml_builder.tag!("rdf:li", "rdf:resource" =>
+                      CGI.escapeHTML(item.link))
                   end
                 end
               end
@@ -1939,7 +2094,8 @@ module FeedTools
               end
             end
             best_image = images.first if best_image.nil?
-            xml_builder.image("rdf:about" => CGI.escapeHTML(best_image.url)) do
+            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 != ""
@@ -2040,7 +2196,7 @@ module FeedTools
         end
       elsif feed_type == "atom" && version == 1.0
         # normal atom format
-        return xml_builder.feed("xmlns" => FEED_TOOLS_NAMESPACES['atom'],
+        return xml_builder.feed("xmlns" => FEED_TOOLS_NAMESPACES['atom10'],
             "xml:lang" => language) do
           unless title.nil? || title == ""
             xml_builder.title(title,