xmlconv 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ef4826f4fd76c4a54f711ca88fb0fe069351f6
-  data.tar.gz: 80a90b6ee5f8c2e6c95c9e6a8a29d6113d9c775c
+  metadata.gz: 853b6b5baf72454d6fdf78f7377a6d94e4129a31
+  data.tar.gz: 05873a7b6ff4476bbf1c9564d8c9a06a4c5c3ab3
 SHA512:
-  metadata.gz: e00f9c46f17998846bf4f94b1e99576791a68620488aa286df16974d4005880c451c799ab91732265b4ea92ba2c835ac991988024d9d543220b69243902cad72
-  data.tar.gz: 03e599d19d269f249c8f09a41361b306ba04cf80ea532921af3f7b819c15f9114d029b4a60da764f23b10b03204aa495d6d43ce78ecd07154d1cae20ba218a2b
+  metadata.gz: c9c8addf5d4a2efbd5660b0b15b8d68278e3fa22d588a4317059a089f2a8d68afc6c9a6bae14a6b9d1289de22d99e19889fbb54d0be0ad2a727cffc3edba40ab
+  data.tar.gz: bacc37b66f1ae54143cdf0dc6f3aff102013c8fd823bccb50ac486d8cb5d1f8c82d172c768dfc342cc8e6637ea4908cb3177eea857fd6961177d56903cd8ea19

data/.gitignore

@@ -0,0 +1,4 @@
+Gemfile.lock
+
+/.bundle
+/pkg

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.0.9 / 25.07.2016
+
+* Fix encoding issue for incoming request
+* Fix encoding issue on preformatted view
+* Add charset in http response header and meta tag (UI)
+
+=== 1.0.8 / 13.07.2016
+
+* Fix base_url as non-flavoerd url
+
 === 1.0.7 / 21.06.2016
 
 * Made it work running via mod_ruby with Ruby 1.8.6

data/lib/xmlconv/util/transaction.rb

@@ -26,7 +26,9 @@ module XmlConv
 				reader_instance = Conversion.const_get(@reader)
 				writer_instance = Conversion.const_get(@writer)
 				@start_time = Time.now
-				input_model = reader_instance.parse(@input)
+        @input = encode(@input)
+        @input.gsub!(/\t+|\s+/, ' ')
+        input_model = reader_instance.parse(@input)
         @arguments ||= []
 				@model = reader_instance.convert(input_model, *@arguments)
 				output_model = writer_instance.convert(@model, *@arguments)
@@ -37,6 +39,24 @@ module XmlConv
 			ensure
 				@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.0.8'
+  VERSION = '1.0.9'
 end

data/lib/xmlconv/view/preformatted.rb

@@ -4,51 +4,74 @@
 require 'htmlgrid/value'
 
 module XmlConv
-	module View
-		BREAK_WIDTH = 65
-		class Preformatted < HtmlGrid::Value
+  module View
+    class Preformatted < HtmlGrid::Value
+      BREAK_WIDTH = 65
+
       def init
         super
-        pretty = ''
-        if(@value)
-          raw = @value.gsub(/>\s+</, "><").gsub(/\r\n?/, "\n")
-          begin
-            pretty = CGI.pretty(raw)
-          rescue
-            pretty = raw
+        if @value
+          raw = @value.gsub(/>\s+</, '><').gsub(/\t|\r\n?/, '')
+          # fix encoding
+          if raw =~ /ISO\-8859\-1|WINDOWS\-1252/i
+            raw.force_encoding(Encoding::ISO_8859_1)
           end
-          wrap = ''
-          pretty.each_line { |line|
-            if(line.length < BREAK_WIDTH)
-              wrap << line
-            else
-              indent = line[/^ +/].to_s
-              indent = indent[0,indent.length % (BREAK_WIDTH / 3)]
-              tmpparts = line.split(/(?<=") +(?=")/)
-              parts = []
-              tmpparts.each { |part|
-                if(part.length > BREAK_WIDTH)
-                  parts.concat(part.split(/ /))
-                else
-                  parts.push(part)
-                end
+          raw.encode!(Encoding::UTF_8).force_encoding(Encoding::UTF_8)
+          @value = <<~PRE
+            <pre>#{
+              cgi_with_utf8 {
+                # prettify (indent)
+                pretty = begin CGI.pretty(raw); rescue raw; end
+                # omit tags
+                CGI.escapeHTML(wrap(pretty))
               }
-              wrapline = parts.shift
-              while(part = parts.shift)
-                if((wrapline.length + part.length) >= BREAK_WIDTH)
-                  wrap << wrapline
-                  wrap << "\n"
-                  wrapline = indent.dup << (' ' * 5) << part
-                else
-                  wrapline << ' ' << part
-                end
+            }</pre>
+          PRE
+        end
+      end
+
+      private
+
+      def wrap(pretty)
+        wrapped = ''
+        pretty.each_line { |line|
+          if line.length < BREAK_WIDTH
+            wrapped << line
+          else
+            indent = line[/^ +/].to_s
+            indent = indent[0,indent.length % (BREAK_WIDTH / 3)]
+            tmpparts = line.split(/(?<=") +(?=")/)
+            parts = []
+            tmpparts.each { |part|
+              if part.length > BREAK_WIDTH
+                parts.concat(part.split(/ /))
+              else
+                parts.push(part)
+              end
+            }
+            wrapline = parts.shift
+            while part = parts.shift
+              if (wrapline.length + part.length) >= BREAK_WIDTH
+                wrapped << wrapline
+                wrapped << "\n"
+                wrapline = indent.dup << (' ' * 5) << part
+              else
+                wrapline << ' ' << part
               end
-              wrap << wrapline
             end
-          }
-          @value = CGI.escapeHTML(wrap)
-        end
+            wrapped << wrapline
+          end
+        }
+        wrapped
+      end
+
+      def cgi_with_utf8
+        orig_verbose = $VERBOSE
+        $VERBOSE = nil
+        result = yield
+        $VERBOSE = orig_verbose
+        result
       end
-		end
-	end
+    end
+  end
 end

data/lib/xmlconv/view/template.rb

@@ -5,13 +5,20 @@ require 'htmlgrid/divtemplate'
 require 'xmlconv/view/foot'
 
 module XmlConv
-	module View
-		class Template < HtmlGrid::DivTemplate
-			COMPONENTS = {
-				[0,0]	=>	:content,
-				[0,1]	=>	:foot,
-			}
-			FOOT = Foot
-		end
-	end
+  module View
+    class Template < HtmlGrid::DivTemplate
+      HTTP_HEADERS = {
+        'Content-Type' => 'text/html;charset=UTF-8'
+      }
+      META_TAGS = [{
+        'http-equiv' => 'content-type',
+        'content'    => 'tex/html;charset=UTF-8'
+      }]
+      COMPONENTS = {
+        [0, 0] => :content,
+        [0, 1] => :foot,
+      }
+      FOOT = Foot
+    end
+  end
 end

data/test/test_custom/lookandfeel.rb

@@ -23,7 +23,8 @@ module XmlConv
       def test_base_url_does_not_include_flavor
         lookandfeel = Lookandfeel.new(@session)
         assert_equal('sbsm', lookandfeel.flavor)
-        refute_match(lookandfeel.base_url, @session.flavor)
+        assert_equal('sbsm', @session.flavor)
+        refute_match(@session.flavor, lookandfeel.base_url)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -313,6 +313,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - History.txt
 - LICENSE