feedtools 0.2.20 → 0.2.21

data/CHANGELOG

@@ -1,3 +1,7 @@
+== FeedTools 0.2.21
+ * fixed atom generation error
+ * added summary element to generated atom xml
+ * added warning message for improperly set up database tables
 == FeedTools 0.2.20
  * fixed some atom namespace bugs
  * added a summary method to feed items

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.20"
+FEED_TOOLS_VERSION = "0.2.21"
 
 FEED_TOOLS_NAMESPACES = {
   "admin" => "http://webns.net/mvcb/",
@@ -173,8 +173,7 @@ module FeedTools
         :url_normalization_enabled => true,
         :strip_comment_count => false,
         :max_ttl => 3.days.to_s,
-        :output_encoding => "utf-8",
-        :no_content_value => "[no description]"
+        :output_encoding => "utf-8"
       }.merge(config_hash)
     end
     return @configurations

data/lib/feed_tools/database_feed_cache.rb

@@ -90,7 +90,21 @@ module FeedTools
       end
       return true
     end
-  
+    
+    # False if there is an error of any kind
+    def DatabaseFeedCache.set_up_correctly?
+      begin
+        ActiveRecord::Base.connection
+        if !ActiveRecord::Base.configurations.nil? &&
+          !DatabaseFeedCache.table_exists?
+          return false
+        end
+      rescue Exception
+        return false
+      end
+      return true
+    end
+    
     # True if the appropriate database table already exists
     def DatabaseFeedCache.table_exists?
       begin

data/lib/feed_tools/feed.rb

@@ -177,6 +177,11 @@ module FeedTools
     # 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!
+      if !FeedTools.feed_cache.nil? &&
+          !FeedTools.feed_cache.set_up_correctly?
+        raise "Your feed cache system is incorrectly set up.  " +
+          "Please see the documentation for more information."
+      end
       if self.http_headers.blank? && !(self.cache_object.nil?) &&
           !(self.cache_object.http_headers.nil?)
         @http_headers = YAML.load(self.cache_object.http_headers)
@@ -2257,9 +2262,6 @@ module FeedTools
           unless description.blank?
             xml_builder.subtitle(self.subtitle,
                 "type" => "html")
-          else
-            xml_builder.subtitle(FeedTools.no_content_string,
-                "type" => "html")
           end
           if self.updated != nil
             xml_builder.updated(self.updated.iso8601)

data/lib/feed_tools/feed_item.rb

@@ -1958,11 +1958,12 @@ module FeedTools
                 "type" => "text/html",
                 "title" => FeedTools.escape_entities(title))
           end
-          if !description.blank?
-            xml_builder.content(description,
+          if !self.content.blank?
+            xml_builder.content(self.content,
                 "type" => "html")
-          elsif !FeedTools.configurations[:no_content_string].blank?
-            xml_builder.content(FeedTools.configurations[:no_content_string],
+          end
+          if !self.summary.blank?
+            xml_builder.content(self.summary,
                 "type" => "html")
           end
           if self.updated != nil

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'feedtools'
-PKG_VERSION   = '0.2.20'
+PKG_VERSION   = '0.2.21'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

data/test/unit/generation_test.rb

@@ -19,7 +19,7 @@ class GenerationTest < Test::Unit::TestCase
       item.content = "This is item number #{i}"
       item.link = "http://example.com/item#{i}/"
       feed.items << item
-      sleep(1)
+      sleep(0.5)
     end
     output_xml = feed.build_xml('rss', 2.0)
     
@@ -57,7 +57,7 @@ class GenerationTest < Test::Unit::TestCase
       item.content = "This is item number #{i}"
       item.link = "http://example.com/item#{i}/"
       feed.items << item
-      sleep(1)
+      sleep(0.5)
     end
     output_xml = feed.build_xml('rss', 1.0)
     
@@ -95,7 +95,7 @@ class GenerationTest < Test::Unit::TestCase
       item.content = "This is item number #{i}"
       item.link = "http://example.com/item#{i}/"
       feed.items << item
-      sleep(1)
+      sleep(0.5)
     end
     output_xml = feed.build_xml('atom', 1.0)
     
@@ -121,4 +121,115 @@ class GenerationTest < Test::Unit::TestCase
     assert_equal('atom', parsed_feed.feed_type)
     assert_equal(1.0, parsed_feed.feed_version)
   end
+  
+  def test_generate_rss_with_no_content
+    feed = FeedTools::Feed.new
+    feed.title = 'Test Feed'
+    feed.subtitle = nil
+    feed.link = 'http://example.com/'
+    3.times do |i|
+      item = FeedTools::FeedItem.new
+      item.content = nil
+      item.link = "http://example.com/item#{i}/"
+      feed.items << item
+      sleep(0.5)
+    end
+    output_xml = feed.build_xml('rss', 2.0)
+
+    # Now read it back in
+    parsed_feed = FeedTools::Feed.new
+    parsed_feed.feed_data = output_xml
+    parsed_feed.feed_data_type = :xml
+    
+    assert_equal('Test Feed', parsed_feed.title)
+    assert_equal(nil, parsed_feed.description)
+    assert_equal('http://example.com/', parsed_feed.link)
+    
+    # Note reverse chronological order
+    assert_equal(nil, parsed_feed.items[0].content)
+    assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
+    assert_equal(nil, parsed_feed.items[1].content)
+    assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
+    assert_equal(nil, parsed_feed.items[2].content)
+    assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
+    
+    # Check feed information
+    assert_equal(:xml, parsed_feed.feed_data_type)
+    assert_equal('rss', parsed_feed.feed_type)
+    assert_equal(2.0, parsed_feed.feed_version)
+  end
+  
+  def test_generate_rdf_with_no_content
+    feed = FeedTools::Feed.new
+    feed.title = 'Test Feed'
+    feed.subtitle = nil
+    feed.link = 'http://example.com/'
+    3.times do |i|
+      item = FeedTools::FeedItem.new
+      item.content = nil
+      item.link = "http://example.com/item#{i}/"
+      feed.items << item
+      sleep(0.5)
+    end
+    output_xml = feed.build_xml('rss', 1.0)
+
+    # Now read it back in
+    parsed_feed = FeedTools::Feed.new
+    parsed_feed.feed_data = output_xml
+    parsed_feed.feed_data_type = :xml
+    
+    assert_equal('Test Feed', parsed_feed.title)
+    assert_equal(nil, parsed_feed.description)
+    assert_equal('http://example.com/', parsed_feed.link)
+    
+    # Note reverse chronological order
+    assert_equal(nil, parsed_feed.items[0].content)
+    assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
+    assert_equal(nil, parsed_feed.items[1].content)
+    assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
+    assert_equal(nil, parsed_feed.items[2].content)
+    assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
+    
+    # Check feed information
+    assert_equal(:xml, parsed_feed.feed_data_type)
+    assert_equal('rss', parsed_feed.feed_type)
+    assert_equal(1.0, parsed_feed.feed_version)
+  end
+  
+  def test_generate_atom_with_no_content
+    feed = FeedTools::Feed.new
+    feed.title = 'Test Feed'
+    feed.subtitle = nil
+    feed.link = 'http://example.com/'
+    3.times do |i|
+      item = FeedTools::FeedItem.new
+      item.content = nil
+      item.link = "http://example.com/item#{i}/"
+      feed.items << item
+      sleep(0.5)
+    end
+    output_xml = feed.build_xml('atom', 1.0)
+
+    # Now read it back in
+    parsed_feed = FeedTools::Feed.new
+    parsed_feed.feed_data = output_xml
+    parsed_feed.feed_data_type = :xml
+    
+    assert_equal('Test Feed', parsed_feed.title)
+    assert_equal(nil, parsed_feed.description)
+    assert_equal('http://example.com/', parsed_feed.link)
+    
+    # Note reverse chronological order
+    assert_equal(nil, parsed_feed.items[0].content)
+    assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
+    assert_equal(nil, parsed_feed.items[1].content)
+    assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
+    assert_equal(nil, parsed_feed.items[2].content)
+    assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
+    
+    # Check feed information
+    assert_equal(:xml, parsed_feed.feed_data_type)
+    assert_equal('atom', parsed_feed.feed_type)
+    assert_equal(1.0, parsed_feed.feed_version)
+  end
 end

metadata

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