maremma 4.9 → 4.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dea0b9b5cf0916542d904c1c3f0f4cbdfa325177b0dcd9bd3a096bea05bdeb0
-  data.tar.gz: ded3d03c921a63b33b4a975fb9b75d020bc2a7feb250f37703c90dcf7d1a7716
+  metadata.gz: 2a9c0b30f4fe07434f05de62e4b64c54028ed22cebb285e8bee34850e34514f8
+  data.tar.gz: 18f09ec414eafd45610d458917787ca22bdd4db5bc286494634cdd5d80dac562
 SHA512:
-  metadata.gz: 37a701b359497edce90b694a981204bb8c063b01b5c57c465c984cfd9162a9277be11628ec873588cc1772e02751b7c0fff9cf1407294a8655637b5efb8aa7b3
-  data.tar.gz: e9d255bb82c76b5c4e9264233cb5185c8b52a066608fe765884b076ead364ff90bd534fc815cbf2c36f56ebab0dbab626bb05a45d133a0200c9a19b34bc6c31b
+  metadata.gz: 25aa844992e5aeebcdd5b0f127244e6546060f2de7fac3250f384641f060d616e1e448a6d8ae6eb8c27b2668299eef5d2ed5cd6d0375c6bae9f9ef68fc9602b3
+  data.tar.gz: 5e47a8f2d32e8f1380584c462e28221b19aebe285dff004253230ee98e502c909ceea85526854c513bd8321a7be2f550266590c2eac1f431ba119f6be9f6a809

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.9.1](https://github.com/datacite/maremma/tree/4.9.1) (2021-06-06)
+
+[Full Changelog](https://github.com/datacite/maremma/compare/4.9...4.9.1)
+
 ## [4.9](https://github.com/datacite/maremma/tree/4.9) (2021-06-06)
 
 [Full Changelog](https://github.com/datacite/maremma/compare/4.7.4...4.9)

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    maremma (4.9)
+    maremma (4.9.2)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
-      charlock_holmes (~> 0.7.7)
       excon (~> 0.71.0)
       faraday (~> 0.17.3)
       faraday-encoding (~> 0.0.4)
@@ -27,7 +26,6 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     builder (3.2.4)
-    charlock_holmes (0.7.7)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml

data/lib/maremma.rb

@@ -11,7 +11,6 @@ require "uri"
 require "addressable/uri"
 require "maremma/xml_converter"
 require "maremma/version"
-require "charlock_holmes"
 
 module Maremma
   DEFAULT_TIMEOUT = 60
@@ -230,15 +229,10 @@ module Maremma
   end
 
   def self.parse_response(string, options = {})
-    detection = CharlockHolmes::EncodingDetector.detect(string)
-    utf8_encoded_content = CharlockHolmes::Converter.convert(string, detection[:encoding], "UTF-8")
-    return utf8_encoded_content if options[:raw]
-
-    from_json(utf8_encoded_content) || from_xml(utf8_encoded_content) || from_string(utf8_encoded_content)
-  rescue ArgumentError
-    # handle U_STRING_NOT_TERMINATED_WARNING
-    from_json(string.force_encoding("UTF-8")) || from_xml(string.force_encoding("UTF-8")) ||
-      from_string(string.force_encoding("UTF-8"))
+    string = string.dup.encode(Encoding.find("UTF-8"), invalid: :replace, undef: :replace, replace: "")
+    return string if options[:raw]
+
+    from_json(string) || from_xml(string) || from_string(string)
   end
 
   # currently supported by Twitter and Github

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "4.9".freeze
+  VERSION = "4.9.2".freeze
 end

data/maremma.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", ">= 4.2.5"
   s.add_dependency "addressable", ">= 2.3.6"
   s.add_dependency "builder", "~> 3.2", ">= 3.2.2"
-  s.add_dependency "charlock_holmes", "~> 0.7.7"
   s.add_dependency "excon", "~> 0.71.0"
   s.add_dependency "faraday", "~> 0.17.3"
   s.add_dependency "faraday-encoding", "~> 0.0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: '4.9'
+  version: 4.9.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
-- !ruby/object:Gem::Dependency
-  name: charlock_holmes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement