Commit upstream/latest - feed2imap

Imported Upstream version 1.2.5 Antonio Terceiro 8 years ago

3 changed file(s) with 16 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all

-1

lib/feed2imap/feed2imap.rb less more

17	17	=end
18	18
19	19	# Feed2Imap version
20		F2I_VERSION = '1.2.4'
	20	F2I_VERSION = '1.2.5'
21	21	F2I_WARNFETCHTIME = 10
22	22
23	23	require 'feed2imap/config'

-1

lib/feed2imap/itemtomail.rb less more

98	98	htmlpart.body.gsub!(/(<img[^>]+)src="(\S+?\/([^\/]+?\.(png\|gif\|jpe?g)))"([^>]*>)/i) do \|match\|
99	99	# $2 contains url, $3 the image name, $4 the image extension
100	100	begin
101		image = Base64.encode64(HTTPFetcher::fetch($2, Time.at(0)).chomp) + "\n"
	101	fetcher = HTTPFetcher.new
	102	image = Base64.encode64(fetcher.fetch($2, Time.at(0)).chomp) + "\n"
102	103	cid = "#{Digest::MD5.hexdigest($2)}@#{config.hostname}"
103	104	if not cids.include?(cid)
104	105	cids << cid

+13

-7

test/tc_httpfetcher.rb less more

8	8	def test_get_https
9	9	s = ''
10	10	assert_nothing_raised do
11		s = HTTPFetcher::fetch('https://linuxfr.org/pub/', Time::at(0))
	11	s = fetcher.fetch('https://linuxfr.org/pub/', Time::at(0))
12	12	end
13	13	assert(s.length > 20)
14	14	end

20	20	def test_get_httpnotmodif
21	21	s = 'aaa'
22	22	assert_nothing_raised do
23		s = HTTPFetcher::fetch('http://www.lucas-nussbaum.net/feed2imap_tests/notmodified.php', Time::new())
	23	s = fetcher.fetch('http://www.lucas-nussbaum.net/feed2imap_tests/notmodified.php', Time::new())
24	24	end
25	25	assert_nil(s)
26	26	end

28	28	def test_get_redir1
29	29	s = 'aaa'
30	30	assert_nothing_raised do
31		s = HTTPFetcher::fetch("http://www.lucas-nussbaum.net/feed2imap_tests/redir.php?redir=#{MAXREDIR}", Time::at(0))
	31	s = fetcher.fetch("http://www.lucas-nussbaum.net/feed2imap_tests/redir.php?redir=#{MAXREDIR}", Time::at(0))
32	32	end
33	33	assert_equal('OK', s)
34	34	end

36	36	def test_get_redir2
37	37	s = ''
38	38	assert_raise(RuntimeError) do
39		s = HTTPFetcher::fetch("http://www.lucas-nussbaum.net/feed2imap_tests/redir.php?redir=#{MAXREDIR + 1}", Time::at(0))
	39	s = fetcher.fetch("http://www.lucas-nussbaum.net/feed2imap_tests/redir.php?redir=#{MAXREDIR + 1}", Time::at(0))
40	40	end
41	41	end
42	42
43	43	def test_httpauth
44	44	s = ''
45	45	assert_nothing_raised do
46		s = HTTPFetcher::fetch("http://aaa:bbb@ensilinx1.imag.fr/~lucas/f2i_redirauth.php", Time::at(0))
	46	s = fetcher.fetch("http://aaa:bbb@ensilinx1.imag.fr/~lucas/f2i_redirauth.php", Time::at(0))
47	47	end
48	48	assert_equal("Login: aaa / Password: bbb \n", s)
49	49	end

51	51	def test_redirauth
52	52	s = ''
53	53	assert_nothing_raised do
54		s = HTTPFetcher::fetch("http://aaa:bbb@ensilinx1.imag.fr/~lucas/f2i_redirauth.php?redir=1", Time::at(0))
	54	s = fetcher.fetch("http://aaa:bbb@ensilinx1.imag.fr/~lucas/f2i_redirauth.php?redir=1", Time::at(0))
55	55	end
56	56	assert_equal("Login: aaa / Password: bbb \n", s)
57	57	end

59	59	def test_notfound
60	60	s = ''
61	61	assert_raises(RuntimeError) do
62		s = HTTPFetcher::fetch("http://ensilinx1.imag.fr/~lucas/notfound.html", Time::at(0))
	62	s = fetcher.fetch("http://ensilinx1.imag.fr/~lucas/notfound.html", Time::at(0))
63	63	end
64	64	end
	65
	66	private
	67
	68	def fetcher
	69	HTTPFetcher.new
	70	end
65	71	end