From fc53a6dca11ba46317deead9e3d308305c06b6f5 Mon Sep 17 00:00:00 2001
From: lnu <lnu@f70e237a-67f3-0310-a06c-d2b8a7116972>
Date: Wed, 11 Jan 2006 12:29:53 +0000
Subject: prepared release of 0.6

git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@78 f70e237a-67f3-0310-a06c-d2b8a7116972
---
 ChangeLog                    |  5 +++--
 Rakefile                     |  2 +-
 lib/feed2imap/feed2imap.rb   |  2 +-
 lib/feed2imap/httpfetcher.rb |  5 ++++-
 test/tc_cache.rb             | 16 ++++++++--------
 test/tc_mail.rb              |  1 -
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e291544..9333bfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
-Feed2Imap 0.6 (XX/01/2006)
+Feed2Imap 0.6 (11/01/2006)
 ============================
 * Moved the RSS/Atom parser to a separate library (ruby-feedparser).
 * Locks the Cache file to avoid concurrent instances of feed2imap.
 * Issue a warning if the config file is world readable.
-* Fixed a small bug in Atom feeds parsing. And found a bug in Dotclear.
+* Fixed a small bug in Atom feeds parsing.
 * Fix another bug related to escaped HTML.
+* Minor fixes.
 
 Feed2Imap 0.5 (19/09/2005)
 ============================
diff --git a/Rakefile b/Rakefile
index dd1c10f..25559c2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,7 +16,7 @@ Rake::RDocTask.new do |rd|
 	rd.rdoc_dir = 'rdoc'
 end
 
-Rake::PackageTask.new('feed2imap', '0.5') do |p|
+Rake::PackageTask.new('feed2imap', '0.6') do |p|
 	p.need_tar = true
 	p.package_files.include('ChangeLog', 'README', 'COPYING', 'setup.rb',
 	'Rakefile', 'data/doc/feed2imap/*/*', 'data/man/*/*', 'bin/feed2imap*',
diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb
index 78a443c..b0eff19 100644
--- a/lib/feed2imap/feed2imap.rb
+++ b/lib/feed2imap/feed2imap.rb
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 =end
 
 # Feed2Imap version
-F2I_VERSION = '0.5.1'
+F2I_VERSION = '0.6'
 
 require 'feed2imap/config'
 require 'feed2imap/cache'
diff --git a/lib/feed2imap/httpfetcher.rb b/lib/feed2imap/httpfetcher.rb
index c72fc32..c7a92c7 100644
--- a/lib/feed2imap/httpfetcher.rb
+++ b/lib/feed2imap/httpfetcher.rb
@@ -33,7 +33,10 @@ MAXREDIR = 5
 class HTTPFetcher
   def HTTPFetcher::fetcher(baseuri, uri, lastcheck, recursion)
     http = Net::HTTP::new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == 'https'
+    if uri.scheme == 'https'
+      http.use_ssl = true 
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
     if defined?(Feed2Imap)
       useragent = "Feed2Imap v#{Feed2Imap.version} http://home.gna.org/feed2imap/"
     else
diff --git a/test/tc_cache.rb b/test/tc_cache.rb
index e03d81f..9877941 100755
--- a/test/tc_cache.rb
+++ b/test/tc_cache.rb
@@ -4,7 +4,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'test/unit'
 require 'feed2imap/cache'
-require 'feed2imap/channel'
+require 'feedparser'
 require 'pp'
 
 class ItemCacheTest < Test::Unit::TestCase
@@ -25,15 +25,15 @@ class ItemCacheTest < Test::Unit::TestCase
     c = ItemCache::new
     assert_equal(0, c.nbchannels)
     assert_equal(0, c.nbitems)
-    i1 = Item::new
+    i1 = FeedParser::FeedItem::new
     i1.title = 'title1'
     i1.link = 'link1'
     i1.content = 'content1'
-    i2 = Item::new
+    i2 = FeedParser::FeedItem::new
     i2.title = 'title2'
     i2.link = 'link2'
     i2.content = 'content2'
-    i3 = Item::new
+    i3 = FeedParser::FeedItem::new
     i3.title = 'title3'
     i3.link = 'link3'
     i3.content = 'content3'
@@ -47,11 +47,11 @@ class ItemCacheTest < Test::Unit::TestCase
     c = ItemCache::new
     assert_equal(0, c.nbchannels)
     assert_equal(0, c.nbitems)
-    i1 = Item::new
+    i1 = FeedParser::FeedItem::new
     i1.title = 'title1'
     i1.link = 'link1'
     i1.content = 'content1'
-    i2 = Item::new
+    i2 = FeedParser::FeedItem::new
     i2.title = 'title2'
     i2.link = 'link2'
     i2.content = 'content2'
@@ -62,7 +62,7 @@ class ItemCacheTest < Test::Unit::TestCase
     idx2 = i2.cacheditem.index
     assert_equal(1, idx2)
     c.commit_cache('id')
-    i3 = Item::new
+    i3 = FeedParser::FeedItem::new
     i3.title = 'title 1 - updated'
     i3.link = 'link1'
     i3.content = 'content1'
@@ -70,7 +70,7 @@ class ItemCacheTest < Test::Unit::TestCase
     assert_equal([], news)
     assert_equal([i3], updated)
     assert_equal(idx1, i3.cacheditem.index)
-    i4 = Item::new
+    i4 = FeedParser::FeedItem::new
     i4.title = 'title 1 - updated'
     i4.link = 'link1'
     i4.content = 'content1 - modified'
diff --git a/test/tc_mail.rb b/test/tc_mail.rb
index 3b700df..de80f9c 100755
--- a/test/tc_mail.rb
+++ b/test/tc_mail.rb
@@ -3,7 +3,6 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'test/unit'
-require 'feed2imap/channel'
 require 'rmail'
 
 class MailTest < Test::Unit::TestCase
-- 
cgit v1.2.3-54-g00ecf