maremma 2.4.4 → 2.5

data/spec/maremma_spec.rb

@@ -11,21 +11,21 @@ describe Maremma do
     it "get json" do
       stub = stub_request(:get, url).to_return(:body => data.to_json, :status => 200, :headers => { "Content-Type" => "application/json" })
       response = subject.get(url)
-      expect(response).to eq("data" => data)
+      expect(response).to eq("data" => data, "headers"=>{"Content-Type"=>"application/json"})
       expect(stub).to have_been_requested
     end
 
     it "get xml" do
       stub = stub_request(:get, url).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "application/xml" })
       response = subject.get(url, accept: 'xml')
-      expect(response).to eq("data" => data)
+      expect(response).to eq("data"=>data, "headers"=>{"Content-Type"=>"application/xml"})
       expect(stub).to have_been_requested
     end
 
     it "get html" do
       stub = stub_request(:get, url).to_return(:body => data.to_s, :status => 200, :headers => { "Content-Type" => "text/html" })
       response = subject.get(url, accept: 'html')
-      expect(response).to eq("data" => data.to_s)
+      expect(response).to eq("data" => data.to_s, "headers"=>{"Content-Type"=>"text/html"})
       expect(stub).to have_been_requested
     end
 
@@ -48,18 +48,9 @@ describe Maremma do
       expect(url).to eq("https://search.datacite.org/api?q=*%3A*&fl=doi%2Ctitle%2Cdescription%2Cpublisher%2CpublicationYear%2CresourceType%2CresourceTypeGeneral%2CrightsURI%2Cdatacentre_symbol%2Cxml%2Cminted%2Cupdated&fq=has_metadata%3Atrue&fq=is_active%3Atrue&facet=true&facet.field=resourceType_facet&facet.field=publicationYear&facet.field=datacentre_facet&facet.limit=10&f.resourceType_facet.facet.limit=15&wt=json")
       response = subject.get(url)
       facet_fields = response.fetch("data", {}).fetch("facet_counts", {}).fetch("facet_fields", {})
-      expect(facet_fields["datacentre_facet"]).to eq(["CDL.DPLANET - Data-Planet", 862673, "BL.CCDC - The Cambridge Crystallographic Data Centre", 617281, "ETHZ.SEALS - E-Periodica", 511747, "ESTDOI.BIO - TÜ Loodusmuuseum", 487448, "CDL.DIGSCI - Digital Science", 431015, "TIB.R-GATE - ResearchGate", 391313, "GESIS.DIE - Deutsches Institut für Erwachsenenbildung", 373193, "ETHZ.EPICS-BA - E-Pics Bildarchiv", 355076, "TIB.PANGAEA - PANGAEA - Publishing Network for Geoscientific and Environmental Data", 346849, "BL.IMPERIAL - Imperial College London", 190482])
-      expect(facet_fields["resourceType_facet"]).to eq(["Dataset", 2598715, "Text", 1390919, "Other", 873873, "Image", 704151, "Collection", 351593, "Software", 15895, "Audiovisual", 7098, "Event", 6711, "PhysicalObject", 6680, "Film", 920, "Model", 556, "InteractiveResource", 372, "Sound", 243, "Workflow", 221, "Service", 21])
-      expect(facet_fields["publicationYear"]).to eq(["2015", 2040850, "2014", 936486, "2016", 522234, "2011", 339370, "2013", 335358, "2012", 214191, "2005", 163347, "2007", 159146, "2006", 146147, "2010", 144512])
-    end
-  end
-
-  context "head" do
-    it "head html" do
-      stub = stub_request(:head, url).to_return(:status => 200, :headers => { "Content-Type" => "text/html" })
-      response = subject.head(url, accept: 'html')
-      expect(response).to eq("Content-Type"=>"text/html")
-      expect(stub).to have_been_requested
+      expect(facet_fields["datacentre_facet"].each_slice(2).first).to eq(["CDL.DPLANET - Data-Planet", 866179])
+      expect(facet_fields["resourceType_facet"].each_slice(2).first).to eq(["Dataset", 2868231])
+      expect(facet_fields["publicationYear"].each_slice(2).first).to eq(["2015", 2048329])
     end
   end
 
@@ -67,21 +58,21 @@ describe Maremma do
     it "get json" do
       stub = stub_request(:get, url).to_return(:body => nil, :status => 200, :headers => { "Content-Type" => "application/json" })
       response = subject.get(url)
-      expect(response).to eq("data" => nil)
+      expect(response).to eq("data"=>nil, "headers"=>{"Content-Type"=>"application/json"})
       expect(stub).to have_been_requested
     end
 
     it "get xml" 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).to eq("data" => nil)
+      expect(response).to eq("data"=>nil, "headers"=>{"Content-Type"=>"application/xml"})
       expect(stub).to have_been_requested
     end
 
     it "get html" 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).to eq("data" => nil)
+      expect(response).to eq("data" => nil, "headers"=>{"Content-Type"=>"text/html"})
       expect(stub).to have_been_requested
     end
 
@@ -149,6 +140,24 @@ describe Maremma do
     end
   end
 
+  context "head" do
+    it "head" do
+      stub = stub_request(:head, url).to_return(:status => 200, :headers => { "Content-Type" => "application/json" })
+      response = subject.head(url)
+      expect(response).to eq("headers"=>{"Content-Type"=>"application/json"})
+      expect(stub).to have_been_requested
+    end
+  end
+
+  context "delete" do
+    it "delete" do
+      stub = stub_request(:delete, url).to_return(:status => 204, :headers => { "Content-Type" => "text/html" })
+      response = subject.delete(url)
+      expect(response).to eq("data"=>nil, "headers"=>{"Content-Type"=>"text/html"})
+      expect(stub).to have_been_requested
+    end
+  end
+
   context "connection failed" do
     it "get json" do
       stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
@@ -244,7 +253,7 @@ describe Maremma do
       stub_request(:get, url).to_return(status: 301, headers: { location: redirect_url })
       stub_request(:get, redirect_url).to_return(status: 200, body: "Test")
       response = subject.get(url)
-      expect(response).to eq("data"=>"Test")
+      expect(response).to eq("data"=>"Test", "headers"=>{})
     end
 
     it "redirect four times" do
@@ -254,7 +263,7 @@ describe Maremma do
       stub_request(:get, redirect_url+ "/y").to_return(status: 301, headers: { location: redirect_url + "/z" })
       stub_request(:get, redirect_url + "/z").to_return(status: 200, body: "Test")
       response = subject.get(url)
-      expect(response).to eq("data"=>"Test")
+      expect(response).to eq("data"=>"Test", "headers"=>{})
     end
 
     it "redirect limit 1" do
@@ -264,27 +273,30 @@ describe Maremma do
       response = subject.get(url, limit: 1)
       expect(response).to eq("errors"=>[{"status"=>400, "title"=>"too many redirects; last one to: http://www.example.org/redirect/x"}])
     end
-
-    it "redirect limit 0 head" do
-      stub_request(:head, url).to_return(status: 301, headers: { location: redirect_url })
-      response = subject.head(url, limit: 0)
-      expect(response["Location"]).to eq("http://www.example.org/redirect")
-    end
   end
 
   context "content negotiation" do
     it "redirects to URL", vcr: true do
-      url = "http://doi.org/10.5281/ZENODO.21430"
+      url = "https://doi.org/10.5281/ZENODO.21430"
       response = subject.get(url)
       doc = Nokogiri::HTML(response.fetch("data", ""))
       title = doc.at_css("head title").text
-      expect(title).to eq("DataCite-ORCID: 1.0 - Zenodo")
+      expect(title).to eq("DataCite-ORCID: 1.0 | Zenodo")
     end
 
     it "returns content as bibtex", vcr: true do
       url = "https://doi.org/10.5281/ZENODO.21430"
       response = subject.get(url, accept: "application/x-bibtex")
-      expect(response.fetch("data", nil)).to eq("@data{198243d2-ed8a-4126-867e-5fff1e80dcfc,\n  doi = {10.5281/ZENODO.21430},\n  url = {http://dx.doi.org/10.5281/ZENODO.21430},\n  author = {Martin Fenner; Karl Jonathan Ward; Gudmundur A. Thorisson; Robert Peters; },\n  publisher = {Zenodo},\n  title = {DataCite-ORCID: 1.0},\n  year = {2015}\n}")
+      expect(response.fetch("data", nil)).to eq("@misc{https://doi.org/10.5281/ZENODO.21430,\n  doi = {10.5281/ZENODO.21430},\n  url = {https://doi.org/10.5281/ZENODO.21430},\n  author = {Martin Fenner and Karl Jonathan Ward and Gudmundur A. Thorisson and Robert Peters},\n  publisher = {Zenodo},\n  title = {DataCite-ORCID: 1.0},\n  year = {2015}\n}")
+    end
+  end
+
+  context "link headers" do
+    it "parses link headers", vcr: true do
+      url = "https://search.datacite.org/works/10.5281/ZENODO.21430"
+      response = subject.get(url)
+      headers = response.fetch("headers", {}).fetch("Link", "").split(", ")
+      expect(headers.first).to eq("<https://doi.org/10.5281/ZENODO.21430> ; rel=\"identifier\"")
     end
   end
 
@@ -308,94 +320,89 @@ describe Maremma do
   context 'parse_success_response' do
     it 'from_json' do
       string = '{ "word": "abc" }'
-      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>"abc"})
+      expect(subject.parse_success_response(string)).to eq("word"=>"abc")
     end
 
     it 'from_json with data' do
       string = '{ "data": { "word": "abc" }}'
-      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>"abc"})
+      expect(subject.parse_success_response(string)).to eq("word"=>"abc")
     end
 
     it 'from_xml' do
       string = "<word>abc</word>"
-      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>"abc"})
+      expect(subject.parse_success_response(string)).to eq("word"=>"abc")
     end
 
     it 'from_string' do
       string = "abc"
-      expect(subject.parse_success_response(string)).to eq("data"=>"abc")
+      expect(subject.parse_success_response(string)).to eq("abc")
     end
 
     it 'from_string with utf-8' do
       string = "fön  "
-      expect(subject.parse_success_response(string)).to eq("data"=>"fön")
+      expect(subject.parse_success_response(string)).to eq("fön")
     end
   end
 
   context 'accept headers' do
     it 'default' do
       headers = subject.set_request_headers(url)
-      expect(headers).to eq("Accept"=>"text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5",
-                            "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+      expect(headers["Accept"]).to eq("text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5")
     end
 
     it 'json' do
       headers = subject.set_request_headers(url, accept: 'json')
-      expect(headers).to eq("Accept"=>"application/json",
-                            "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+      expect(headers["Accept"]).to eq("application/json")
     end
 
     it 'xml' do
       headers = subject.set_request_headers(url, accept: 'xml')
-      expect(headers).to eq("Accept"=>"application/xml",
-                            "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+      expect(headers["Accept"]).to eq("application/xml")
     end
 
     it 'html' do
       headers = subject.set_request_headers(url, accept: 'html')
-      expect(headers).to eq("Accept" => "text/html; charset=UTF-8",
-                            "User-Agent" => "Maremma - https://github.com/datacite/maremma")
+      expect(headers["Accept"]).to eq("text/html; charset=UTF-8")
     end
 
     it 'other' do
       headers = subject.set_request_headers(url, accept: 'application/x-bibtex')
-      expect(headers).to eq("Accept" => "application/x-bibtex",
-                            "User-Agent" => "Maremma - https://github.com/datacite/maremma")
+      expect(headers["Accept"]).to eq("application/x-bibtex")
     end
   end
 
   context 'authentication' do
     it 'no auth' do
       options = {}
-      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header)
+      expect(subject.set_request_headers(url, options)["Authorization"]).to be nil
     end
 
     it 'bearer' do
       options = { bearer: 'mF_9.B5f-4.1JqM' }
-      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Bearer mF_9.B5f-4.1JqM")
+      expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Bearer mF_9.B5f-4.1JqM")
     end
 
     it 'token' do
       options = { token: '12345' }
-      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token token=12345")
+      expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Token token=12345")
     end
 
     it 'basic' do
       options = { username: 'foo', password: '12345' }
       basic = Base64.encode64("foo:12345")
-      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Basic #{basic}")
+      expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Basic #{basic}")
     end
   end
 
   context 'host' do
     it 'empty' do
       options = {}
-      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header)
+      expect(subject.set_request_headers(url, options)["Host"]).to be nil
     end
 
     it 'true' do
       options = { host: true}
-      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Host"=>"example.org", "Accept"=>accept_header)
+      expect(subject.set_request_headers(url, options)["Host"]).to eq("example.org")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: '2.5'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,20 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -124,16 +118,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.3
+        version: 2.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.3
+        version: 2.13.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +288,7 @@ files:
 - spec/fixtures/vcr_cassettes/Maremma/content_negotiation/redirects_to_URL.yml
 - spec/fixtures/vcr_cassettes/Maremma/content_negotiation/returns_content_as_bibtex.yml
 - spec/fixtures/vcr_cassettes/Maremma/get/get_json_with_params.yml
+- spec/fixtures/vcr_cassettes/Maremma/link_headers/parses_link_headers.yml
 - spec/maremma_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/datacite/maremma