abroad 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe36cd26c80451ce1514284dd1d4948797e8a95
-  data.tar.gz: c1645f6188fc0494a51153bfb2a06ca4220b697f
+  metadata.gz: 0d961c2bc2ef6763471add263c02c5f0b6a76cef
+  data.tar.gz: dc3168e8415c94304b16afe1226b203272f9a1d5
 SHA512:
-  metadata.gz: 9995680ee6439cad5c4d6086fa3efde9fcd9b12ffc2c8cf410d97aa5a6dca9539b0bcd49e1c66dd444045bed8c413098f90fa43dc205968e8588b5bd07ac7c5d
-  data.tar.gz: e6609ea0b1c92ba0130db811f359e7aa48daf9659e787340bb671d952b0720fe1e25361c2690e2a425d7b32f41bc96d636cd50b2521037f0bdc8a75863dd09bf
+  metadata.gz: 6dae02b1c7729bbaea9879244b48465a5ccdad73c93fd3395b5ca95651b920443ea9b70a7355b56a2c93bc3930274c51b21a74186314998ded7574f7f7b46579
+  data.tar.gz: 9e86c2f06209ea62132d3ca25f78a922b9c7461610198e8a191f2b62827954bd5014d43a75a64319fda2dfba18d67738e5a23904f55cc1f2b660826e9ea7c97e

data/lib/abroad/extractors/xml/android_extractor.rb

@@ -56,7 +56,7 @@ module Abroad
           # in double quotes
           unescape(
             strip_enclosing_quotes(
-              builder.doc.xpath('/root/node()').to_xml.strip
+              builder.doc.children.first.children.map(&:to_xml).join.strip
             )
           )
         end
@@ -64,6 +64,8 @@ module Abroad
         def serialize(node, builder)
           if node.text?
             builder.text(unescape(node.text))
+          elsif node.cdata?
+            builder.cdata(node.text)
           else
             builder.send("#{node.name}_", node.attributes) do
               node.children.each do |child|

data/lib/abroad/extractors/xml/xml_extractor.rb

@@ -16,10 +16,8 @@ module Abroad
         private
 
         def parse
-          Nokogiri::XML(stream) do |config|
-            # don't allow network connections
-            config.options = Nokogiri::XML::ParseOptions::NONET
-          end
+          options = Nokogiri::XML::ParseOptions.new.default_xml.nonet
+          Nokogiri::XML(stream, nil, nil, options)
         end
       end
 

data/lib/abroad/version.rb

@@ -1,3 +1,3 @@
 module Abroad
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 end

data/lib/ext/htmlentities/android_xml_decoder.rb

@@ -2,7 +2,7 @@ require 'htmlentities'
 
 class HTMLEntities
   MAPPINGS['android_xml'] = MAPPINGS['xhtml1'].dup.tap do |mappings|
-    mappings.delete('apos')
+    mappings.delete('apos')  # single quote/apostrophe
   end
 
   FLAVORS << 'android_xml'

data/lib/ext/htmlentities/android_xml_encoder.rb

@@ -2,7 +2,7 @@ require 'htmlentities'
 
 class HTMLEntities
   MAPPINGS['android_xml'] = MAPPINGS['xhtml1'].dup.tap do |mappings|
-    mappings.delete('apos')
+    mappings.delete('apos')  # single quote/apostrophe
   end
 
   FLAVORS << 'android_xml'

data/spec/extractors/xml/fixtures.yml

@@ -52,3 +52,8 @@
   entities.xml:
     - key: states
       string: "Alaska & Washington"
+  cdata.xml:
+    - key: foobar
+      string: "Hello <![CDATA[<b>]]>beautiful<![CDATA[</b>]]> world!"
+    - key: bazboo
+      string: "<![CDATA[Hello <b>beautiful</b> world!]]>"

data/spec/extractors/xml/fixtures/cdata.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="foobar">Hello <![CDATA[<b>]]>beautiful<![CDATA[</b>]]> world!</string>
+    <string name="bazboo"><![CDATA[Hello <b>beautiful</b> world!]]></string>
+</resources>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abroad
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -149,6 +149,7 @@ files:
 - spec/extractors/xml/fixtures/basic_arrays.xml
 - spec/extractors/xml/fixtures/basic_plurals.xml
 - spec/extractors/xml/fixtures/basic_strings.xml
+- spec/extractors/xml/fixtures/cdata.xml
 - spec/extractors/xml/fixtures/entities.xml
 - spec/extractors/xml/fixtures/markup.xml
 - spec/extractors/xml/fixtures/newlines.xml