feed2imap 1.2.7 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ff9f4bc81dc363b9eaff51d7ff5bbb490c2822da0c89601fbc45f39681c583
-  data.tar.gz: 6cbb2410faa8458dd2a42993e70c94f4a196cf6180229dccead089fbcf71f339
+  metadata.gz: 6a8d75ff963e56a991f8180012db653147c9e2b4520565916c94083ad160f3b6
+  data.tar.gz: 68992f2ae03c5f3c29763c4fd2becb2912e94c8d47d607230b0ec21b40c9b136
 SHA512:
-  metadata.gz: 5ec1cd00ebbbeb6dbce69a9a580e97fea285d421b809c3cb047b0fd66fb2a59445f3abd12a32ce0b1617c032901a943858743492b6440a2200121ac49a627c84
-  data.tar.gz: 3a2c0123fcc6dac7847e2bd3ddd6bfdf76df19d26b2e7e6e1b5b3a586e4465cae2cd46645831a659b5ad55ef40d9c215ef35bd2c032e135f7290f6e69c6a256d
+  metadata.gz: 676f9c559b6ff084c3da469a8df713677b65399702c32e8e995f14f0b5f5de818ca50b54c1814034aa9b07722c130e48357d012f2110b154913d0742c085a45c
+  data.tar.gz: 38dcbc31f225873dbf22907682edbd7e7114e10a95ffb30bdf335f459849910e34052326202181e1b37a740c801b1dc7c1ca05d614df34ca71a55b7a61103fc6

data/Rakefile

@@ -9,7 +9,7 @@ task :default => [:test]
 
 PKG_NAME = 'feed2imap'
 PKG_VERSION = Feed2Imap::VERSION
-PKG_FILES = [ 'ChangeLog', 'README', 'COPYING', 'setup.rb', 'Rakefile']
+PKG_FILES = [ 'ChangeLog', 'README', 'COPYING', 'Rakefile']
 Find.find('bin/', 'lib/', 'test/', 'data/') do |f|
   if FileTest.directory?(f) and f =~ /\.svn/
     Find.prune
@@ -68,6 +68,7 @@ rescue LoadError
   puts "Will not generate gem."
 end
 
+desc 'Makes a new release'
 task :release => :repackage do
   sh 'git', 'tag', '--sign', 'v' + PKG_VERSION
   sh 'git', 'push'

data/lib/feed2imap/config.rb

@@ -40,7 +40,7 @@ class F2IConfig
   # Load the configuration from the IO stream
   # TODO should do some sanity check on the data read.
   def initialize(io)
-    @conf = YAML::load(io)
+    @conf = YAML::load(io, aliases: true)
     @cache = @conf['cache'] || DEFCACHE
     @dumpdir = @conf['dumpdir'] || nil
     @conf['feeds'] ||= []

data/lib/feed2imap/feed2imap.rb

@@ -26,6 +26,7 @@ require 'feed2imap/httpfetcher'
 require 'logger'
 require 'thread'
 require 'feedparser'
+require 'feed2imap/rexml_settings'
 require 'feed2imap/itemtomail'
 require 'open3'
 
@@ -152,8 +153,16 @@ class Feed2Imap
                 outh = Thread::new do
                   output = stdout.read
                 end
+                err = nil
+                errth = Thread::new do
+                  err = stderr.read.chomp
+                end
                 inth.join
                 outh.join
+                errth.join
+                err.lines do |e|
+                  @logger.warn(e.chomp)
+                end
                 s = output
                 if $? && $?.exitstatus != 0
                   @logger.warn("Filter command for #{feed.name} exited with status #{$?.exitstatus}. Output might be corrupted !")

data/lib/feed2imap/itemtomail.rb

@@ -90,13 +90,12 @@ def item_to_mail(config, item, id, updated, from = 'Feed2Imap', inline_images =
     htmlpart = parts.size == 1 ? message : RMail::Message::new
     htmlpart.header['Content-Type'] = 'text/html; charset=utf-8'
     htmlpart.header['Content-Transfer-Encoding'] = '8bit'
-    htmlpart.body = item.to_html
+    htmlpart.body = item.to_html_with_headers
   end
 
   # inline images as attachments
   imgs = []
   if inline_images
-    cids = []
     htmlpart.body.gsub!(/(<img[^>]+)src="(\S+?\/([^\/]+?\.(png|gif|jpe?g)))"([^>]*>)/i) do |match|
       # $2 contains url, $3 the image name, $4 the image extension
       begin

data/lib/feed2imap/rexml_settings.rb

@@ -0,0 +1 @@
+REXML::Security.entity_expansion_text_limit *= 10

data/lib/feed2imap/version.rb

@@ -1,3 +1,3 @@
 class Feed2Imap
-  VERSION = "1.2.7"
+  VERSION = "1.3.2"
 end

data/test/tc_itemtomail.rb

@@ -0,0 +1,41 @@
+require 'test/unit'
+require 'feed2imap'
+require 'mocha/test_unit'
+
+
+class ItemToMailTest < Test::Unit::TestCase
+
+  def jpg
+    # a 1x1 white pixel
+    "\xFF\xD8\xFF\xE0\u0000\u0010JFIF\u0000\u0001\u0001\u0000\u0000\u0001\u0000\u0001\u0000\u0000\xFF\xDB\u0000C\u0000\u0003\u0002\u0002\u0002\u0002\u0002\u0003\u0002\u0002\u0002\u0003\u0003\u0003\u0003\u0004\u0006\u0004\u0004\u0004\u0004\u0004\b\u0006\u0006\u0005\u0006\t\b\n\n\t\b\t\t\n\f\u000F\f\n\v\u000E\v\t\t\r\u0011\r\u000E\u000F\u0010\u0010\u0011\u0010\n\f\u0012\u0013\u0012\u0010\u0013\u000F\u0010\u0010\u0010\xFF\xC0\u0000\v\b\u0000\u0001\u0000\u0001\u0001\u0001\u0011\u0000\xFF\xC4\u0000\u0014\u0000\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\t\xFF\xC4\u0000\u0014\u0010\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\xFF\xDA\u0000\b\u0001\u0001\u0000\u0000?\u0000T\xDF\xFF\xD9"
+  end
+
+  def jpeg_base64
+    # base64 encoding of the image in #jpg above
+    "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQE\nBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/\nwAALCAABAAEBAREA/8QAFAABAAAAAAAAAAAAAAAAAAAACf/EABQQAQAAAAAA\nAAAAAAAAAAAAAAD/2gAIAQEAAD8AVN//2Q==\n"
+  end
+
+  def config
+    F2IConfig.new(StringIO.new("{}"))
+  end
+
+  def new_item
+    feed = FeedParser::Feed.new
+    feed.instance_variable_set("@title", "Some blog")
+    feed.instance_variable_set("@link", "http://www.example.com/")
+    item = FeedParser::FeedItem.new
+    item.instance_variable_set("@feed", feed)
+    item.title = "Some post"
+    item
+  end
+
+  def test_img
+    id = "abcd1234"
+    item = new_item
+    item.content = '<img src="http://www.example.com/pixel.jpg"/>'
+    HTTPFetcher.any_instance.expects(:fetch).with("http://www.example.com/pixel.jpg", anything).returns(jpg)
+    mail = item_to_mail(config, item, id, true, "feed2imap", true, false)
+    assert_match %r{<img src="data:image/jpg;base64,#{jpeg_base64}"/>}, mail.to_s
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feed2imap
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.2
 platform: ruby
 authors:
 - Lucas Nussbaum
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-feedparser
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.4
 description: RSS/Atom feed aggregator
-email: 
+email:
 executables:
 - feed2imap
 - feed2imap-cleaner
@@ -71,10 +71,9 @@ files:
 - lib/feed2imap/imap.rb
 - lib/feed2imap/itemtomail.rb
 - lib/feed2imap/maildir.rb
-- lib/feed2imap/rexml_patch.rb
+- lib/feed2imap/rexml_settings.rb
 - lib/feed2imap/sgml-parser.rb
 - lib/feed2imap/version.rb
-- setup.rb
 - test/maildir/cur/1376317520.15784_1.debian:2,S
 - test/maildir/cur/1376317520.15789_1.debian:2,S
 - test/maildir/cur/1376319137.17850_1.debian:2,
@@ -83,11 +82,12 @@ files:
 - test/tc_cache.rb
 - test/tc_config.rb
 - test/tc_httpfetcher.rb
+- test/tc_itemtomail.rb
 - test/tc_maildir.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: RSS/Atom feed aggregator
 test_files: []

data/lib/feed2imap/rexml_patch.rb

@@ -1,47 +0,0 @@
-=begin
-Feed2Imap - RSS/Atom Aggregator uploading to an IMAP Server
-Copyright (c) 2005 Lucas Nussbaum <lucas@lucas-nussbaum.net>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-=end
-
-require 'feedparser'
-
-# Patch for REXML
-# Very ugly patch to make REXML error-proof.
-# The problem is REXML uses IConv, which isn't error-proof at all.
-# With those changes, it uses unpack/pack with some error handling
-module REXML
-  module Encoding
-    def decode(str)
-      return str.encode(@encoding)
-    end
-
-    def encode(str)
-      return str
-    end
-
-    def encoding=(enc)
-      return if defined? @encoding and enc == @encoding
-      @encoding = enc || 'utf-8'
-    end
-  end
-
-  class Element
-    def children
-      @children
-    end
-  end
-end