maremma 2.2.2 → 2.3

data/spec/maremma_spec.rb

@@ -5,6 +5,7 @@ describe Maremma do
   let(:url) { "http://example.org" }
   let(:data) { { "name" => "Fred" } }
   let(:post_data) { { "name" => "Jack" } }
+  let(:accept_header) { "text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5" }
 
   context "get" do
     it "get json" do
@@ -47,9 +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", 861878, "BL.CCDC - The Cambridge Crystallographic Data Centre", 611424, "ETHZ.SEALS - E-Periodica", 511650, "ESTDOI.BIO - TÜ Loodusmuuseum", 487448, "CDL.DIGSCI - Digital Science", 387189, "TIB.R-GATE - ResearchGate", 373556, "GESIS.DIE - Deutsches Institut für Erwachsenenbildung", 373193, "ETHZ.EPICS-BA - E-Pics Bildarchiv", 348365, "TIB.PANGAEA - PANGAEA - Publishing Network for Geoscientific and Environmental Data", 345569, "BL.IMPERIAL - Imperial College London", 189735])
-      expect(facet_fields["resourceType_facet"]).to eq(["Dataset", 2530173, "Text", 1309569, "Other", 872249, "Image", 694451, "Collection", 313746, "Software", 14683, "PhysicalObject", 6688, "Event", 6557, "Audiovisual", 6171, "Film", 967, "Model", 539, "InteractiveResource", 321, "Sound", 240, "Workflow", 218, "Service", 21])
-      expect(facet_fields["publicationYear"]).to eq(["2015", 2044515, "2014", 922708, "2016", 395824, "2011", 337643, "2013", 333117, "2012", 211537, "2005", 162237, "2007", 158014, "2006", 144119, "2010", 142954])
+      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
 
@@ -227,6 +228,22 @@ describe Maremma do
     end
   end
 
+  context "content negotiation" do
+    it "redirects to URL", vcr: true do
+      url = "http://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")
+    end
+
+    it "returns content as bibtex", vcr: true do
+      url = "https://doi.org/10.5281/ZENODO.21430"
+      response = subject.get(url, content_type: "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}")
+    end
+  end
+
   context 'parse_error_response' do
     it 'json' do
       string = '{ "error": "An error occured." }'
@@ -266,58 +283,58 @@ describe Maremma do
     end
   end
 
-  context 'connection' do
+  context 'accept headers' do
     it 'default' do
-      conn = subject.faraday_conn
-      expect(conn.headers).to eq("Accept"=>"application/json",
-                                 "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+      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")
     end
 
     it 'json' do
-      conn = subject.faraday_conn('json')
-      expect(conn.headers).to eq("Accept"=>"application/json",
-                                 "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+      headers = subject.set_request_headers(url, content_type: 'json')
+      expect(headers).to eq("Accept"=>"application/json",
+                            "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
     end
 
     it 'xml' do
-      conn = subject.faraday_conn('xml')
-      expect(conn.headers).to eq("Accept"=>"application/xml",
-                                 "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+      headers = subject.set_request_headers(url, content_type: 'xml')
+      expect(headers).to eq("Accept"=>"application/xml",
+                            "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
     end
 
     it 'html' do
-      conn = subject.faraday_conn('html')
-      expect(conn.headers).to eq("Accept" => "text/html; charset=UTF-8",
-                                 "User-Agent" => "Maremma - https://github.com/datacite/maremma")
+      headers = subject.set_request_headers(url, content_type: 'html')
+      expect(headers).to eq("Accept" => "text/html; charset=UTF-8",
+                            "User-Agent" => "Maremma - https://github.com/datacite/maremma")
     end
 
     it 'other' do
-      conn = subject.faraday_conn('application/x-bibtex')
-      expect(conn.headers).to eq("Accept" => "application/x-bibtex",
-                                 "User-Agent" => "Maremma - https://github.com/datacite/maremma")
+      headers = subject.set_request_headers(url, content_type: 'application/x-bibtex')
+      expect(headers).to eq("Accept" => "application/x-bibtex",
+                            "User-Agent" => "Maremma - https://github.com/datacite/maremma")
     end
   end
 
   context 'authentication' do
     it 'no auth' do
       options = {}
-      expect(subject.set_request_headers(url, options)).to eq("Host"=>"example.org")
+      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header)
     end
 
     it 'bearer' do
       options = { bearer: 'mF_9.B5f-4.1JqM' }
-      expect(subject.set_request_headers(url, options)).to eq("Host"=>"example.org", "Authorization"=>"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")
     end
 
     it 'token' do
       options = { token: '12345' }
-      expect(subject.set_request_headers(url, options)).to eq("Host"=>"example.org", "Authorization"=>"Token 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")
     end
 
     it 'basic' do
       options = { username: 'foo', password: '12345' }
       basic = Base64.encode64("foo:12345")
-      expect(subject.set_request_headers(url, options)).to eq("Host"=>"example.org", "Authorization"=>"Basic #{basic}")
+      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Basic #{basic}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: '2.3'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -257,6 +257,8 @@ files:
 - lib/maremma.rb
 - lib/maremma/version.rb
 - maremma.gemspec
+- 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/maremma_spec.rb
 - spec/spec_helper.rb