oga 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5d490dd77a378cf8db7c889b464473e5bd81bd
-  data.tar.gz: 6915b14d4f18766dd64c2fd406bd6ab46deae2f0
+  metadata.gz: 49e8bbac0a9f880b8e5b068bb4c9bf684af62124
+  data.tar.gz: 4dfb3b6c5cbd3c9de6bf0afef43545052386487f
 SHA512:
-  metadata.gz: 8a76d088da06ba7a8c94daa9426c9adca6c97287d395c6c75dc0b22688160f231d996e65e8d76f7f9676920589eb4bb2b49e78a0536c5d6c02328c2d13821a9c
-  data.tar.gz: 320041b05dcf0dbdc51b9696f67f7f1df16b5a713383a933ed724d46c1f78ae8e8700b438b298a7bbdef386b82f3d41803bfdfbe33e9fc314fffb969551fb9cb
+  metadata.gz: 3e487af3bcad6f4e6e7a340a7709be355fa614c766fded6c8643befff56407c621710d00784394b277b59985e8c3b2d3d338606bd07864bdcc37cb5bd22cde46
+  data.tar.gz: 3d475e191270aab814a09e509cad56f1f0f57a8dd0c6ce3806625401384f586bbd661f2308a8e3f6339a6e1aa1dacc78bfd184d29f506f1c2f7db8fcfb986008

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end # Oga

data/lib/oga/xml/entities.rb

@@ -59,11 +59,18 @@ module Oga
       REGULAR_ENTITY = /&[a-zA-Z0-9]+;/
 
       ##
-      # Regexp for matching XML/HTML entities such as "&".
+      # Regexp for matching XML/HTML numeric entities such as "&".
       #
       # @return [Regexp]
       #
-      CODEPOINT_ENTITY = /&#(x)?([a-zA-Z0-9]+);/
+      NUMERIC_CODE_POINT_ENTITY = /&#(\d+);/
+
+      ##
+      # Regexp for matching XML/HTML hex entities such as "<".
+      #
+      # @return [Regexp]
+      #
+      HEX_CODE_POINT_ENTITY = /&#x([a-fA-F0-9]+);/
 
       ##
       # @return [Regexp]
@@ -89,8 +96,14 @@ module Oga
         input = input.gsub(REGULAR_ENTITY, mapping)
 
         if input.include?(AMPERSAND)
-          input = input.gsub(CODEPOINT_ENTITY) do |match|
-            [$1 ? Integer($2, 16) : Integer($2, 10)].pack('U*')
+          input = input.gsub(NUMERIC_CODE_POINT_ENTITY) do
+            [Integer($1, 10)].pack('U*')
+          end
+        end
+
+        if input.include?(AMPERSAND)
+          input = input.gsub(HEX_CODE_POINT_ENTITY) do
+            [Integer($1, 16)].pack('U*')
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Yorick Peterse
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Oga is an XML/HTML parser written in Ruby.