xsv 1.0.0.pre → 1.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b464996d0d55d48bce1400987079600f4e882eafd46006dc96e29879b6b67a
-  data.tar.gz: cc6f2164a38f4e9de9e6bf7c82663d8658adaf8570731c6a0e80f7f2b3fb744f
+  metadata.gz: 2c7de4a72e380ca950dd3f076353c6e275d67314491216708ab2abe28ca1c3b2
+  data.tar.gz: 583a01b780ee1b95f9558d28f8700b885874822c133d5c17b4f3f2e94e0bb6e3
 SHA512:
-  metadata.gz: 78d88c74b25547bfca47ce2974ae0f082628af93db97820fcbf830661b49bb5adf02f40a46bb2b07a0335ff4cd3f7803152d53e180a9f6e3355d9b229cda984f
-  data.tar.gz: 2ec1290130c81899491661bf826df5637084648a73a2f9d8e4e9562739f3b7277c07efc27f8cb28019f60ec3d9d5c4940ad3bc5cfa17f71eb8dffe4bf1963d03
+  metadata.gz: 6a39ec94b6c3b34ce9367e9e4e2790bae830924b60a10938b54cc7c5f40749d2ebef29bfeaa9d7f9587c19c9cafdd6de9335b6aa8a8f9775dbff8632a867177d
+  data.tar.gz: 12967f46a655720dd2262ddaf1acd357d24a846e0160715e8652b116fa991a766250e55cd77ac69e85c315065e1d13458d04684f421524fc3978358c940a5868

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Xsv Changelog
 
+## 1.0.0.pre.2 2021-01-22
+
+- Reduce allocations in XML parser
+- Return strings with the correct encoding
+- Handle XML entities
+
 ## 1.0.0.pre 2021-01-18
 
 -  Switch to a minimalistic XML parser in native Ruby (#21)

data/lib/xsv/sax_parser.rb

@@ -30,8 +30,18 @@ module Xsv
 
         if state == :look_start
           if (o = pbuf.index('<'))
-            chars = pbuf.slice!(0, o + 1).chop!
-            characters(chars) unless chars.empty? || !respond_to?(:characters)
+            chars = pbuf.slice!(0, o + 1).chop!.force_encoding('utf-8')
+
+            if respond_to?(:characters) && !chars.empty?
+              if chars.index('&')
+                chars.gsub!('&amp;', %q{&})
+                chars.gsub!('&apos;', %q{'})
+                chars.gsub!('&gt;', %q{>})
+                chars.gsub!('&lt;', %q{<})
+                chars.gsub!('&quot;', %q{"})
+              end
+              characters(chars)
+            end
 
             state = :look_end
           elsif eof_reached
@@ -46,7 +56,13 @@ module Xsv
 
         if state == :look_end
           if (o = pbuf.index('>'))
-            tag_name, args = pbuf.slice!(0, o + 1).chop!.split(' ', 2)
+            if (s = pbuf.index(' ')) && s < o
+              tag_name = pbuf.slice!(0, s + 1).chop!
+              args = pbuf.slice!(0, o - s)
+            else
+              tag_name = pbuf.slice!(0, o + 1).chop!
+              args = nil
+            end
 
             if tag_name.start_with?('/')
               end_element(tag_name[1..-1]) if respond_to?(:end_element)

data/lib/xsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xsv
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Martijn Storck
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -112,7 +112,7 @@ metadata:
   homepage_uri: https://github.com/martijn/xsv
   source_code_uri: https://github.com/martijn/xsv
   changelog_uri: https://github.com/martijn/xsv/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A fast and lightweiggt xlsx parser that provides nothing a CSV parser wouldn't
 test_files: []