xmlconv 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4976e15c3eb44fd7e1e31c9503a49d929a83b79
-  data.tar.gz: 251ef9c9450150f7a548c2525adc3f7ce214846b
+  metadata.gz: bb9f329fdd7667ecc35ea69858f86af27effca80
+  data.tar.gz: 59698a9a9b806498a40eec8023fbef3d140c2ce8
 SHA512:
-  metadata.gz: 0d7658887226d0ab9454fa2c58cf30188c40d5e75fdadbce8c34bef8bfa1053c9600550f595c5e0283dcb0a1ce7efdd0b0afa87566eadbc804c3a84ce5b04ffa
-  data.tar.gz: 14df94d39537bae76704a80ea4b11c8d5315815186d3736a16a28c82e6e2288e9fbfa4386e674eda1a7a7c641d4b70fffa6f551888ba6078d37ee09c86a89a31
+  metadata.gz: 4f3c78a411e366c376f4eefff010c1fa591a5fabacd1f30370db15bad1c7024d2fc5a00a93de141eee7a6d41c77a28a600f74841559fd5806782b40c8b9ba93c
+  data.tar.gz: 7a382f02bc10df72414b3b622eedace2eef0b92f93c8b1c9a27463c70714c987f0cb2a1b5260bd7ff3cf1d0a048c521c431e10618a93014ff9fee1e2cba3820f

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.5 / 21.06.2016
+
+* Corrected polling pop3 message. Fixed corresponding test case
+
 === 1.0.4 / 20.06.2016
 
 * setup correct smtp delivery if config.smtp_server is given. Works with smtp.gmail.com

data/lib/xmlconv/util/polling_manager.rb

@@ -8,7 +8,7 @@ require 'xmlconv/util/destination'
 require 'xmlconv/util/mail'
 require 'xmlconv/util/transaction'
 require 'net/pop'
-require 'rmail'
+require 'mail'
 
 module XmlConv
 	module Util
@@ -66,35 +66,37 @@ module XmlConv
     class PopMission < Mission
       attr_accessor :host, :port, :user, :pass, :content_type
       def poll(&block)
-        Net::POP3.start(@host, @port || 110, @user, @pass) { |pop|
-          pop.each_mail { |mail|
-            source = mail.pop
+        puts "PopMission starts polling host #{@host}:#{@port} u: #{@user} pw: #{@pass}"
+        options = {
+                          :address    => @host,
+                          :port       => @port,
+                          :user_name  => @user,
+                          :password   => @pass,
+                          :enable_ssl => true
+          }
+        ::Mail.defaults do retriever_method :pop3, options  end
+        all_mails = ::Mail.delivery_method.is_a?(::Mail::TestMailer) ? ::Mail::TestMailer.deliveries : ::Mail.all
+        all_mails.each do |mail|
             begin
-              ## work around a bug in RMail::Parser that cannot deal with
-              ## RFC-2822-compliant CRLF..
-              source.gsub!(/\r\n/, "\n")
-              poll_message(RMail::Parser.read(source), &block)
+              poll_message(mail, &block)
             ensure
               time = Time.now
-              name = sprintf("%s.%s.%s", @user, 
-                             time.strftime("%Y%m%d%H%M%S"), time.usec)
+              name = sprintf("%s.%s.%s", @user, time.strftime("%Y%m%d%H%M%S"), time.usec)
               FileUtils.mkdir_p(@backup_dir)
               path = File.join(@backup_dir, name)
-              File.open(path, 'w') { |fh| fh.puts(source) }
-              mail.delete
+              File.open(path, 'w') { |fh| fh.puts(mail) }
+              mail.mark_for_delete = true
+              # mail.delete # Not necessary with gem mail, as delete_after_find is set to true by default
             end
-          }
-        }
+        end
       end
       def poll_message(message, &block)
         if(message.multipart?)
-          message.each_part { |part|
+          message.parts.each do |part|
             poll_message(part, &block)
-          }
-        elsif(@content_type.match(message.header.content_type('text/plain')))
-          src = message.decode
-          filtered_transaction(src, sprintf('pop3:%s@%s:%s', @user, @host, @port),
-                               &block)
+          end
+        elsif(/text\/xml/.match(message.content_type))
+          filtered_transaction(message.decoded, sprintf('pop3:%s@%s:%s', @user, @host, @port), &block)
         end
       end
     end

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/test/data/sandoz.xundart@bbmb.ch.20110524001038.928592

@@ -0,0 +1,74 @@
+Return-Path: <info@xundart.ch>
+Delivered-To: 
+Received: (qmail 3820 invoked from network); 23 May 2011 22:08:01 -0000
+Received: from [82.195.225.113] (HELO WEB-WIN-225-113.genotec.ch) (82.195.225.113)
+    by mail.ywesee.com (qpsmtpd/0.82) with ESMTP; Tue, 24 May 2011 00:08:01 +0200
+Received: from WEB-WIN-225-113.genotec.ch ([127.0.0.1]) by WEB-WIN-225-113.genotec.ch with Microsoft SMTPSVC(6.0.3790.4675);
+	 Tue, 24 May 2011 00:07:58 +0200
+From: "=?ISO-8859-1?B?eHVuZGFydCDEcnp0ZW5ldHp3?=
+ =?ISO-8859-1?B?ZXJr?=" <info@xundart.ch>
+To: sandoz.xundart@bbmb.ch
+Subject: Bestellung Shop Internet
+Date: Tue, 24 May 2011 00:07:58 +0200
+Message-ID: <20110524-00075891-8728@WEB-WIN-225-113.genotec.ch>
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="--=D8581FE41FAB40EE9DE9_16FE_32EC_7C28"
+Return-Path: info@xundart.ch
+X-OriginalArrivalTime: 23 May 2011 22:07:58.0914 (UTC) FILETIME=[E032AA20:01CC1995]
+
+----=D8581FE41FAB40EE9DE9_16FE_32EC_7C28
+Content-Type: text/html;charset="iso-8859-1"
+Content-Transfer-Encoding: 7bit
+
+<html><style type=text/css><!-- td {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 11px;} --></style><body><font face=verdana size=2><br><table cellpadding=0 cellspacing=0 border=0><tr><td><br>Dr. med. Andreas Diethelm<br>Wattstrasse 14<br>9240 Uzwil</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>23.05.2011</td><td width=280>Valsartan Sandoz Filmtabl</td><td width=180>160 mg 98 Stk</td><td width=80>4782465</td><td width=100>7680620390052</td><td width=40 align=right>2</td><td width=50 align=right>80.20</td><td width=70 align=right>160.40</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>23.05.2011</td><td width=280>Valsartan Sandoz Filmtabl</td><td width=180>80 mg 98 Stk</td><td width=80>4782459</td><td width=100>7680620390038</td><td width=40 align=right>2</td><td width=50 align=right>60.98</td><td width=70 align=right>121.96</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>23.05.2011</td><td width=280>Amlodipin Sandoz eco Tabl</td><td width=180>5 mg 100 Stk</td><td width=80>3458461</td><td width=100>7680573110042</td><td width=40 align=right>5</td><td width=50 align=right>33.45</td><td width=70 align=right>167.25</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td><br>Dr. med. Patrick Hutter<br>Herrenhofstrasse 36<br>9244 Niederuzwil</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>20.05.2011</td><td width=280>Co-Valsartan Sandoz Filmtabl</td><td width=180>160/25 mg 28 Stk</td><td width=80>4804304</td><td width=100>7680618740074</td><td width=40 align=right>5</td><td width=50 align=right>24.71</td><td width=70 align=right>123.55</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>20.05.2011</td><td width=280>Ecofenac CR Retardtabl</td><td width=180>150 mg 30 Stk</td><td width=80>2366107</td><td width=100>7680555130082</td><td width=40 align=right>15</td><td width=50 align=right>17.75</td><td width=70 align=right>266.25</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>20.05.2011</td><td width=280>Bilol Sandoz Filmtabl</td><td width=180>5 mg 100 Stk</td><td width=80>2324014</td><td width=100>7680540300292</td><td width=40 align=right>5</td><td width=50 align=right>21.76</td><td width=70 align=right>108.80</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td><br>Dr. med. Peter Schudel<br>Marktstrasse 3<br>9244 Niederuzwil</td></tr></table>
+<table cellpadding=0 cellspacing=0 border=0><tr><td width=80>23.05.2011</td><td width=280>Ecofenac</td><td width=180>Lipogel 1% 100 g Tube</td><td width=80>2128827</td><td width=100>7680542960296</td><td width=40 align=right>2</td><td width=50 align=right>6.33</td><td width=70 align=right>12.66</td></tr></table>
+<table width=500 cellpadding=0 cellspacing=0 border=0><tr><td><br>xundart AG<br><a href=mailto:info@xundart.ch>info@xundart.ch</a></td></tr></table>
+</font></body></html>
+
+----=D8581FE41FAB40EE9DE9_16FE_32EC_7C28
+Content-Type: text/xml;name="order_69_20110524.xml"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;filename="order_69_20110524.xml"
+
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPGNvbW1hbmRlIHht
+bG5zPSJodHRwOi8vd3d3Lnh1bmRhcnQuY2giIGRhdGU9IjUvMjQvMjAxMSAxMjowNzo1MCBBTSIg
+aWQ9IjY5MjAxMTA1MjQiPg0KPGNvbS1waGFybWEgZWFuPSI3NjAxMDAwMTI4NzA2Ij4NCjxsaXZy
+YWlzb24+PGxhc3QtbmFtZT5Eci4gbWVkLiBBbmRyZWFzIERpZXRoZWxtPC9sYXN0LW5hbWU+PGFk
+ZHJlc3M+PHN0cmVldD5XYXR0c3RyYXNzZSAxNDwvc3RyZWV0Pjx6aXA+OTI0MDwvemlwPjxjaXR5
+PlV6d2lsPC9jaXR5PjwvYWRkcmVzcz48L2xpdnJhaXNvbj4NCjxhcnRpY2xlIGVhbj0iNzY4MDYy
+MDM5MDA1MiIgcGhhcm1hY29kZT0iNDc4MjQ2NSIgcXRlX2ZhY3R1cmU9IjIiPjxkZXNjPlZhbHNh
+cnRhbiBTYW5kb3ogRmlsbXRhYmwgMTYwIG1nIDk4IFN0azwvZGVzYz48L2FydGljbGU+DQo8YXJ0
+aWNsZSBlYW49Ijc2ODA2MjAzOTAwMzgiIHBoYXJtYWNvZGU9IjQ3ODI0NTkiIHF0ZV9mYWN0dXJl
+PSIyIj48ZGVzYz5WYWxzYXJ0YW4gU2FuZG96IEZpbG10YWJsIDgwIG1nIDk4IFN0azwvZGVzYz48
+L2FydGljbGU+DQo8YXJ0aWNsZSBlYW49Ijc2ODA1NzMxMTAwNDIiIHBoYXJtYWNvZGU9IjM0NTg0
+NjEiIHF0ZV9mYWN0dXJlPSI1Ij48ZGVzYz5BbWxvZGlwaW4gU2FuZG96IGVjbyBUYWJsIDUgbWcg
+MTAwIFN0azwvZGVzYz48L2FydGljbGU+PC9jb20tcGhhcm1hPg0KDQo8Y29tLXBoYXJtYSBlYW49
+Ijc2MDEwMDAyNjk0NjEiPg0KPGxpdnJhaXNvbj48bGFzdC1uYW1lPkRyLiBtZWQuIFBhdHJpY2sg
+SHV0dGVyPC9sYXN0LW5hbWU+PGFkZHJlc3M+PHN0cmVldD5IZXJyZW5ob2ZzdHJhc3NlIDM2PC9z
+dHJlZXQ+PHppcD45MjQ0PC96aXA+PGNpdHk+TmllZGVydXp3aWw8L2NpdHk+PC9hZGRyZXNzPjwv
+bGl2cmFpc29uPg0KPGFydGljbGUgZWFuPSI3NjgwNjE4NzQwMDc0IiBwaGFybWFjb2RlPSI0ODA0
+MzA0IiBxdGVfZmFjdHVyZT0iNSI+PGRlc2M+Q28tVmFsc2FydGFuIFNhbmRveiBGaWxtdGFibCAx
+NjAvMjUgbWcgMjggU3RrPC9kZXNjPjwvYXJ0aWNsZT4NCjxhcnRpY2xlIGVhbj0iNzY4MDU1NTEz
+MDA4MiIgcGhhcm1hY29kZT0iMjM2NjEwNyIgcXRlX2ZhY3R1cmU9IjE1Ij48ZGVzYz5FY29mZW5h
+YyBDUiBSZXRhcmR0YWJsIDE1MCBtZyAzMCBTdGs8L2Rlc2M+PC9hcnRpY2xlPg0KPGFydGljbGUg
+ZWFuPSI3NjgwNTQwMzAwMjkyIiBwaGFybWFjb2RlPSIyMzI0MDE0IiBxdGVfZmFjdHVyZT0iNSI+
+PGRlc2M+Qmlsb2wgU2FuZG96IEZpbG10YWJsIDUgbWcgMTAwIFN0azwvZGVzYz48L2FydGljbGU+
+PC9jb20tcGhhcm1hPg0KDQo8Y29tLXBoYXJtYSBlYW49Ijc2MDEwMDAyNjk0NTQiPg0KPGxpdnJh
+aXNvbj48bGFzdC1uYW1lPkRyLiBtZWQuIFBldGVyIFNjaHVkZWw8L2xhc3QtbmFtZT48YWRkcmVz
+cz48c3RyZWV0Pk1hcmt0c3RyYXNzZSAzPC9zdHJlZXQ+PHppcD45MjQ0PC96aXA+PGNpdHk+Tmll
+ZGVydXp3aWw8L2NpdHk+PC9hZGRyZXNzPjwvbGl2cmFpc29uPg0KPGFydGljbGUgZWFuPSI3Njgw
+NTQyOTYwMjk2IiBwaGFybWFjb2RlPSIyMTI4ODI3IiBxdGVfZmFjdHVyZT0iMiI+PGRlc2M+RWNv
+ZmVuYWMgTGlwb2dlbCAxJSAxMDAgZyBUdWJlPC9kZXNjPjwvYXJ0aWNsZT48L2NvbS1waGFybWE+
+DQo8L2NvbW1hbmRlPg0K
+
+----=D8581FE41FAB40EE9DE9_16FE_32EC_7C28--
+

data/test/data/simple_email.txt

@@ -0,0 +1,23 @@
+Date: Wed, 22 Jun 2016 08:51:53 +0200
+From: you@you.com
+To: testuser:@localhost
+Message-ID: <576a3589c4e08_5cd02ac6164170ec22950@ng-tr.mail>
+Mime-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="--==_mimepart_576a3589c331b_5cd02ac6164170ec228e3";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_576a3589c331b_5cd02ac6164170ec228e3
+Content-Type: text/xml;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<?xml version="1.0"?>
+<foo>
+  <bar/>
+</foo>
+
+----==_mimepart_576a3589c331b_5cd02ac6164170ec228e3--
+

data/test/test_util/polling_manager.rb

@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 # Util::TestPollingManager -- xmlconv2 -- 29.06.2004 -- hwyss@ywesee.com
-
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
 require 'xmlconv/util/polling_manager'
-require 'rexml/document'
 require 'config'
 require 'mail'
 require 'minitest/autorun'
@@ -17,6 +15,7 @@ end
 
 module XmlConv
 	module Util
+    TestData = File.join(File.expand_path('..', File.dirname(__FILE__)), 'data')
     class TestPollingMission < ::Minitest::Test
       def setup
         @mission = PollingMission.new
@@ -124,72 +123,34 @@ module XmlConv
         FileUtils.rm_r(@datadir)
       end
       def test_poll
-        message = RMail::Message.new
-        part1 = RMail::Message.new
-        part1.header.add("content-type", 'text/plain')
-        part1.body = "some senseless data"
-        message.add_part(part1)
-
-        part2 = RMail::Message.new
-        part2.header.add("content-type", 'text/xml', nil, 
-                         'encoding' => 'iso-8859-1')
-        doc = REXML::Document.new("<foo><bar /></foo>")
-        part2.body = doc.to_s
-        message.add_part(part2)
-
-        part3 = RMail::Message.new
-        part3.header.add("content-type", 'text/plain')
-        part3.body = "some more senseless data"
-        message.add_part(part3)
-
-        mail = message.to_s
-
-        @server = Thread.new { 
-          Thread.start(@popserver.accept) do |socket|
-            socket.puts("+OK")
-            while line = socket.gets
-              case line[0,4]
-              when "USER"
-                assert_equal("USER testuser\r\n", line)
-                socket.print("+OK\r\n")
-              when "PASS"
-                assert_equal("PASS test\r\n", line)
-                socket.print("+OK\r\n")
-              when "STAT"
-                socket.print("+OK 1 1\r\n")
-              when "LIST"
-                socket.print("+OK\r\n")
-                socket.print("1 #{mail.size}\r\n")
-                socket.print(".\r\n")
-              when "RETR"
-                socket.print("+OK #{mail.size}\r\n")
-                socket.print(mail)
-                socket.print("\r\n.\r\n")
-              when "QUIT"
-                socket.print("+OK\r\n")
-                break
-              else
-                socket.print("+OK\r\n")
-              end
-            end
-            socket.close
-          end
-        }
+        options = { :from =>  'you@you.com', }
+        ::Mail.defaults do delivery_method :test, options end
+        mail = ::Mail.read(File.join(TestData, 'simple_email.txt'))
+        mail.deliver
+        mail = ::Mail.read(File.join(TestData, 'sandoz.xundart@bbmb.ch.20110524001038.928592'))
+        mail.deliver
+        nr_messages = 2
+        assert_equal(nr_messages, ::Mail::TestMailer.deliveries.length)
         counter = 0
-        @mission.poll { |transaction|
+        @mission.poll do |transaction|
           counter += 1
- 					assert_instance_of(Util::Transaction, transaction)
-					assert_equal(doc.to_s, transaction.input)
-					assert_equal("pop3:testuser@localhost:#{@mission.port}", 
-                       transaction.origin)
-					assert_equal('Reader', transaction.reader)
-					assert_equal('Writer', transaction.writer)
-					dest = transaction.destination
-					assert_instance_of(Util::DestinationHttp, dest)
-					assert_equal('http://foo.bar.baz:2345', dest.uri.to_s)
-       }
-       assert_equal(1, counter, 
-                    "poll-block should have been called exactly once")
+          assert_instance_of(Util::Transaction, transaction)
+          next if /testuser@localhost/.match(transaction.origin)
+          expected = %(<?xml version=\"1.0\"?>
+<foo>
+  <bar/>
+</foo>
+)
+          assert_equal(expected, transaction.input)
+          assert_equal("pop3:testuser@localhost:#{@mission.port}",
+                        transaction.origin)
+          assert_equal('Reader', transaction.reader)
+          assert_equal('Writer', transaction.writer)
+          dest = transaction.destination
+          assert_instance_of(Util::DestinationHttp, dest)
+          assert_equal('http://foo.bar.baz:2345', dest.uri.to_s)
+        end
+        assert_equal(nr_messages, counter,  "poll-block should have been called exactly #{nr_messages} times")
       end
       def teardown
         @popserver.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -398,6 +398,8 @@ files:
 - readme.md
 - test/config.rb
 - test/data/polling.yaml
+- test/data/sandoz.xundart@bbmb.ch.20110524001038.928592
+- test/data/simple_email.txt
 - test/suite.rb
 - test/test_i2/address.rb
 - test/test_i2/date.rb
@@ -452,6 +454,8 @@ summary: xmlconverter, convert XML to flat files
 test_files:
 - test/config.rb
 - test/data/polling.yaml
+- test/data/sandoz.xundart@bbmb.ch.20110524001038.928592
+- test/data/simple_email.txt
 - test/suite.rb
 - test/test_i2/address.rb
 - test/test_i2/date.rb