maremma 4.0.8 → 4.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d8ec448c94779063007dea0d8dd6425e812eaffda6a1bd5edccbf89522660b
-  data.tar.gz: c7cb75cb4f844dda296424121a753eb896bf018206da609e9554510fe2e3f4f3
+  metadata.gz: 7e790976bf10bd55476209f7f6f6e6cad065cb4f9b110c69c08b4754aa3d5472
+  data.tar.gz: 886599b911990f5caed6bcb55bee0a9fe308c5023b0718ec2fa65f0bc6b0836c
 SHA512:
-  metadata.gz: c55bcbd4e172d1db6c9062d2148dd27c0ee1f64a0859d0f5aad89ccf1a6b570c828086bfb3f3d58bc86ceed329afd817c6ef3583efa9f5aca38f728406282163
-  data.tar.gz: e28b0c9a80f47e79c70b3d2d52d65355654cf80f3d1e9386e18e90b83dd42d3b662ff5e28469a8951e06f2f0469888679002d497f5cdebb11a1b91917eb753a2
+  metadata.gz: d4ef49ba544067145d829ddf63749cd144c6674d58f85749000b4c219afa31d1dbea519b401879d25c3d443d1b8de87e71811585d1798506a2c977841871ea47
+  data.tar.gz: 32b7ac408ea233a65efa50c95f156d868000c914195d1144f0e6432c3fd074346232a8854d8444ad66fe2c3a876f61496736061cfe3dd3555b3b62d04d731dfa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (4.0.8)
+    maremma (4.0.9)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -46,7 +46,7 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     oj (3.6.2)
     public_suffix (3.0.2)

data/lib/maremma.rb

@@ -190,8 +190,12 @@ module Maremma
   def self.parse_error_response(string)
     string = parse_response(string)
 
+    string = string['hash'] if string.is_a?(Hash) && string['hash']
+
     if string.is_a?(Hash) && string['error']
       string['error']
+    elsif string.is_a?(Hash) && string['errors']
+      string.dig('errors', 0, "title")
     else
       string
     end

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "4.0.8"
+  VERSION = "4.0.9"
 end

data/spec/maremma_spec.rb

@@ -202,6 +202,50 @@ describe Maremma do
     end
   end
 
+  context "method not allowed" do
+    let(:error) { { "errors" => [{ "status" => 405, "title" => "Method not allowed" }]} }
+
+    it "get json" do
+      stub = stub_request(:get, url).to_return(:body => error.to_json, :status => [405], :headers => { "Content-Type" => "application/json" })
+      response = subject.get(url, accept: 'json')
+      expect(response.body).to eq(error)
+      expect(stub).to have_been_requested
+    end
+
+    it "get xml" do
+      stub = stub_request(:get, url).to_return(:body => error.to_xml, :status => [405], :headers => { "Content-Type" => "application/xml" })
+      response = subject.get(url, accept: 'xml')
+      expect(response.body).to eq(error)
+      expect(stub).to have_been_requested
+    end
+
+    it "get html" do
+      stub = stub_request(:get, url).to_return(:body => error.dig("errors", 0, "title"), :status => [405], :headers => { "Content-Type" => "text/html" })
+      response = subject.get(url, accept: 'html')
+      expect(response.body).to eq(error)
+      expect(stub).to have_been_requested
+    end
+
+    it "head html" do
+      stub = stub_request(:head, url).to_return(:body => error.to_s, :status => [405], :headers => { "Content-Type" => "text/html" })
+      response = subject.head(url, accept: 'html')
+      expect(response.status).to eq(405)
+      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 => [405], :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) }
+      expect(stub).to have_been_requested
+    end
+
+    it "put xml" do
+      stub = stub_request(:put, url).with(:body => post_data.to_xml).to_return(:body => error.to_xml, :status => [405], :headers => { "Content-Type" => "application/xml" })
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.to_s)["hash"]).to eq(error) }
+      expect(stub).to have_been_requested
+    end
+  end
+
   context "request timeout" do
     it "get json" do
       stub = stub_request(:get, url).to_return(:status => [408])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.0.9
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday