xmlconv 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132a524daba12cd229c004baff161ecc1aeeb566
-  data.tar.gz: d123c9b0db154412052e9e136ca2fe17a7503b81
+  metadata.gz: f84eef111da78dc0fd56004f4e72484f72140c8b
+  data.tar.gz: ac6e7523fbfb16cb7791d9ac19433caaf724386b
 SHA512:
-  metadata.gz: af6d05768520e257ee7a071f2ba8a79d2319031a80c8e3a55129b0d48e21c4e34efc2a14f394cd69e4a3b6aa0c41204ebe51374b781621bad95fe6a0164fd891
-  data.tar.gz: b04037fe973ab119a22e84791af39e6eccfd106340bb3b4aa21cd510c6c70fe843b9511628305b3b839c022d137f11de1072da9ee17429b29e867b6fa977fba2
+  metadata.gz: 52a6367572def652ed84ebedb47d02310c95124ee0b384ccefe14e833ec999ccdf4e8dbe7d1f1f325f7d1ebbee3a4fe57d09d11aa3f6637d15135c78af18ca1a
+  data.tar.gz: ba3d970f48c00d7a381ace1977b123f16905a052623b0059059f9bfe9b8e7fb691d42e7b6975157f03f473cf82ebbaf8f01b79b0c30de29c1030833d1a5e9b46

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.4 / 13.06.2017
+
+* Avoid UTF-8 encoding errors
+* Return correct response for transaction
+* Fix running unit tests
+
 === 1.1.3 / 12.06.2017
 
 * Fix processing mail and postprocess of sandoz.xmlconv

data/lib/xmlconv/state/login.rb

@@ -4,6 +4,7 @@
 require 'sbsm/state'
 require 'xmlconv/view/login'
 require 'xmlconv/state/transactions'
+require 'stringio'
 
 module XmlConv
 	module State
@@ -24,10 +25,21 @@ module XmlConv
             transaction.origin      = session.remote_ip
             transaction.postprocs.push(['Soap', 'update_partner'])
             transaction.postprocs.push(['Bbmb2', 'inject', XmlConv::CONFIG.bbmb_url, 'customer_id'])
+            @transaction = transaction
             res = session.app.execute_with_response(transaction)
           end
         end
         super
+      end
+      def to_html(context)
+        if @session.request_method.eql?('POST')
+          string = StringIO.new
+          @transaction.response.write(string, 2)
+          string.rewind
+          string.read
+        else
+          super(context)
+        end
       end
 			def login
 				if(@session.login)

data/lib/xmlconv/util/mail.rb

@@ -23,7 +23,7 @@ module Mail
               }
     ::Mail.defaults do
       delivery_method :smtp, options
-    end
+    end unless ::Mail.delivery_method.is_a?(::Mail::TestMailer)
     mail = ::Mail.deliver do
       from XmlConv::CONFIG.mail_from
       to recipients

data/lib/xmlconv/util/transaction.rb

@@ -26,7 +26,11 @@ module XmlConv
 				reader_instance = Conversion.const_get(@reader)
 				writer_instance = Conversion.const_get(@writer)
 				@start_time = Time.now
-        @input = encode(@input)
+        if !@input.valid_encoding?
+          @input = @input.encode("UTF-8", :invalid=>:replace, :replace=>"?")
+        else
+          @input = @input.encode("UTF-8")
+        end
         @input.gsub!(/\t+|\s+/, ' ')
         input_model = reader_instance.parse(@input)
         @arguments ||= []

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba