xmlconv 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b944e983c5846919a052589ef034b9f3213f87a7
-  data.tar.gz: 886ccc0284adc4c66a48efd6f0a5f9f59ce5866f
+  metadata.gz: af623000ac8163705c7fff8b81e9c7a5016f0ceb
+  data.tar.gz: 2ec74af40347dd5681fae3e28863d8b2dfbff777
 SHA512:
-  metadata.gz: 34d6f9ca0710e0c360f36e4167626c6afea002881ee15eacc31b786300f5f41d8aee21a649e392e4c4f865457cbe7a10cec27f778d7b882ebf94b53e14d88979
-  data.tar.gz: b9a1eee2de8c25e0507da64e8621850126bae94b86a54a38c580b25703ac205b3c9859a50677fe7b9250335d7003f7224d9dc2411ec7b2f25ffe33e90338368c
+  metadata.gz: cdc78b73d3bc35b0219aa4ba25b493a979be9ff8ee25412fcdc58ed527a02f7068de7a7742fe8a849b48a9ffd92e3da4d8e9d2824c7eed304d60b32408f73221
+  data.tar.gz: e788fe936a974a20f9813bb4d109d66e8689eafbf8c3033988fcfc9794cf9a6bd52ae5cf300b69d5b9d238c8ffc17849ff53fe6fa7dffa557823828d79fef468

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.7 / 21.06.2017
+
+* Added unittest and fix for handling ISO-8859 files
+
 === 1.1.6 / 20.06.2017
 
 * Trace transaction handling via SBSM.debug

data/lib/xmlconv/state/login.rb

@@ -14,7 +14,7 @@ module XmlConv
         if session.request_method.eql?('POST')
           xml_src = session.post_content
           SBSM.debug "XmlConv::State::Login POST params were #{session.request_params}"
-          SBSM.debug " xml_src now #{xml_src}"
+          SBSM.debug " xml_src #{xml_src.encoding} now #{xml_src}"
           unless xml_src.length == 0
             transaction = XmlConv::Util::Transaction.new
             transaction.domain      = session.server_name

data/lib/xmlconv/util/transaction.rb

@@ -5,6 +5,7 @@
 require 'odba'
 require 'xmlconv/util/destination'
 require 'xmlconv/util/mail'
+require 'sbsm/logger'
 
 module XmlConv
 	module Util
@@ -26,11 +27,8 @@ module XmlConv
 				reader_instance = Conversion.const_get(@reader)
 				writer_instance = Conversion.const_get(@writer)
 				@start_time = Time.now
-        if !@input.valid_encoding?
-          @input = @input.encode("UTF-8", :invalid=>:replace, :replace=>"?")
-        else
-          @input = @input.encode("UTF-8")
-        end
+        @input =  @input.force_encoding("UTF-8")
+        @input = @input.encode("UTF-8", :invalid=>:replace, :replace=>"?") if !@input.valid_encoding?
         @input.gsub!(/\t+|\s+/, ' ')
         input_model = reader_instance.parse(@input)
         @arguments ||= []
@@ -45,23 +43,6 @@ module XmlConv
 				@destination.forget_credentials!
 			end
 
-      # Assumes its encoding once as ISO-8859-1 (latin1) at here,
-      # Because input_body is passed from ruby 1.8.6
-      def encode(input_body)
-        src = input_body.to_s
-        begin
-          # ISO-8859-1 (latin1) and WINDOWS-1252
-          src.encode('ISO-8859-1').force_encoding('UTF-8')
-        rescue Encoding::InvalidByteSequenceError,
-               Encoding::UndefinedConversionError
-          begin
-            src.force_encoding('ISO-8859-1').encode('UTF-8')
-          rescue
-            src
-          end
-        end
-      end
-
       def invoice_ids
         @model.invoices.collect do |inv|
           inv.invoice_id.last.to_s.gsub /^0+/, ''

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

data/test/data/umlaut_iso8859.xml

@@ -0,0 +1,28 @@
+<?xml version "1.0" encoding="utf-8"?>
+<customerOrder xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     compressionDesired="false" productDescriptionDesired="true"
+     backLogDesired="true" language="fr"
+     roundUpForCondition="true" version="1.0">
+  <client number="99" password="" />
+  <orderHeader deliveryDate="2017-06-06"
+       referenceNumber="060620172" mannerOfTransport="tour"
+       phoneCallDesired="false" urgent="false">
+    <deliveryAddress line1="136, Ch. De-La-Montagne"
+         line4="Pharmacie GOUDA" line5PostalCode="1224"
+         line5City="Ch�ne-Bougeries">
+      <addressLine2And3Text line2="Ch�ne-Bougeries" line3="GOUDA"
+           />
+    </deliveryAddress>
+  </orderHeader>
+  <orderLines>
+    <productOrderLine orderQuantity="10"
+         roundUpForCondition="true" backLogDesired="true">
+      <pharmaCode id="3463433" />
+    </productOrderLine>
+    <productOrderLine orderQuantity="2"
+         roundUpForCondition="true" backLogDesired="true">
+      <pharmaCode id="3029702" />
+    </productOrderLine>
+  </orderLines>
+</customerOrder>

data/test/test_util/transaction.rb

@@ -4,6 +4,10 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
+begin
+  require 'pry'
+rescue LoadError
+end
 
 require 'xmlconv/util/transaction'
 require 'mail'
@@ -100,6 +104,37 @@ module XmlConv
         assert_equal(2, ::Mail::TestMailer.deliveries.size)
         assert_equal([to_addr, 'bar'], ::Mail::TestMailer.deliveries.last.to)
 			end
+      def test_execute_utf_8_problem
+        input = flexmock('input')
+        reader = flexmock('reader')
+        model = flexmock('model')
+        writer = flexmock('writer')
+        output = Array.new
+				destination = flexmock('destination')
+        destination.should_receive(:deliver).with(output).once.and_return(output.to_s)
+        destination.should_receive(:forget_credentials!).once
+        test_data_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
+        content = File.open("#{test_data_dir}/umlaut_iso8859.xml", 'rb').read
+        @transaction.input = content
+        @transaction.reader = reader
+        @transaction.writer = writer
+        @transaction.destination = destination
+        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)
+        time1 = Time.now
+        result = @transaction.execute
+        time2 = Time.now
+        assert(/Ch\?ne-Bougeries/.match(@transaction.input))
+        assert_raises("ArgumentError: invalid byte sequence in UTF-8") { /Ch?ne-Bougeries/.match(content) }
+        assert_equal(reader, @transaction.reader)
+        assert_equal(model, @transaction.model)
+        assert_equal(writer, @transaction.writer)
+        assert_equal([], output)
+        assert_equal("", result)
+        assert_in_delta(time1, @transaction.start_time, 0.001)
+        assert_in_delta(time2, @transaction.commit_time, 0.001)
+      end
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -386,6 +386,7 @@ files:
 - test/data/polling.yaml
 - test/data/sandoz.xundart@bbmb.ch.20110524001038.928592
 - test/data/simple_email.txt
+- test/data/umlaut_iso8859.xml
 - test/suite.rb
 - test/test_i2/address.rb
 - test/test_i2/date.rb
@@ -442,6 +443,7 @@ test_files:
 - test/data/polling.yaml
 - test/data/sandoz.xundart@bbmb.ch.20110524001038.928592
 - test/data/simple_email.txt
+- test/data/umlaut_iso8859.xml
 - test/suite.rb
 - test/test_i2/address.rb
 - test/test_i2/date.rb