From 6acc50198e3303e7793aa95d3ec14e93b1579902 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas@lucas-nussbaum.net>
Date: Fri, 15 May 2009 18:01:57 +0200
Subject: prep release, config parsing fix

- prepared the release (still need to update the date)
- allowed to re-use substrings in the yaml config file (+ doc)
  thanks to Bernhard Stoeckner for the tip.
---
 ChangeLog                               | 9 ++++++++-
 data/doc/feed2imap/examples/feed2imaprc | 9 +++++++++
 lib/feed2imap/config.rb                 | 2 +-
 lib/feed2imap/feed2imap.rb              | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4eabcb1..768ac1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
-Feed2Imap 0.9.4 (XX/XX/2008)
+Feed2Imap 0.9.4 (10/05/2009)
 ============================
 * Warn (INFO level, so only displayed with feed2imap -v) if fetching a
   feed takes more than 10s, as this might cause massive delays
   in feed2imap run times.
+* Fix encoding of email headers
+* Only include images once when used several times in the same item
+* New version of Net::Imap
+* Use Message-Id instead of X-CacheIndex
+* Fix MIME formatting when including images
+* Require ruby-feedparser 0.7, better email formatting
+* Made it possible to re-use substrings in targets
 
 Feed2Imap 0.9.3 (23/07/2008)
 ============================
diff --git a/data/doc/feed2imap/examples/feed2imaprc b/data/doc/feed2imap/examples/feed2imaprc
index 508b79b..ca5c030 100644
--- a/data/doc/feed2imap/examples/feed2imaprc
+++ b/data/doc/feed2imap/examples/feed2imaprc
@@ -51,3 +51,12 @@ feeds:
     execurl: "wget -q -O /dev/stdout http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml"
     filter: "/home/lucas/lemonde_getbody"
     target: imap://luser:password@imap.apinc.org/INBOX.Feeds.LeMonde
+# It is also possible to reuse the same string in the target parameter:
+# target-refix: &target "imap://user:pass@host/rss."
+# feeds:
+#   - name: test1
+#     target: [ *target, 'test1' ]
+#     ...
+#   - name: test2
+#     target: [ *target, 'test2' ]
+#     ...
diff --git a/lib/feed2imap/config.rb b/lib/feed2imap/config.rb
index c0bf4ac..d8f3548 100644
--- a/lib/feed2imap/config.rb
+++ b/lib/feed2imap/config.rb
@@ -42,7 +42,7 @@ class F2IConfig
     @imap_accounts = ImapAccounts::new
     @conf['feeds'].each do |f|
       if f['disable'].nil?
-        uri = URI::parse(f['target'])
+        uri = URI::parse(f['target'].to_s)
         path = URI::unescape(uri.path)
         path = path[1..-1] if path[0,1] == '/'
         @feeds.push(ConfigFeed::new(f, @imap_accounts.add_account(uri), path, self))
diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb
index fb8fb12..d892eda 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.9.3'
+F2I_VERSION = '0.9.4'
 F2I_WARNFETCHTIME = 10
 
 require 'feed2imap/config'
-- 
cgit v1.2.3