maremma 3.6 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64c7b8e828375f7fab850b6701b489c9a173ebc3
-  data.tar.gz: f3e6c5bf75e6ed1c27eae86a428aa1f44cf2f5f3
+SHA256:
+  metadata.gz: ec281d3b385d2d0eef4a9f59f50ecc8e7dec4e71ac54e73291a2a1711142219d
+  data.tar.gz: df794f29494d832c761548457749311a977b51823590cf313aee08b8607988c2
 SHA512:
-  metadata.gz: c4453d002050d51af43304e691f4132d14397565960c6b740ed691607666273aa0e3abb6ae1cdb61bd863ef3f0e69f9ec607107b320dd4e970d2bf1a505fb1ef
-  data.tar.gz: dacd09e525ea2cbdbee7a351b60f841fd54340f3bde663d653af062699244457939e1ad5ad91587ba1623a519bb72daf42ab0ca8f47d5fcf9b0d7be367fa1ba6
+  metadata.gz: 1a82951014812c66ab5fada2ea5a9d2a16fc961c667b74aa3cc5a667f6e409eb5c0b08b41c85d3602a6897d67ef3d225b34444c3cf3b1e320dee82a307468ac2
+  data.tar.gz: 581d70b90b2bdfa0f0edc05c980a4b38d3e18954a938d0c36dda22ffb324caa8fcbf26346d69650c520542366d921c35dbd008c94eeb9ffda0a3bc23e364d2af

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.3.6.1 (January 9, 2018)
+
+[maremma 3.6.1](https://github.com/datacite/maremma/releases/tag/v.3.6.1) was released on January 9, 2018:
+
+* correctly show 401 status and error message
+
 ## v.3.6 (October 14, 2017)
 
 [maremma 3.6](https://github.com/datacite/maremma/releases/tag/v.3.6) was released on October 14, 2017:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.6)
+    maremma (3.6.1)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -10,7 +10,7 @@ PATH
       faraday-encoding (~> 0.0.1)
       faraday_middleware (~> 0.10.0)
       multi_json (~> 1.12)
-      nokogiri (~> 1.6, >= 1.6.8)
+      nokogiri (~> 1.8.1)
       oj (>= 2.8.3)
 
 GEM
@@ -39,33 +39,34 @@ GEM
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
     hashdiff (0.3.7)
-    i18n (0.8.6)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    multi_json (1.12.2)
+    minitest (5.11.1)
+    multi_json (1.13.0)
     multipart-post (2.0.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    oj (3.3.8)
-    public_suffix (3.0.0)
+    oj (3.3.10)
+    public_suffix (3.0.1)
     rack (2.0.3)
-    rack-test (0.7.0)
+    rack-test (0.8.2)
       rack (>= 1.0, < 3)
-    rake (12.1.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     safe_yaml (1.0.4)
     simplecov (0.13.0)
       docile (~> 1.1.0)
@@ -73,10 +74,10 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     vcr (3.0.3)
-    webmock (3.1.0)
+    webmock (3.2.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -96,4 +97,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   1.15.3
+   1.16.0

data/README.md

@@ -26,7 +26,7 @@ gem install maremma
 
 ## Usage
 ```ruby
-Maremma.get 'http://dlm.datacite.org/heartbeat' => { "data" => { "services"=>{ "mysql"=>"OK",
+Maremma.get 'https://dlm.datacite.org/heartbeat' => { "data" => { "services"=>{ "mysql"=>"OK",
                                                                                "memcached"=>"OK",
                                                                                "redis"=>"OK",
                                                                                "sidekiq"=>"OK",

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.6"
+  VERSION = "3.6.1"
 end

data/lib/maremma.rb

@@ -138,7 +138,7 @@ module Maremma
       # GitHub uses different format for token authentication
       headers["Authorization"] = "Token #{options[:github_token]}"
     elsif options[:username].present?
-      basic = Base64.strict_encode64("#{options[:username]}:#{options[:password]}")
+      basic = Base64.strict_encode64("#{options[:username]}:#{options[:password]}").chomp
       headers["Authorization"] = "Basic #{basic}"
     end
 
@@ -148,8 +148,11 @@ module Maremma
   def self.rescue_faraday_error(error)
     if error.is_a?(Faraday::ResourceNotFound)
       { 'errors' => [{ 'status' => 404, 'title' => "Not found" }] }
+    elsif error.message == "Unauthorized" || error.try(:response) && error.response[:status] == 401
+      { 'errors' => [{ 'status' => 401, 'title' =>"Unauthorized" }] }
     elsif error.is_a?(Faraday::ConnectionFailed)
-      { 'errors' => [{ 'status' => "403", 'title' => parse_error_response(error.message) }] }
+      { 'errors' => [{ 'status' => 403, 'title' => parse_error_response(error.message) }] }
+
     elsif error.is_a?(Faraday::TimeoutError) || (error.try(:response) && error.response[:status] == 408)
       { 'errors' => [{ 'status' => 408, 'title' =>"Request timeout" }] }
     else

data/maremma.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday_middleware', '~> 0.10.0'
   s.add_dependency 'faraday-encoding', '~> 0.0.1'
   s.add_dependency 'excon', '~> 0.45.0'
-  s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
+  s.add_dependency 'nokogiri', '~> 1.8.1'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'multi_json', '~> 1.12'
   s.add_dependency 'oj', '>= 2.8.3'

data/spec/maremma_spec.rb

@@ -259,21 +259,21 @@ describe Maremma do
     it "get json" do
       stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
       response = subject.get(url)
-      expect(response.body).to eq("errors"=>[{"status"=>"403", "title"=>"Connection refused - connect(2)"}])
+      expect(response.body).to eq("errors"=>[{"status"=>403, "title"=>"Connection refused - connect(2)"}])
       expect(stub).to have_been_requested
     end
 
     it "get xml" do
       stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
       response = subject.get(url, accept: 'xml')
-      expect(response.body).to eq("errors"=>[{"status"=>"403", "title"=>"Connection refused - connect(2)"}])
+      expect(response.body).to eq("errors"=>[{"status"=>403, "title"=>"Connection refused - connect(2)"}])
       expect(stub).to have_been_requested
     end
 
     it "get html" do
       stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
       response = subject.get(url, accept: 'html')
-      expect(response.body).to eq("errors"=>[{"status"=>"403", "title"=>"Connection refused - connect(2)"}])
+      expect(response.body).to eq("errors"=>[{"status"=>403, "title"=>"Connection refused - connect(2)"}])
       expect(stub).to have_been_requested
     end
 
@@ -290,6 +290,47 @@ describe Maremma do
     end
   end
 
+  context "unauthorized" do
+    it "get json" do
+      stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("Unauthorized"))
+      response = subject.get(url)
+      expect(response.body).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
+      expect(stub).to have_been_requested
+    end
+
+    it "get xml" do
+      stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("Unauthorized"))
+      response = subject.get(url, accept: 'xml')
+      expect(response.body).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
+      expect(stub).to have_been_requested
+    end
+
+    it "get html" do
+      stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("Unauthorized"))
+      response = subject.get(url, accept: 'html')
+      expect(response.body).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
+      expect(stub).to have_been_requested
+    end
+
+    it "post xml" do
+      stub = stub_request(:post, url).with(:body => post_data.to_xml).to_raise(Faraday::Error::ClientError.new("Unauthorized"))
+      subject.post(url, accept: 'xml', data: post_data.to_xml) do |response|
+        expect(response.body).to be_nil
+        expect(response.status).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
+      end
+      expect(stub).to have_been_requested
+    end
+
+    it "put xml" do
+      stub = stub_request(:put, url).with(:body => post_data.to_xml).to_raise(Faraday::Error::ClientError.new("Unauthorized"))
+      subject.put(url, accept: 'xml', data: post_data.to_xml) do |response|
+        expect(response.body).to be_nil
+        expect(response.status).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
+      end
+      expect(stub).to have_been_requested
+    end
+  end
+
   context "request timeout internal" do
     it "get json" do
       stub = stub_request(:get, url).to_timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: '3.6'
+  version: 3.6.1
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2018-01-09 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.8.1
   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.8.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -342,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Simplified network calls