maremma 4.9.2 → 4.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a9c0b30f4fe07434f05de62e4b64c54028ed22cebb285e8bee34850e34514f8
-  data.tar.gz: 18f09ec414eafd45610d458917787ca22bdd4db5bc286494634cdd5d80dac562
+  metadata.gz: c8c7478b41d06a371b6515a8dd41c7abeb3a4a046eb9cd12376873823fcbe349
+  data.tar.gz: c35e08881191261ca2510c1c9012cb2cd0a239723fdac43bf3ecd9a20519c822
 SHA512:
-  metadata.gz: 25aa844992e5aeebcdd5b0f127244e6546060f2de7fac3250f384641f060d616e1e448a6d8ae6eb8c27b2668299eef5d2ed5cd6d0375c6bae9f9ef68fc9602b3
-  data.tar.gz: 5e47a8f2d32e8f1380584c462e28221b19aebe285dff004253230ee98e502c909ceea85526854c513bd8321a7be2f550266590c2eac1f431ba119f6be9f6a809
+  metadata.gz: 5f305c308e7a204fcaae3bfcd61433cac0418dad757addf6944c3c800b90c659076460e680866c01c0937e44d9ed064c20654f1d64041910ec1ddbe692e64b54
+  data.tar.gz: 4d64ab236db26628380a259a85b42ed0c5f0540f992a70e184821146b7c29d9f441349b89c2322c826c009f69c2e641737d02f1940fa4aca0652d3864b60cbf3

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [Unreleased](https://github.com/datacite/maremma/tree/HEAD)
+
+[Full Changelog](https://github.com/datacite/maremma/compare/4.9.5...HEAD)
+
+**Merged pull requests:**
+
+- Add option to skip the encoding of the response body. [\#16](https://github.com/datacite/maremma/pull/16) ([jrhoads](https://github.com/jrhoads))
+
+## [4.9.5](https://github.com/datacite/maremma/tree/4.9.5) (2021-07-20)
+
+[Full Changelog](https://github.com/datacite/maremma/compare/4.9.4...4.9.5)
+
+## [4.9.4](https://github.com/datacite/maremma/tree/4.9.4) (2021-06-07)
+
+[Full Changelog](https://github.com/datacite/maremma/compare/4.9.3...4.9.4)
+
+## [4.9.3](https://github.com/datacite/maremma/tree/4.9.3) (2021-06-07)
+
+[Full Changelog](https://github.com/datacite/maremma/compare/4.9.2...4.9.3)
+
+## [4.9.2](https://github.com/datacite/maremma/tree/4.9.2) (2021-06-07)
+
+[Full Changelog](https://github.com/datacite/maremma/compare/4.9.1...4.9.2)
+
 ## [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)
@@ -271,15 +295,15 @@
 
 ## [v.3.0](https://github.com/datacite/maremma/tree/v.3.0) (2016-11-25)
 
-[Full Changelog](https://github.com/datacite/maremma/compare/v.2.5.4...v.3.0)
+[Full Changelog](https://github.com/datacite/maremma/compare/v.2.5.5...v.3.0)
 
-## [v.2.5.4](https://github.com/datacite/maremma/tree/v.2.5.4) (2016-11-23)
+## [v.2.5.5](https://github.com/datacite/maremma/tree/v.2.5.5) (2016-11-23)
 
-[Full Changelog](https://github.com/datacite/maremma/compare/v.2.5.5...v.2.5.4)
+[Full Changelog](https://github.com/datacite/maremma/compare/v.2.5.4...v.2.5.5)
 
-## [v.2.5.5](https://github.com/datacite/maremma/tree/v.2.5.5) (2016-11-23)
+## [v.2.5.4](https://github.com/datacite/maremma/tree/v.2.5.4) (2016-11-23)
 
-[Full Changelog](https://github.com/datacite/maremma/compare/v.2.5.3...v.2.5.5)
+[Full Changelog](https://github.com/datacite/maremma/compare/v.2.5.3...v.2.5.4)
 
 ## [v.2.5.3](https://github.com/datacite/maremma/tree/v.2.5.3) (2016-11-18)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (4.9.2)
+    maremma (4.9.6)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -16,13 +16,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     builder (3.2.4)
@@ -48,18 +48,18 @@ GEM
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    oj (3.11.5)
+    oj (3.13.9)
     oj_mimic_json (1.0.1)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -98,7 +98,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -116,4 +116,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.2.19
+   2.2.30

data/lib/maremma/version.rb

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

data/lib/maremma.rb

@@ -130,7 +130,7 @@ module Maremma
       c.headers["Accept"] = options[:headers]["Accept"]
       c.headers["User-Agent"] = options[:headers]["User-Agent"]
       c.use      FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all if limit > 0
-      # c.use      FaradayMiddleware::Gzip
+      c.use      FaradayMiddleware::Gzip
       c.request  :multipart
       c.request  :json if options[:headers]["Accept"] == "application/json"
       c.response :encoding
@@ -229,7 +229,18 @@ module Maremma
   end
 
   def self.parse_response(string, options = {})
-    string = string.dup.encode(Encoding.find("UTF-8"), invalid: :replace, undef: :replace, replace: "")
+    string = string.dup
+    string =
+        if options[:skip_encoding]
+            string
+        else
+            string.encode(
+                Encoding.find("UTF-8"),
+                invalid: :replace,
+                undef: :replace,
+                replace: "?"
+            )
+        end
     return string if options[:raw]
 
     from_json(string) || from_xml(string) || from_string(string)

data/spec/fixtures/vcr_cassettes/Maremma/get/get_utf8_bad_encoding.yml

@@ -0,0 +1,59 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pub.sandbox.orcid.org/v3.0/0000-0002-5721-4355
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.9.5; +https://github.com/datacite/maremma)
+      Accept:
+      - application/json;charset=UTF-8
+      Accept-Encoding:
+      - gzip,deflate
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Date:
+      - Wed, 27 Oct 2021 13:46:08 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Cache-Control:
+      - no-cache, no-store, max-age=0, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - DENY
+      X-Content-Type-Options:
+      - nosniff
+      Vary:
+      - accept-encoding
+      Content-Encoding:
+      - gzip
+      Cf-Cache-Status:
+      - DYNAMIC
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 6a4c5e658b6919e7-EWR
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAALRVy27bMBD8FYOnFrDiWH77mqRFr0V6KnqgxbW1DUWqJKXECPJBOeTQb/CPdemnHKumW9gGLAjicGZ3uBo9M20SFBEKUA6nCIaNn1lhkI1Z6lxux62W5UpM9NPVEknXWeuafhH946g3iNtRt9PrsSbLuUtpW/1iqq2jxQMu9kIbDUzBgErAenWpEy6BwKD8aorWaTP3K4kB7lCrKAOXakGQ2y9f727uiT/RWS5huSi4o92qkLLJbDHJ0Nrd42dWclnQTbvf6Q66o+F13Bt0SEZy66JMC2+CqAOPOnGn0437AwInkmMGVIAzBZCKLkyy1RTAE4clPyimBLNih4yj3GzePs0NZtzMq6veHDBWq6UvNRWuiBXPYOtPffXLVjvX7f6/tBoTeIYlqMgr2AqK3XLHbxZvbvHqz2jKM5TzaFPHBvTt/tOwcb94paP3phkQ6Nag9fHsGVeixQlKdHTYLC8mEpPjY0Wk2qVgduX93aMdkI2//9jS1s1yq0pKGhPUM8PzdH6Cx0O6dE/xmHCj/iCOR94ZrRy9f1TOnU0M0rg3Gz/pJbSONxuoSrAOZ1xo0/jwmV6gxRs9vrM5X/ymm/Zo2P54xQL21fa5a4yKMGCBm8R3XhgZcHMfHHb0PTnpLcc8ILN+FULsKxhxciFIyYZmYQ0LE2+ARP0A80dtRIB5jQozb+m8E08OjOKyksIhXw53nOBSnczL8T3r9PHW+kxDh2AjW2Q+qI6XKGh6USU+BEOnMZ3S1K7icmZ0kYdb2SP3Dooi4ZeRqlAvhzaXep6RfxdQqnD7TC2UQDUL6JzIvSUjYgoU9AmWa4uX8exQgWQzyCY0TSnm5xesci+/mZQzBkqEx/PYt0dIAr8KLonsUjP3jr4SzlTE6pt5nr5qaEnMgikxKPEffW2JSYTS7+E8TayYAkG2i68Akr38AQAA//8DAEWCRUMUCwAA
+    http_version:
+  recorded_at: Wed, 27 Oct 2021 13:46:00 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Maremma/get/get_utf8_skip_encoding.yml

@@ -0,0 +1,59 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pub.sandbox.orcid.org/v3.0/0000-0002-5721-4355
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.9.5; +https://github.com/datacite/maremma)
+      Accept:
+      - application/json;charset=UTF-8
+      Accept-Encoding:
+      - gzip,deflate
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Date:
+      - Wed, 27 Oct 2021 13:46:08 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Cache-Control:
+      - no-cache, no-store, max-age=0, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - DENY
+      X-Content-Type-Options:
+      - nosniff
+      Vary:
+      - accept-encoding
+      Content-Encoding:
+      - gzip
+      Cf-Cache-Status:
+      - DYNAMIC
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 6a4c5e69ad5f1a07-EWR
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAALRVy27bMBD8FYOnFrDiWH77mqRFr0V6KnqgxbW1DUWqJKXECPJBOeTQb/CPdemnHKumW9gGLAjicGZ3uBo9M20SFBEKUA6nCIaNn1lhkI1Z6lxux62W5UpM9NPVEknXWeuafhH946g3iNtRt9PrsSbLuUtpW/1iqq2jxQMu9kIbDUzBgErAenWpEy6BwKD8aorWaTP3K4kB7lCrKAOXakGQ2y9f727uiT/RWS5huSi4o92qkLLJbDHJ0Nrd42dWclnQTbvf6Q66o+F13Bt0SEZy66JMC2+CqAOPOnGn0437AwInkmMGVIAzBZCKLkyy1RTAE4clPyimBLNih4yj3GzePs0NZtzMq6veHDBWq6UvNRWuiBXPYOtPffXLVjvX7f6/tBoTeIYlqMgr2AqK3XLHbxZvbvHqz2jKM5TzaFPHBvTt/tOwcb94paP3phkQ6Nag9fHsGVeixQlKdHTYLC8mEpPjY0Wk2qVgduX93aMdkI2//9jS1s1yq0pKGhPUM8PzdH6Cx0O6dE/xmHCj/iCOR94ZrRy9f1TOnU0M0rg3Gz/pJbSONxuoSrAOZ1xo0/jwmV6gxRs9vrM5X/ymm/Zo2P54xQL21fa5a4yKMGCBm8R3XhgZcHMfHHb0PTnpLcc8ILN+FULsKxhxciFIyYZmYQ0LE2+ARP0A80dtRIB5jQozb+m8E08OjOKyksIhXw53nOBSnczL8T3r9PHW+kxDh2AjW2Q+qI6XKGh6USU+BEOnMZ3S1K7icmZ0kYdb2SP3Dooi4ZeRqlAvhzaXep6RfxdQqnD7TC2UQDUL6JzIvSUjYgoU9AmWa4uX8exQgWQzyCY0TSnm5xesci+/mZQzBkqEx/PYt0dIAr8KLonsUjP3jr4SzlTE6pt5nr5qaEnMgikxKPEffW2JSYTS7+E8TayYAkG2i68Akr38AQAA//8DAEWCRUMUCwAA
+    http_version:
+  recorded_at: Wed, 27 Oct 2021 13:46:00 GMT
+recorded_with: VCR 3.0.3

data/spec/maremma_spec.rb

@@ -78,20 +78,34 @@ describe Maremma do
       expect(stub).to have_been_requested
     end
 
-    # it "get json compressed", vcr: true do
-    #   response = subject.get("https://api.datacite.org/works", :headers => { "Content-Type" => "application/json", "Accept-Encoding" => "gzip"})
-    #   expect(response.body["data"].length).to eq(25)
-    # end
+    it "get json compressed", vcr: true do
+      response = subject.get("https://api.datacite.org/works", headers: { "Content-Type" => "application/json", "Accept-Encoding" => "gzip" })
+      expect(response.body["data"].length).to eq(25)
+    end
 
-    # it "get html compressed", vcr: true do
-    #   response = subject.get("https://datacite.org/", :headers => {"Accept-Encoding" => "gzip"})
-    #   expect(response.body["data"]).to include("html")
-    # end
+    it "get html compressed", vcr: true do
+      response = subject.get("https://datacite.org/", headers: { "Accept-Encoding" => "gzip" })
+      expect(response.body["data"]).to include("html")
+    end
 
-    # it "get xml compressed", vcr: true do
-    #   response = subject.get("https://data.crosscite.org/application/vnd.datacite.datacite+xml/10.5061/dryad.8515", :headers => { "Accept-Encoding" => "gzip"})
-    #   expect(response.body["data"]).to be_a(Hash)
-    # end
+    it "get xml compressed", vcr: true do
+      response = subject.get("https://data.crosscite.org/application/vnd.datacite.datacite+xml/10.5061/dryad.8515", headers: { "Accept-Encoding" => "gzip" })
+      expect(response.body["data"]).to be_a(Hash)
+    end
+
+    it "get utf8 bad encoding", vcr: true do
+      response = subject.get("https://pub.sandbox.orcid.org/v3.0/0000-0002-5721-4355", accept: "json")
+      expect(response.body["data"]).to be_a(Hash)
+      expect(response.body["data"]["person"]["name"]["given-names"]["value"]).to eq("DataC??t??")
+      expect(response.body["data"]["person"]["name"]["family-name"]["value"]).to eq("UTF8 T??st")
+    end
+
+    it "get utf8 skip encoding", vcr: true do
+      response = subject.get("https://pub.sandbox.orcid.org/v3.0/0000-0002-5721-4355", accept: "json", skip_encoding: true)
+      expect(response.body["data"]).to be_a(Hash)
+      expect(response.body["data"]["person"]["name"]["given-names"]["value"]).to eq("DataCíté")
+      expect(response.body["data"]["person"]["name"]["family-name"]["value"]).to eq("UTF8 Tést")
+    end
   end
 
   context "head" do
@@ -99,7 +113,7 @@ describe Maremma do
       stub = stub_request(:head, url).to_return(status: 200, headers: { "Content-Type" => "text/html" })
       response = subject.head(url, accept: "html")
       expect(response.body).to be_nil
-      expect(response.headers).to eq("Content-Type" => "text/html")
+      expect(response.headers).to eq("Content-Length" => 0, "Content-Type" => "text/html")
       expect(stub).to have_been_requested
     end
   end
@@ -151,7 +165,7 @@ describe Maremma do
       stub = stub_request(:get, url).to_return(body: nil, status: 200, headers: { "Content-Type" => "application/json" })
       response = subject.get(url)
       expect(response.body).to eq("data" => nil)
-      expect(response.headers).to eq("Content-Type" => "application/json")
+      expect(response.headers).to eq("Content-Length" => 0, "Content-Type" => "application/json")
       expect(stub).to have_been_requested
     end
 
@@ -159,7 +173,7 @@ describe Maremma do
       stub = stub_request(:get, url).to_return(body: nil, status: 200, headers: { "Content-Type" => "application/xml" })
       response = subject.get(url, accept: "xml")
       expect(response.body).to eq("data" => nil)
-      expect(response.headers).to eq("Content-Type" => "application/xml")
+      expect(response.headers).to eq("Content-Length" => 0, "Content-Type" => "application/xml")
       expect(stub).to have_been_requested
     end
 
@@ -167,7 +181,7 @@ describe Maremma do
       stub = stub_request(:get, url).to_return(body: nil, status: 200, headers: { "Content-Type" => "text/html" })
       response = subject.get(url, accept: "html")
       expect(response.body).to eq("data" => nil)
-      expect(response.headers).to eq("Content-Type" => "text/html")
+      expect(response.headers).to eq("Content-Length" => 0, "Content-Type" => "text/html")
       expect(stub).to have_been_requested
     end
 
@@ -319,7 +333,7 @@ describe Maremma do
       stub = stub_request(:delete, url).to_return(status: 204, headers: { "Content-Type" => "text/html" })
       response = subject.delete(url)
       expect(response.body).to eq("data" => nil)
-      expect(response.headers).to eq("Content-Type" => "text/html")
+      expect(response.headers).to eq("Content-Length" => 0, "Content-Type" => "text/html")
       expect(response.status).to eq(204)
       expect(stub).to have_been_requested
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 4.9.2
+  version: 4.9.6
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -344,6 +344,8 @@ files:
 - spec/fixtures/vcr_cassettes/Maremma/get/get_html_compressed.yml
 - spec/fixtures/vcr_cassettes/Maremma/get/get_json_compressed.yml
 - spec/fixtures/vcr_cassettes/Maremma/get/get_json_with_params.yml
+- spec/fixtures/vcr_cassettes/Maremma/get/get_utf8_bad_encoding.yml
+- spec/fixtures/vcr_cassettes/Maremma/get/get_utf8_skip_encoding.yml
 - spec/fixtures/vcr_cassettes/Maremma/get/get_xml_compressed.yml
 - spec/fixtures/vcr_cassettes/Maremma/link_headers/parses_link_headers.yml
 - spec/fixtures/vcr_cassettes/Maremma/set_host/crossref.yml