maremma 3.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa8efffa613ac1806ff563a3fae7a430976baa9
-  data.tar.gz: 71f604839289779969077528a757a0cc1aa8f175
+  metadata.gz: ab2e7075facc4988175f758e582800b7479f3554
+  data.tar.gz: 99b3bf7a5d806867588e8e3384a003c2233ded50
 SHA512:
-  metadata.gz: a391693917452149062b1f5053cde47fa387bf552667a8dd352f43b3fe2d6f283f544d1fc734ec9f6c2bb127ed1a3ff162aa441e966ad7f5bf5416e13b973246
-  data.tar.gz: 9bf52ef7911ef0994806ab8d483f6d7a670cc767d3d17e0af940929004305ef0831820a66b9969a3dc5e6982a0f81b523c5fd1b612cf951e0e7909d5b656da0e
+  metadata.gz: b98eb05622984eab0c819f0650341127f93b1b58b83ccadaf121af8535227a54b6924a364e8e36d52bd1dce726d5d4307c2481644c8ac06f9ad2f9dcc697665a
+  data.tar.gz: 130bdf89a39c65dec55c9c3b48fd5ed8b8f9f10ac8ca63662b9ae44e72d152aaca3e7a6a7f54ba95afea47cc5ae03f6c8caa5a4e5ed7c0a6bd1599962cbca3a2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v.3.1.1 (January 2, 2017)
+
+[maremma 3.1.1](https://github.com/datacite/maremma/releases/tag/v.3.1.1) was released on January 2, 2017:
+
+* added option to disable redirects by setting `limit` to 0.
+* return status code for errors
+
 ## v.3.1 (December 10, 2016)
 
 [maremma 3.1](https://github.com/datacite/maremma/releases/tag/v.3.1) was released on December 10, 2016:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.1)
+    maremma (3.1.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.1"
+  VERSION = "3.1.1"
 end

data/lib/maremma.rb

@@ -34,7 +34,9 @@ module Maremma
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
-    OpenStruct.new(body: rescue_faraday_error(error))
+    error_response = rescue_faraday_error(error)
+    OpenStruct.new(body: error_response,
+                   status: error_response.fetch("errors", {}).first.fetch("status", 400))
   end
 
   def self.put(url, options={})
@@ -52,7 +54,9 @@ module Maremma
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
-    OpenStruct.new(body: rescue_faraday_error(error))
+    error_response = rescue_faraday_error(error)
+    OpenStruct.new(body: error_response,
+                   status: error_response.fetch("errors", {}).first.fetch("status", 400))
   end
 
   def self.delete(url, options={})
@@ -69,7 +73,9 @@ module Maremma
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
-    OpenStruct.new(body: rescue_faraday_error(error))
+    error_response = rescue_faraday_error(error)
+    OpenStruct.new(body: error_response,
+                   status: error_response.fetch("errors", {}).first.fetch("status", 400))
   end
 
   def self.get(url, options={})
@@ -91,7 +97,9 @@ module Maremma
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
-    OpenStruct.new(body: rescue_faraday_error(error))
+    error_response = rescue_faraday_error(error)
+    OpenStruct.new(body: error_response,
+                   status: error_response.fetch("errors", {}).first.fetch("status", 400))
   end
 
   def self.head(url, options={})
@@ -112,7 +120,9 @@ module Maremma
     OpenStruct.new(headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
-    OpenStruct.new(body: rescue_faraday_error(error))
+    error_response = rescue_faraday_error(error)
+    OpenStruct.new(body: error_response,
+                   status: error_response.fetch("errors", {}).first.fetch("status", 400))
   end
 
   def self.faraday_conn(options = {})
@@ -127,7 +137,7 @@ module Maremma
       c.headers['Content-type'] = options[:headers]['Content-type'] if options[:headers]['Content-type'].present?
       c.headers['Accept'] = options[:headers]['Accept']
       c.headers['User-Agent'] = options[:headers]['User-Agent']
-      c.use      FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all
+      c.use      FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all if limit > 0
       c.request  :multipart
       c.request  :json if options[:headers]['Accept'] == 'application/json'
       c.use      Faraday::Response::RaiseError

data/spec/maremma_spec.rb

@@ -32,6 +32,14 @@ describe Maremma do
       expect(stub).to have_been_requested
     end
 
+    it "head html" do
+      stub = stub_request(:head, url).to_return(:body => data.to_s, :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(stub).to have_been_requested
+    end
+
     it "post xml" do
       stub = stub_request(:post, url).with(:body => post_data.to_xml).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "text/html" })
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.body.to_s)["hash"]).to eq(data) }
@@ -142,6 +150,13 @@ describe Maremma do
       expect(stub).to have_been_requested
     end
 
+    it "head html" do
+      stub = stub_request(:head, url).to_return(:body => error.to_s, :status => [404], :headers => { "Content-Type" => "text/html" })
+      response = subject.head(url, accept: 'html')
+      expect(response.status).to eq(404)
+      expect(stub).to have_been_requested
+    end
+
     it "post xml" do
       stub = stub_request(:post, url).with(:body => post_data.to_xml).to_return(:body => error.to_xml, :status => [404], :headers => { "Content-Type" => "application/xml" })
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.to_s)["hash"]).to eq(error) }
@@ -177,6 +192,13 @@ describe Maremma do
       expect(stub).to have_been_requested
     end
 
+    it "head html" do
+      stub = stub_request(:head, url).to_return(:status => [408])
+      response = subject.head(url, accept: 'html')
+      expect(response.status).to eq(408)
+      expect(stub).to have_been_requested
+    end
+
     it "post xml" do
       stub = stub_request(:post, url).with(:body => post_data.to_xml).to_return(:status => [408])
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
@@ -190,15 +212,6 @@ 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.headers).to eq("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" })
@@ -344,6 +357,18 @@ describe Maremma do
       response = subject.get(url, limit: 1)
       expect(response.body).to eq("errors"=>[{"status"=>400, "title"=>"too many redirects; last one to: http://www.example.org/redirect/x"}])
     end
+
+    it "redirect limit 0" do
+      stub_request(:get, url).to_return(status: 301, headers: { location: redirect_url })
+      response = subject.get(url, limit: 0)
+      expect(response.headers["Location"]).to eq("http://www.example.org/redirect")
+    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.headers["Location"]).to eq("http://www.example.org/redirect")
+    end
   end
 
   context "content negotiation" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: 3.1.1
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday