xmlconv 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c6a24f6d6cdd84cdc5b6a296d8ccbfbd88af72b
-  data.tar.gz: f219d53770b60d0c948e19bb4a1c5713b47f2b33
+  metadata.gz: 1a0cc0602375720c02d07d9739b38ff86f435f38
+  data.tar.gz: 7f3d6a5737221b3f8a6edde132d0371930f7b155
 SHA512:
-  metadata.gz: c10f57a89fbb486b195d75cc69ae9cb404c7dac81ba50f144a832f1a0ea4e16576d1a2a1d077527fb34598f052bf1cb55cf20e1b87123e94c45105626b3a62e5
-  data.tar.gz: 8f3c45d6f4395ef50201dd2701981b738f1dd441ddd78750a3c964ef46e8f447075825a4ad9b86b364c030ce4222d19579cdbd6ba0353684e172da4050e5a27a
+  metadata.gz: 433c00703555c1a93a404bf2b9214422598e1a7d13123a161ee1b2eb48a99108f20515099c7b401168511f3d59d4ac8b13cb5e1a1aee9c73cb923205d705cf19
+  data.tar.gz: 4e8b6f90feec79de4276ba716b4418dfe5cfc33cddeea9981ab2b3df03ef7e5ddaa55f053b3d22cc3a3825174d405d2c080737a468ad6046fe17ea0131f7dd8b

data/.travis.yml

@@ -0,0 +1,25 @@
+language: ruby
+
+bundler_args: --without debugger
+
+cache: bundler
+sudo: false
+
+before_install:
+  - gem --version
+
+script: bundle exec test/suite.rb
+
+rvm:
+  - 2.3.1
+  - 2.4.0
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
+notifications:
+  email:
+    recipients:
+      - ngiger@ywesee.com

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :debugger do
-  if RUBY_VERSION.match(/^2/)
-    gem 'pry-byebug'
-    gem 'pry-doc'
-  end
+  gem 'pry-byebug'
+  gem 'pry-doc'
 end

data/History.txt

@@ -1,7 +1,12 @@
+=== 1.1.1 / 06.06.2017
+
+* Adapted to use the rack based SBSM
+* Require  Ruby >= 2.0 and mail gem
+
 === 1.1.0 / 02.09.2016
 
-* Revert fixing base_url as non-flavoerd url on 1.0.8
-* It must be supported in SBSM (Now xmlconv works with flavor in url)
+* Removed use of TMail/Net:SMTP in lib/xmlconv/util/destination.rb
+* Various fixes for passing the tests
 
 === 1.0.9 / 25.07.2016
 

data/lib/xmlconv/config.rb

@@ -24,6 +24,7 @@ module XmlConv
     'access'              => {},
     'commission'          => 0.3, ## Commission in percent
     'config'              => default_config_files,
+    'bbmb_url'            => 'druby://localhost:12004',
     'db_name'             => 'xmlconv',
     'db_user'             => 'xmlconv',
     'db_auth'             => '',
@@ -38,6 +39,7 @@ module XmlConv
     'mail_from'           => 'xmlconv@ywesee.com',
     'pass_hash'           => nil,
     'polling_file'        => conf_dir,
+    'polling_interval'    => nil,
     'program_name'        => 'XmlConv2',
     'project_root'        => data_dir,
     'plugin_dir'          => File.expand_path('conversion', code_dir),
@@ -49,9 +51,17 @@ module XmlConv
     'ssh_known_hosts_file'=> File.expand_path('known_hosts', conf_dir),
     'target_format_fs'    => ',',
     'target_format_rs'    => "\n",
+    'smtp_server'         => 'smtp.gmail.com',
+    'smtp_user'           => 'nouser@nowhere.com',
+    'smtp_domain'         => 'no.domain.com',
+    'smtp_authtype'       => 'plain',
+    'smtp_port'           => '587',
+    'smtp_pass'           => 'thisIsNotApassword',
     'ydim_id'             => nil,
     'ydim_config'         => nil,
     'vat_rate'            => 7.6,
+    'reader'              => 'XundartBdd',
+    'writer'              => 'BddCsv',
   }
 
   config = RCLConf::RCLConf.new(ARGV, defaults)

data/lib/xmlconv/i2/header.rb

@@ -5,6 +5,7 @@
 module XmlConv
 	module I2
 		class Header
+      TRANSACTION_TIME_FORMAT = '%Y%m%d%H%M'
 			attr_accessor :recipient_id, :filename, :prefix, :transaction_id
       attr_reader :suffix
 			def initialize(recipient_id = 'EPIN_PL')
@@ -13,7 +14,7 @@ module XmlConv
         time = Time.now
 #				msec = sprintf('%03i', (time.to_f * 1000).to_i % 100)
         #@transaction_id = time.strftime("%Y%m%d%H%M#{msec}")
-        @transaction_id = time.strftime("%Y%m%d%H%M")
+        @transaction_id = time.strftime(TRANSACTION_TIME_FORMAT)
 			end
       def suffix=(suffix)
         @suffix = "_" << suffix.to_s

data/lib/xmlconv/i2/position.rb

@@ -6,7 +6,7 @@ require 'xmlconv/i2/date'
 module XmlConv
 	module I2
 		class Position
-			attr_accessor :number, :article_ean, :qty, :customer_id, :price, :unit, 
+			attr_accessor :number, :article_ean, :qty, :customer_id, :price, :unit,
         :pharmacode, :free_text
 			attr_reader :delivery_date
 			def delivery_date=(date)
@@ -17,7 +17,7 @@ module XmlConv
 				output = <<-EOS
 500:#{@number}
         EOS
-#501:#{@article_ean}
+#        output << "501:#{@article_ean}\n"
         [@customer_id, @pharmacode].compact.each { |id|
           #output << sprintf("502:%s\n", id)
           output << sprintf("501:%s\n", id)

data/lib/xmlconv/state/global.rb

@@ -14,14 +14,14 @@ module XmlConv
 			end
 			def transaction
 				if((id = @session.user_input(:transaction_id)) \
-					&& (transaction = @session.transaction(id)))
+					&& (transaction = @session.persistence_layer.transaction(id)))
 					Transaction.new(@session, transaction)
 				else
 					self
 				end
 			end
 			def home
-				Transactions.new(@session, @session.transactions)
+				Transactions.new(@session, @session.persistence_layer.transactions)
 			end
 		end
 	end

data/lib/xmlconv/state/login.rb

@@ -9,17 +9,38 @@ module XmlConv
 	module State
 		class Login < SBSM::State
 			VIEW = View::Login
+      def initialize(session, model)
+        if session.request_method.eql?('POST')
+          session.request_params
+          xml_src = "#{session.request_params.keys.first} #{session.request_params.values.first}"
+          unless xml_src.length == 0
+            transaction = XmlConv::Util::Transaction.new
+            transaction.domain      = session.server_name
+            transaction.input       = xml_src
+            transaction.reader      = 'SunStoreBdd'
+            transaction.writer      = XmlConv::CONFIG.writer
+            poll_config = YAML.load_file(XmlConv::CONFIG.polling_file)
+            transaction.destination = XmlConv::Util::Destination.book(poll_config.destination)
+            transaction.partner     = File.basename(session.request_path)
+            transaction.origin      = session.request_origin
+            transaction.postprocs.push(['Soap', 'update_partner'])
+            transaction.postprocs.push(['Bbmb2', 'inject', XmlConv::CONFIG.bbmb_url, 'customer_id'])
+            res = session.app.execute_with_response(transaction)
+          end
+        end
+        super
+      end
 			def login
 				if(@session.login)
-					Transactions.new(@session, @session.transactions)
+					Transactions.new(@session, @session.persistence_layer.transactions)
 				else
 					self
 				end
 			end
 			def transaction
 				if((id = @session.user_input(:transaction_id)) \
-					&& (transaction = @session.transaction(id)))
-					TransactionLogin.new(@session, transaction)
+					&& (transaction = @session.persistence_layer.transaction(id)))
+					TransactionLogin.new(@session.persistence_layer, transaction)
 				else
 					self
 				end
@@ -29,7 +50,7 @@ module XmlConv
 			VIEW = View::Login
 			def login
 				if(@session.login)
-					Transaction.new(@session, @model)
+					Transaction.new(@session.persistence_layer, @model)
 				else
 					self
 				end

data/lib/xmlconv/util/application.rb

@@ -3,15 +3,20 @@
 # XmlConv::Application -- xmlconv  -- 29.09.2011 -- mhatakeyama@ywesee.com
 # XmlConv::Application -- xmlconv2 -- 07.06.2004 -- hwyss@ywesee.com
 
-require 'sbsm/drbserver'
+require 'drb/drb'
+require 'odba'
+require 'csv'
+require 'sbsm/admin_server'
+require 'xmlconv/config'
 require 'xmlconv/state/global'
 require 'xmlconv/util/invoicer'
 require 'xmlconv/util/polling_manager'
 require 'xmlconv/util/session'
 require 'xmlconv/util/transaction'
 require 'xmlconv/util/validator'
+require 'odba/connection_pool'
+require 'xmlconv/util/autoload'
 require 'thread'
-require 'odba'
 require 'xmlconv/model/bdd'
 
 module XmlConv
@@ -58,7 +63,7 @@ module XmlConv
 				transaction_id = transaction_id.to_i
 				if((last_id = @transactions.last.transaction_id) \
 					&& (last_id >= transaction_id))
-					start = (transaction_id - last_id - 1) 
+					start = (transaction_id - last_id - 1)
 					if(start + @transactions.size < 0)
 						start = 0
 					end
@@ -68,7 +73,7 @@ module XmlConv
 				end
 			end
       def send_invoice(time_range, date = Date.today)
-        transactions = @transactions.select { |trans| 
+        transactions = @transactions.select { |trans|
           time_range.include?(trans.commit_time)
         }
         Util::Invoicer.run(time_range, transactions, date)
@@ -88,31 +93,51 @@ module XmlConv
 	end
 end
 
-class XmlConvApp < SBSM::DRbServer
-	ENABLE_ADMIN = true
-	SESSION = XmlConv::Util::Session
-	VALIDATOR = XmlConv::Util::Validator
-	POLLING_INTERVAL = 60 #* 15
-	attr_reader :polling_thread, :dispatch_queue, :dispatcher_thread
-	def initialize
-		@system = ODBA.cache.fetch_named('XmlConv', self) { 
-			XmlConv::Util::Application.new
-		}
-		@system.init
+def XmlConv.start_server
+ XmlConv::Util.autoload(XmlConv::CONFIG.plugin_dir, 'plugin')
+ XmlConv::Util.autoload(XmlConv::CONFIG.postproc_dir, 'postproc')
+  Mail.defaults do
+    delivery_method(:smtp, address: XmlConv::CONFIG.smtp_server, port: XmlConv::CONFIG.smtp_port,
+                    domain: XmlConv::CONFIG.smtp_domain, user_name: XmlConv::CONFIG.smtp_user,
+                    password:  XmlConv::CONFIG.smtp_pass, authentication: XmlConv::CONFIG.smtp_authtype,
+                    enable_starttls_auto: true)
+  end
+
+  ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:Pg:#{XmlConv::CONFIG.db_name}",
+                                              XmlConv::CONFIG.db_user, XmlConv::CONFIG.db_auth)
+  ODBA.cache.setup
+  puts "#{Time.now}: Prefetching cache. This may take a minute or two"
+  ODBA.cache.prefetch
+  $0 = XmlConv::CONFIG.program_name
+  puts "#{Time.now}: Prefetching finshed program name is #{$0}"
+  app = XmlConvApp.new
+  DRb.start_service(XmlConv::CONFIG.server_url, app)
+  SBSM.logger.info(XmlConv::CONFIG.program_name) { "drb-service listening on #{XmlConv::CONFIG.server_url}" }
+  puts "#{Time.now}: start_server done returning #{app.class}"
+  app
+end
+
+class XmlConvApp < SBSM::AdminServer
+	attr_reader :app, :persistence_layer, :polling_thread, :dispatch_queue, :dispatcher_thread
+  POLLING_INTERVAL = 60 #* 15
+	def initialize(app: XmlConv::Util::RackInterface.new)
+    @rack_app = app
+    super(app: app)
+		@persistence_layer = ODBA.cache.fetch_named('XmlConv', self) do XmlConv::Util::Application.new end
+		@persistence_layer.init
 		@dispatch_queue = Queue.new
-		if(self::class::POLLING_INTERVAL)
-			start_polling
-		end
+    @polling_interval = XmlConv::CONFIG.polling_interval || self::class::POLLING_INTERVAL
+    puts "@polling_interval is #{@polling_interval} @persistence_layer is #{@persistence_layer.class}"
+    start_polling  if @polling_interval
 		start_dispatcher
 		start_invoicer if XmlConv::CONFIG.run_invoicer
-		super(@system)
 	end
 	def dispatch(transaction)
     @dispatch_queue.push(transaction)
 	end
   def execute_with_response(transaction)
     begin
-      @system.execute(transaction)
+      @persistence_layer.execute(transaction)
     rescue Exception => e
       puts "rescued #{e.class}"
     end
@@ -121,21 +146,21 @@ class XmlConvApp < SBSM::DRbServer
 	def start_dispatcher
 		@dispatcher_thread = Thread.new {
 			Thread.current.abort_on_exception = true
-			loop { 
-				@system.execute(@dispatch_queue.pop)
+			loop {
+				@persistence_layer.execute(@dispatch_queue.pop)
 			}
 		}
 	end
   def start_invoicer
     @invoicer_thread = Thread.new {
       Thread.current.abort_on_exception = true
-      loop { 
+      loop {
         this_month = Date.today
         next_month = this_month >> 1
         strt = Time.local(this_month.year, this_month.month)
         stop = Time.local(next_month.year, next_month.month)
         sleep(stop - Time.now)
-        @system.send_invoice(strt...stop)
+        @persistence_layer.send_invoice(strt...stop)
       }
     }
   end
@@ -144,13 +169,13 @@ class XmlConvApp < SBSM::DRbServer
       Thread.current.abort_on_exception = true
 			loop {
 				begin
-					XmlConv::Util::PollingManager.new(@system).poll_sources
+					XmlConv::Util::PollingManager.new(@persistence_layer).poll_sources
 				rescue Exception => exc
-					XmlConv::LOGGER.error(XmlConv::CONFIG.program_name) { 
+					SBSM.logger.error(XmlConv::CONFIG.program_name) {
             [exc.class, exc.message].concat(exc.backtrace).join("\n")
           }
 				end
-				sleep(self::class::POLLING_INTERVAL)
+				sleep(@polling_interval)
 			}
 		}
 	end

data/lib/xmlconv/util/autoload.rb

@@ -1,29 +1,30 @@
 #!/usr/bin/env ruby
 # Util#autoload -- xmlconv2 -- 28.08.2006 -- hwyss@ywesee.com
+require 'sbsm/logger'
 
 module XmlConv
   module Util
     def Util.autoload(dir, type)
       config = XmlConv::CONFIG
-      logger = XmlConv::LOGGER
+      logger = SBSM.logger
       dir = File.expand_path(dir)
       prefix = File.basename(dir)
       search_path = File.dirname(dir)
       $:.push(search_path) unless $:.include?(search_path)
-      logger.debug(config.program_name) { 
-        "checking directory '#{dir}' for #{type}s" 
+      logger.debug(config.program_name) {
+        "checking directory '#{dir}' for #{type}s"
       }
       Dir.glob(File.join(dir, '*')) { |entry|
         if(/\.(rb|so)$/.match(entry))
           keyword = File.basename(entry)
           keyword.slice!(/#{File.extname(keyword)}$/)
           rpath = File.join(prefix, keyword)
-          logger.debug(config.program_name) { 
-            "loading #{type}: '#{rpath}' (#{File.basename(entry)})" 
+          logger.debug(config.program_name) {
+            "loading #{type}: '#{rpath}' (#{File.basename(entry)})"
           }
           begin
             require rpath #File.basename(keyword)
-          rescue 
+          rescue
             logger.warn(config.program_name) {
               "loading #{type} '#{rpath}' failed!"
             }

data/lib/xmlconv/util/destination.rb

@@ -16,8 +16,8 @@ module XmlConv
 			attr_accessor :path, :status
 			attr_reader :uri
 			STATUS_COMPARABLE = {
-				:pending_pickup	=>	10,	
-				:picked_up			=>	20,	
+				:pending_pickup	=>	10,
+				:picked_up			=>	20,
         :bbmb_ok        =>  20,
 				:http_ok				=>	20,
         :ftp_ok         =>  20,
@@ -49,7 +49,7 @@ module XmlConv
 			def update_status
 			end
 			def status_comparable
-				self::class::STATUS_COMPARABLE[@status].to_i				
+				self::class::STATUS_COMPARABLE[@status].to_i
 			end
       def sanitize(str)
         str.to_s.gsub(/[^a-zA-Z0-9 _.]/, '').gsub(' ', '+')
@@ -97,8 +97,8 @@ module XmlConv
         forget_credentials!
       end
       def forget_credentials!
-        @uri = URI::HTTP.new(@uri.scheme, nil, @uri.host, @uri.port, 
-          @uri.registry, @uri.path, @uri.opaque, @uri.query, @uri.fragment)
+        path = /^\//.match(@uri.path) ? @uri.path : '/' + @uri.path
+        @uri = URI::HTTP.new(@uri.scheme, nil, @uri.host, @uri.port,  @uri.registry, path, @uri.opaque, @uri.query, @uri.fragment)
       end
       def host
         @uri.host
@@ -128,17 +128,17 @@ module XmlConv
         @transport = Net::FTP
 			end
       def do_deliver(delivery)
-        @transport.open(@uri.host, @uri.user, @uri.password) { |conn|
+        @transport.open(@uri.host, @uri.user, @uri.password) do |conn|
           conn.chdir(@uri.path)
           deliver_to_connection(conn, delivery)
-        }
+        end
       end
       def deliver_to_connection(connection, delivery, idx=nil)
         if(delivery.is_a?(Array))
-          #delivery.each_with_index { |part, idx| 
-          delivery.each { |part| 
-            #deliver_to_connection(connection, part, idx) 
-            deliver_to_connection(connection, part) 
+          #delivery.each_with_index { |part, idx|
+          delivery.each { |part|
+            #deliver_to_connection(connection, part, idx)
+            deliver_to_connection(connection, part)
           }
         else
           fh = Tempfile.new('xmlconv')
@@ -146,7 +146,7 @@ module XmlConv
           fh.flush
           target = delivery.filename
 #          if(idx)
-            #target = sprintf("%03i_%s", idx, target)
+            #targidxet = sprintf("%03i_%s", idx, target)
 #            target.gsub!(/\.dat/, "%03i.dat" % idx)
 #            target.gsub!(/(CO_\d{13})/, '\1%02d' % idx)
 #          end
@@ -174,9 +174,9 @@ module XmlConv
       def do_deliver(delivery)
         if(delivery.is_a?(Array))
            worst_status = ''
-           delivery.each { |part| 
-             do_deliver(part) 
-             ## bogostatus: assume that the more information in the string, 
+           delivery.each { |part|
+             do_deliver(part)
+             ## bogostatus: assume that the more information in the string,
              ##             the worse the status is (ok < not found)
              ##             rationale: DTSTTCPW
              if(@status.to_s > worst_status.to_s)
@@ -190,7 +190,7 @@ module XmlConv
             if(@uri.user || @uri.password)
               request.basic_auth(@uri.user, @uri.password)
             end
-            response = http.request(request, delivery.to_s)	
+            response = http.request(request, delivery.to_s)
             status_str = response.message.downcase.gsub(/\s+/, "_")
             @status = "http_#{status_str}".intern
           }
@@ -202,23 +202,19 @@ module XmlConv
 				@uri = uri
         super()
       end
-      def deliver(delivery)
+      def deliver(my_body)
+        XmlConv::CONFIG.mail_from ||= 'dummy@nowhere.org'
         recipients = [@uri.to].compact
         recipients.uniq!
         return if(recipients.empty?)
-        subject = 'XmlConv - Delivery'
-        mail = TMail::Mail.new
-        mail.set_content_type('text', 'plain', 'charset'=>'ISO-8859-1')
-        mail.body = delivery.to_s
-        mail.from = XmlConv::CONFIG.mail_from
-        mail.to = recipients
-        mail.subject = subject
-        mail.date = Time.now
-        mail['User-Agent'] = 'XmlConv::Util::Destination'
-        Net::SMTP.start(XmlConv::CONFIG.mail_host) { |smtp|
-          smtp.sendmail(mail.encoded, XmlConv::CONFIG.mail_from, recipients)
-        }
-        @status = :mail_ok
+        my_subject = 'XmlConv - Delivery'
+        mail = ::Mail.deliver do
+          from XmlConv::CONFIG.mail_from
+          to recipients
+          subject my_subject
+          body my_body.to_s
+        end
+        @status = :mail_ok unless mail.error_status
         odba_store
       end
     end

data/lib/xmlconv/util/mail.rb

@@ -1,23 +1,13 @@
 #!/usr/bin/env ruby
 # Util::Mail -- XmlConv -- 23.04.2009 -- hwyss@ywesee.com
 
-require 'net/smtp'
-unless /^1\.8/.match(RUBY_VERSION)
-  require 'mail'
-end
-
+require 'mail'
 require 'xmlconv/config'
 
 module XmlConv
   module Util
 module Mail
-  SMTP_HANDLER = Net::SMTP
   def Mail.notify recipients, my_subject, my_body
-    unless /^1\.8/.match(RUBY_VERSION)
-      puts "XmlConv::Util::Mail.notify #{ XmlConv::CONFIG.mail_from} -> #{recipients} subject: #{my_subject}"
-      puts "Skipping as RUBY_VERSON is #{RUBY_VERSION}"
-      return
-    end
     recipients.flatten!
     recipients.compact!
     recipients.uniq!
@@ -29,6 +19,7 @@ module Mail
       subject my_subject
       body my_body
     end
+    puts "XmlConv::Util::Mail.notify failed #{mail.error_status}" if mail.error_status
   end
 end
   end

data/lib/xmlconv/util/polling_manager.rb

@@ -13,7 +13,7 @@ module XmlConv
 	module Util
     class Mission
       attr_accessor :reader, :writer, :destination, :error_recipients,
-        :debug_recipients, :backup_dir, :partner, :postprocs, :filter, 
+        :debug_recipients, :backup_dir, :partner, :postprocs, :filter,
         :tmp_destination, :arguments
       def create_transaction
         transaction = XmlConv::Util::Transaction.new
@@ -182,17 +182,21 @@ module XmlConv
 				file.close if(file)
 			end
 			def poll_sources
-				load_sources { |source|
+				load_sources do |source|
           begin
             source.poll { |transaction|
               @system.execute(transaction)
             }
           rescue Exception => e
             subject = 'XmlConv2 - Polling-Error'
-            body = [e.class, e.message].concat(e.backtrace).join("\n")
+            body = [e.class, e.message,
+                    defined?(source.user) ? 'user '+ source.user : nil,
+                    defined?(source.host) ? 'host '+ source.host : nil,
+                    defined?(source.port) ? 'port '+ source.port.to_s : nil
+                    ].compact.concat(e.backtrace).join("\n")
             Util::Mail.notify source.error_recipients, subject, body
           end
-				}
+        end
 			end
 		end
 	end

data/lib/xmlconv/util/transaction.rb

@@ -136,12 +136,12 @@ Output:
       end
 			def status_comparable
 				if(@destination.respond_to?(:status_comparable))
-					@destination.status_comparable 
+					@destination.status_comparable
 				end
 			end
 			def update_status
 				if(@destination.respond_to?(:update_status))
-					@destination.update_status 
+					@destination.update_status
 				end
 			end
 			def uri

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/xmlconv/view/login.rb

@@ -31,6 +31,10 @@ module XmlConv
 		end
 		class Login < Template
 			CONTENT = LoginComposite
+      def to_html(context)
+        return "" if @session.request_method.eql?('POST')
+        super
+      end
 		end
 	end
 end

data/test/suite.rb

@@ -2,8 +2,12 @@
 # TestSuite -- xmlconv2 -- 01.06.2004 -- hwyss@ywesee.com
 
 $: << File.dirname(File.expand_path(__FILE__))
+begin
+  require 'pry'
+rescue LoadError
+end
 
-current_dir = File.dirname(__FILE__) 
+current_dir = File.dirname(__FILE__)
 Dir.foreach(current_dir) { |dirname|
 	dirpath = File.expand_path(dirname, current_dir)
 	if(/^test_/o.match(dirname) && (File.ftype(dirpath) == 'directory'))

data/test/test_i2/header.rb

@@ -31,8 +31,8 @@ module XmlConv
 				assert_equal(expected, @header.to_s)
 			end
 			def test_filename
-				expected = Time.now.strftime("#{@header.recipient_id}_%Y%m%d%H%M%S")
-				assert_match(/#{expected}\d{3}.dat/, @header.filename)
+				expected = Time.now.strftime("#{@header.recipient_id}_#{Header::TRANSACTION_TIME_FORMAT}")
+				assert_match(/#{expected}.dat/, @header.filename)
 			end
 		end
 	end

data/test/test_i2/position.rb

@@ -28,17 +28,13 @@ module XmlConv
 				@position.number = '12345'
 				@position.article_ean = '7654321098765'
 				@position.qty = 123
-				date = flexmock('Date')
-        date.should_receive(:code=).and_return({})
-        date.should_receive(:is_a?).and_return(I2::Date)
-				@position.delivery_date = date
-        date.should_receive(:to_s=).and_return("540:A Date\n")
+				@position.delivery_date = I2::Date.new(1999,12,31)
 				expected = <<-EOS
 500:12345
-501:7654321098765
 520:123
-540:A Date
-				EOS
+540:2
+541:19991231
+EOS
 				assert_equal(expected, @position.to_s)
 			end
 			def test_delivery_date_writer

data/test/test_util/application.rb

@@ -39,6 +39,9 @@ module XmlConv
 				ODBA.cache = cache
         transaction.should_receive(:transaction_id=).with(1)
         transaction.should_receive(:execute).once.and_return(transaction)
+        transaction.should_receive(:postprocess).once
+        transaction.should_receive(:error=).never
+        transaction.should_receive(:odba_store).once
         transaction.should_receive(:notify).once
 				assert_equal([], @app.transactions)
 				assert_equal(0, @app.transactions.size)
@@ -55,6 +58,9 @@ module XmlConv
 				ODBA.cache = cache
         transaction.should_receive(:transaction_id=).with(1)
         transaction.should_receive(:execute).once.and_raise(Net::SMTPFatalError, 'could not send email')
+        transaction.should_receive(:postprocess).never
+        transaction.should_receive(:error=).never
+        transaction.should_receive(:odba_store).once
 				assert_equal([], @app.transactions)
 				assert_equal(0, @app.transactions.size)
 				@app.execute(transaction)
@@ -70,8 +76,10 @@ module XmlConv
 				ODBA.cache = cache
         transaction.should_receive(:transaction_id=).with(1)
         transaction.should_receive(:execute).and_raise 'oops, something went wrong'
-        transaction.should_receive(:error=)
-        transaction.should_receive(:notify)
+        transaction.should_receive(:postprocess).never
+        transaction.should_receive(:error=).once
+        transaction.should_receive(:odba_store).once
+        transaction.should_receive(:notify).once
 				assert_equal([], @app.transactions)
 				assert_equal(0, @app.transactions.size)
 				@app.execute(transaction)
@@ -80,7 +88,7 @@ module XmlConv
 				ODBA.cache = nil
 			end
 			def test_dumpable
-				Marshal.dump(@app)
+				assert_raises(TypeError) { Marshal.dump(@app) }
 			end
 			def test_next_transaction_id
 				assert_equal([], @app.transactions)
@@ -98,7 +106,7 @@ module XmlConv
 			end
 			def test_odba_exclude_vars
 				@app.instance_variable_set('@next_transaction_id', 10)
-				@app.instance_eval('odba_replace_excluded!')	
+				@app.instance_eval('odba_replace_excluded!')
 				assert_nil(@app.instance_variable_get('@next_transaction_id'))
 			end
 			def test_transaction

data/test/test_util/destination.rb

@@ -12,6 +12,10 @@ require 'flexmock/minitest'
 
 module XmlConv
 	module Util
+    class DestinationMail
+      def odba_store
+      end
+    end
 		class TestDestination < ::Minitest::Test
 			def setup
 				@destination = Destination.new
@@ -28,7 +32,7 @@ module XmlConv
 			end
 			def test_deliver__destination
 				delivery = flexmock('Delivery')
-				assert_raises(RuntimeError) { 
+				assert_raises(RuntimeError) {
 					@destination.deliver(delivery)
 				}
 			end
@@ -37,16 +41,16 @@ module XmlConv
 			end
       def test_book
         assert_instance_of(DestinationDir, Destination.book('/'))
-        assert_instance_of(DestinationHttp, 
+        assert_instance_of(DestinationHttp,
                            Destination.book('http://www.example.com'))
-        assert_instance_of(DestinationFtp, 
+        assert_instance_of(DestinationFtp,
                            Destination.book('ftp://www.example.com'))
       end
 		end
 		class TestDestinationDir < ::Minitest::Test
 			def setup
 				@destination = DestinationDir.new
-				@target_dir = File.expand_path('data/destination', 
+				@target_dir = File.expand_path('data/destination',
 					File.dirname(__FILE__))
         super
 			end
@@ -141,6 +145,21 @@ module XmlConv
 				assert_respond_to(@destination, :host=)
 			end
 		end
+    class TestDestinationMail< ::Minitest::Test
+      def setup
+        @destination = DestinationMail.new
+        ::Mail.defaults do delivery_method :test end
+        ::Mail::TestMailer.deliveries.clear
+        super
+      end
+      def test_destination_mail
+        default_dest = 'mailto:noone@nowhere.org'
+        test_recicpient = 'test@other.org'
+        assert_equal(default_dest, @destination.uri.to_s)
+        @destination.deliver('body as text')
+        assert_equal(1, ::Mail::TestMailer.deliveries.length)
+      end
+    end
 		class TestDestinationHttp < ::Minitest::Test
 			def setup
 				@destination = DestinationHttp.new
@@ -175,15 +194,15 @@ module XmlConv
 				response = flexmock('Response')
 				response.should_receive(:message).and_return { 'Status' }
 				delivery.should_receive(:to_s).and_return { 'The Delivery' }
-				http_session.should_receive(:request).and_return { |post_request, body| 
+				http_session.should_receive(:request).and_return { |post_request, body|
 					assert_instance_of(Net::HTTP::Post, post_request)
-					header = post_request.instance_variable_get('@header') 
+					header = post_request.instance_variable_get('@header')
 					assert_equal(['text/xml'], header['content-type'])
 					assert(header.include?('authorization'), "Authorization-Headers not sent")
 					assert_equal('The Delivery', body)
 					response
 				}
-				@transport.should_receive(:start).and_return { |host, port, block| 
+				@transport.should_receive(:start).and_return { |host, port, block|
 					assert_equal('xmlconv.ywesee.com', host)
 					assert_equal(12345, port)
 					block.call(http_session)
@@ -203,9 +222,14 @@ module XmlConv
         @destination.transport = @transport = flexmock('DestinationFtp::FTP_CLASS')
         super
 			end
-			def test_path_writer
+			def test_path_absolute_writer
 				assert_equal('ftp:/', @destination.uri.to_s)
 				@destination.path = '/foo/bar'
+				assert_equal('ftp:/%2Ffoo/bar', @destination.uri.to_s)
+			end
+			def test_path_relative_writer
+				assert_equal('ftp:/', @destination.uri.to_s)
+				@destination.path = 'foo/bar'
 				assert_equal('ftp:/foo/bar', @destination.uri.to_s)
 			end
 			def test_host_writer
@@ -231,13 +255,13 @@ module XmlConv
 				delivery.should_receive(:to_s).and_return { 'The Delivery' }
         delivery.should_receive(:filename).and_return { 'test.dat' }
         ftp_session.should_receive(:chdir).and_return { |path|
-          assert_equal('/foo/bar/', path)
+          assert_equal('foo/bar/', path)
         }
         ftp_session.should_receive(:puttextfile).and_return { |local, remote|
           assert_equal("The Delivery\n", File.read(local))
           assert_equal('test.dat', remote)
         }
-				@transport.should_receive(:open).and_return { |host, user, password, block| 
+				@transport.should_receive(:open).and_return { |host, user, password, block|
 					assert_equal('xmlconv.ywesee.com', host)
 					assert_equal('testaccount', user)
 					assert_equal('password', password)
@@ -262,13 +286,13 @@ module XmlConv
         ftp_session.should_receive(:chdir).and_return { |path|
           assert_equal('foo/bar/', path)
         }
-        expecteds = %w{000_test.dat 001_test.dat}
+        expecteds = %w{test.dat test.dat}
         ftp_session.should_receive(:puttextfile).times(2)\
           .and_return { |local, remote|
           assert_equal("The Delivery\n", File.read(local))
           assert_equal(expecteds.shift, remote)
         }
-				@transport.should_receive(:open).and_return { |host, user, password, block| 
+				@transport.should_receive(:open).and_return { |host, user, password, block|
 					assert_equal('xmlconv.ywesee.com', host)
 					assert_equal('testaccount', user)
 					assert_equal('password', password)
@@ -297,7 +321,7 @@ module XmlConv
           assert_equal('/foo/tmp/test.dat', remote)
         }
         ftp_session.should_receive(:rename).with('/foo/tmp/test.dat', 'test.dat').times(1)
-        @transport.should_receive(:open).and_return { |host, user, password, block| 
+        @transport.should_receive(:open).and_return { |host, user, password, block|
           assert_equal('xmlconv.ywesee.com', host)
           assert_equal('testaccount', user)
           assert_equal('password', password)
@@ -349,7 +373,7 @@ module XmlConv
         delivery.should_receive(:to_s).and_return { 'The Delivery' }
         delivery.should_receive(:filename).and_return { 'test.dat' }
         file_handle = StringIO.new('')
-        @transport.should_receive(:start).and_return { |host, user, opts, block| 
+        @transport.should_receive(:start).and_return { |host, user, opts, block|
           assert_equal('xmlconv.ywesee.com', host)
           assert_equal('testaccount', user)
           assert_equal([], opts[:keys])
@@ -380,7 +404,7 @@ module XmlConv
         delivery.should_receive(:to_s).and_return { 'The Delivery' }
         delivery.should_receive(:filename).and_return { 'test.dat' }
         file_handle = StringIO.new('')
-        @transport.should_receive(:start).and_return { |host, user, opts, block| 
+        @transport.should_receive(:start).and_return { |host, user, opts, block|
           assert_equal('xmlconv.ywesee.com', host)
           assert_equal('testaccount', user)
           assert_equal([], opts[:keys])

data/test/test_util/polling_manager.rb

@@ -18,14 +18,14 @@ module XmlConv
     class TestPollingMission < ::Minitest::Test
       def setup
         @mission = PollingMission.new
-				@dir = File.expand_path('data/i2', 
+				@dir = File.expand_path('data/i2',
 					File.dirname(__FILE__))
 				FileUtils.mkdir_p(@dir)
 				@file1 = File.expand_path('file1.txt', @dir)
 				File.open(@file1, 'w') { |fh| fh << "File 1\n" }
       end
 			def teardown
-				FileUtils.rm_rf(@dir) 
+				FileUtils.rm_rf(@dir)
 			end
 			def test_file_paths
         @mission.directory = @dir
@@ -100,15 +100,17 @@ module XmlConv
     end
     class TestPopMission < ::Minitest::Test
       def setup
+        ::Mail::TestMailer.deliveries.clear
+        ::Mail.defaults do delivery_method :test end
         @popserver = TCPServer.new('127.0.0.1', 0)
-        addr = @popserver.addr 
+        addr = @popserver.addr
         @mission = PopMission.new
         @mission.host = 'localhost'
         @mission.port = addr.at(1)
         @mission.user = "testuser"
         @mission.pass = "test"
         @mission.content_type = "text/xml"
-        @datadir = File.expand_path('data', File.dirname(__FILE__)) 
+        @datadir = File.expand_path('data', File.dirname(__FILE__))
         @mission.backup_dir = File.join(@datadir, 'backup')
         @mission.destination = File.join(@datadir, 'destination')
         @mission.partner = 'Partner'
@@ -159,14 +161,14 @@ module XmlConv
 			def setup
 				@sys = flexmock('System')
 				@polling = PollingManager.new(@sys)
-				@dir = File.expand_path('data/i2', 
+				@dir = File.expand_path('data/i2',
 					File.dirname(__FILE__))
 				FileUtils.mkdir_p(@dir)
 				@file1 = File.expand_path('file1.txt', @dir)
 				File.open(@file1, 'w') { |fh| fh << "File 1\n" }
 			end
 			def teardown
-				FileUtils.rm_rf(@dir) 
+				FileUtils.rm_rf(@dir)
 				@sys.__verify
         super
 			end
@@ -186,7 +188,7 @@ reader: XmlBdd
           EOS
 				}
 				block = nil
-				block3 = Proc.new { |source| 
+				block3 = Proc.new { |source|
 					flunk "too many sources"
 				}
 				block2 = Proc.new { |source|

data/test/test_util/transaction.rb

@@ -49,18 +49,17 @@ module XmlConv
 				assert_respond_to(@transaction, :commit_time)
 			end
 			def test_execute
-				src = flexmock('source')
 				input = flexmock('input')
 				reader = flexmock('reader')
 				model = flexmock('model')
 				writer = flexmock('writer')
 				output = flexmock('output')
 				destination = flexmock('destination')
-				@transaction.input = src
+				@transaction.input = 'abc'
 				@transaction.reader = reader
 				@transaction.writer = writer
 				@transaction.destination = destination
-        reader.should_receive(:parse).with(src).once.and_return(input)
+        reader.should_receive(:parse).and_return(input)
         reader.should_receive(:convert).with(input).once.and_return(model)
         writer.should_receive(:convert).with(model).once.and_return(output)
         destination.should_receive(:deliver).with(output).once
@@ -68,7 +67,7 @@ module XmlConv
 				time1 = Time.now
 				result = @transaction.execute
 				time2 = Time.now
-				assert_equal(src, @transaction.input)
+				assert_equal('abc', @transaction.input)
 				assert_equal(reader, @transaction.reader)
 				assert_equal(model, @transaction.model)
 				assert_equal(writer, @transaction.writer)
@@ -84,22 +83,22 @@ module XmlConv
 				Marshal.dump(@transaction)
 			end
 			def test_notify
-          ::Mail::TestMailer.deliveries.clear
-          ::Mail.defaults do
-          delivery_method :test
-        end
+        ::Mail::TestMailer.deliveries.clear
+        ::Mail.defaults do delivery_method :test end
+        to_addr = 'foo@bar.com'
+        XmlConv::CONFIG.mail_from = 'from@some.com'
 				@transaction.instance_variable_set('@start_time', Time.now)
 				@transaction.error_recipients = ['bar']
 				@transaction.notify
         assert_equal(0, ::Mail::TestMailer.deliveries.size)
-				@transaction.debug_recipients = ['foo']
+				@transaction.debug_recipients = [to_addr]
 				@transaction.notify
         assert_equal(1, ::Mail::TestMailer.deliveries.size)
-        assert_equal(['foo'], ::Mail::TestMailer.deliveries.last.to)
+        assert_equal([to_addr], ::Mail::TestMailer.deliveries.last.to)
 				@transaction.error = 'error!'
 				@transaction.notify
         assert_equal(2, ::Mail::TestMailer.deliveries.size)
-        assert_equal(['foo', 'bar'], ::Mail::TestMailer.deliveries.last.to)
+        assert_equal([to_addr, 'bar'], ::Mail::TestMailer.deliveries.last.to)
 			end
 		end
 	end

data/xmlconv.gemspec

@@ -21,20 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.1'
   spec.add_dependency "ydbi",    '>= 0.5.1'
   spec.add_dependency "json"
-  # Must not include mail and use specific old version of some gems to
-  # allow mod_ruby compiled against Ruby 1.8.6 as on fastpower
-  if /^1\./.match(RUBY_VERSION)
-    spec.add_dependency "sbsm", '1.2.6'
-    spec.add_dependency "htmlgrid", '1.0.7'
-    spec.add_dependency "ydim",    '1.0.0'
-    spec.add_dependency "hpricot", '0.8.2'
-  else
-    spec.add_dependency "sbsm"
-    spec.add_dependency "htmlgrid"
-    spec.add_dependency "ydim"
-    spec.add_dependency "syck"
-    spec.add_dependency "mail" # avoid it to make it run
-  end
+  spec.add_dependency "sbsm", '>= 1.4.3'
+  spec.add_dependency "htmlgrid"
+  spec.add_dependency "ydim"
+  spec.add_dependency "syck"
+  spec.add_dependency "mail"
   spec.add_dependency "rclconf"
   spec.add_dependency "needle"
   spec.add_dependency "ypdf-writer"
@@ -43,13 +34,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "yus"
 
   spec.add_development_dependency "bundler"
-  unless /^1\.8/.match(RUBY_VERSION)
-    spec.add_development_dependency "simplecov"
-    spec.add_development_dependency "rake"
-    spec.add_development_dependency "flexmock"
-    spec.add_development_dependency "minitest"
-    spec.add_development_dependency "minitest-should_syntax"
-    spec.add_development_dependency "rspec"
-  end
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-should_syntax"
+  spec.add_development_dependency "rspec"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +314,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE
@@ -434,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: xmlconverter, convert XML to flat files
@@ -469,4 +470,3 @@ test_files:
 - test/test_util/invoicer.rb
 - test/test_util/polling_manager.rb
 - test/test_util/transaction.rb
-has_rdoc: