maremma 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314ffe1024407f3640021c859c332ecfefed5e427049fa7536fff73ee628e59f
-  data.tar.gz: ad53b775960092cbea0043e34a16ef2b2d1b309523d1f9950a447c0f53ccbdb4
+  metadata.gz: ea20c84e27eb6be3f752bb38fda926ee2aa1ec585e53ba526739bd74b0de569e
+  data.tar.gz: 0f1379f39973c54056a18d13d072204887d78a332a0a2a8e83532962c48cf07e
 SHA512:
-  metadata.gz: e93a9969fbfd9d640bff442858e66c46379da35fe2a1394e6a395c334c26d96a6ed59f2baa869f68804c64587bf28ea129f566cde9755900aac7813210700641
-  data.tar.gz: b8714703994cb455e7ae1d4b211562bc72fa68865d7386a1a2e4417d9a4ad86fdfd9b2971e15cc009945e5a0665a3b79d515cbbf5f7e07465d504b87a5b4c4f8
+  metadata.gz: 6c4932b932e51cab41daaeeebc38bc61808275a92005170bdb675e2ec2c200eaa629f22272647f7f507e46b230c3dce692b738fcf23cbdd2c0a74f2f73cb28ea
+  data.tar.gz: 399843bd7b7960da78ec36f2e8e5032b397b7dffd61310e0a0b5a72b0c96adaa314c0422f2715e54e4c8564c2c55385e889702c734ae30a2916c548970fde925

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (4.2.3)
+    maremma (4.2.4)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)

data/lib/maremma.rb

@@ -15,6 +15,7 @@ require 'maremma/set_host'
 
 module Maremma
   DEFAULT_TIMEOUT = 60
+  ALLOWED_CONTENT_TAGS = %w(strong em b i code pre sub sup br)
   NETWORKABLE_EXCEPTIONS = [Faraday::ClientError,
                             Faraday::TimeoutError,
                             Faraday::ResourceNotFound,
@@ -26,6 +27,8 @@ module Maremma
                             NoMethodError,
                             TypeError]
 
+  ActiveSupport::XmlMini.backend = 'Nokogiri'
+
   def self.post(url, options={})
     self.method(url, options.merge(method: "post"))
   end
@@ -221,7 +224,13 @@ module Maremma
   end
 
   # keep XML attributes, http://stackoverflow.com/a/10794044
+  # escape tags allowed in content
   def self.from_xml(string)
+    ALLOWED_CONTENT_TAGS.each do |tag| 
+      string.gsub!("<#{tag}>", "&lt;#{tag}&gt;")
+      string.gsub!("</#{tag}>", "&lt;/#{tag}&gt;")
+    end
+
     if Nokogiri::XML(string, nil, 'UTF-8').errors.empty?
       Hash.from_xml(string)
     else

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "4.2.3"
+  VERSION = "4.2.4"
 end

data/spec/maremma_spec.rb

@@ -573,6 +573,11 @@ describe Maremma do
       expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "__content__"=>"abc"}})
     end
 
+    it 'from_xml with allowed content attributes' do
+      string = '<title>Sexual conflict and correlated evolution between male persistence and female resistance traits in the seed beetle <i>Callosobruchus maculatus</i></title>'
+      expect(subject.parse_success_response(string)).to eq("data"=>{"title"=>"Sexual conflict and correlated evolution between male persistence and female resistance traits in the seed beetle <i>Callosobruchus maculatus</i>"})
+    end
+
     it 'from_xml with attribute type string' do
       string = '<crm-item name="publisher-name" type="string">eLife Sciences Publications, Ltd</crm-item>'
       expect(subject.parse_success_response(string)).to eq("data"=>{"crm_item"=>"eLife Sciences Publications, Ltd"})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday