maremma 3.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99de211de38fbb778846ba247970b691e6d3f97e
-  data.tar.gz: cd6f9eb248255ae6d761e6788d517f294095e11a
+  metadata.gz: d377e378aad9759ac9f218ba16377509339c029c
+  data.tar.gz: 1dafc2fd5db389a50dc4b7d60a7d80ef5731b4f9
 SHA512:
-  metadata.gz: fffd72b4ef2e73ff34fab96649b7472eccef51893a0b9c54fcb9441d21ea4c447861a78d1f2114054453a5934398f3c9de077364be72885c8f69f539d681ab11
-  data.tar.gz: ceb1d297b65b1d9847d809b35cead4cad152c1f9b76ccdfd40d44095c8979823e38bec16d76eac119e172b1f466fb4c32d86885e109f8bf53e63b86ddc0c5dd5
+  metadata.gz: 3d342a26a0519b9396614f3f191b19ee2644c9f31b52a56053dd4d1e548b1f42cafef377704c56b11b527096e54cd728d129af7e57e7636cd471ff0523e9e7ad
+  data.tar.gz: 83768b5fec5c5cd51f10bebfa94ed0bd0cb3b577fd895350e28ab784606cabb02c1468ed1dec10fcbb25c25bd2a272160745e20622d3b8e8ae9527d1ab938216

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.0)
+    maremma (3.0.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -95,4 +95,4 @@ DEPENDENCIES
   webmock (~> 1.22, >= 1.22.3)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/lib/maremma.rb

@@ -38,7 +38,21 @@ module Maremma
   end
 
   def self.put(url, options={})
-    self.post(url, options={})
+    options[:data] ||= {}
+    options[:headers] = set_request_headers(url, options)
+
+    conn = faraday_conn(options)
+
+    conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
+
+    response = conn.put url, {}, options[:headers] do |request|
+      request.body = options[:data]
+    end
+    OpenStruct.new(body: parse_success_response(response.body),
+                   headers: response.headers,
+                   status: response.status)
+  rescue *NETWORKABLE_EXCEPTIONS => error
+    OpenStruct.new(body: rescue_faraday_error(error))
   end
 
   def self.delete(url, options={})

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.0"
+  VERSION = "3.0.1"
 end

data/spec/maremma_spec.rb

@@ -38,6 +38,12 @@ describe Maremma do
       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 => data.to_xml, :status => 200, :headers => { "Content-Type" => "text/html" })
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.body.to_s)["hash"]).to eq(data) }
+      expect(stub).to have_been_requested
+    end
+
     it "get json with params", vcr: true do
       params = { q: "*:*",
                  fl: "doi,title,description,publisher,publicationYear,resourceType,resourceTypeGeneral,rightsURI,datacentre_symbol,xml,minted,updated",
@@ -96,6 +102,12 @@ describe Maremma do
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to eq("data" => nil) }
       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 => nil, :status => 200, :headers => { "Content-Type" => "application/xml" })
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to eq("data" => nil) }
+      expect(stub).to have_been_requested
+    end
   end
 
   context "not found" do
@@ -127,6 +139,12 @@ describe Maremma do
       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 => [404], :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
@@ -156,6 +174,12 @@ describe Maremma do
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
       expect(stub).to have_been_requested
     end
+
+    it "put xml" do
+      stub = stub_request(:put, url).with(:body => post_data.to_xml).to_return(:status => [408])
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
+      expect(stub).to have_been_requested
+    end
   end
 
   context "head" do
@@ -173,6 +197,7 @@ describe Maremma do
       response = subject.delete(url)
       expect(response.body).to eq("data"=>nil)
       expect(response.headers).to eq("Content-Type"=>"text/html")
+      expect(response.status).to eq(204)
       expect(stub).to have_been_requested
     end
   end
@@ -204,6 +229,12 @@ describe Maremma do
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
       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::ConnectionFailed.new("Connection refused - connect(2)"))
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
+      expect(stub).to have_been_requested
+    end
   end
 
   context "request timeout internal" do
@@ -233,6 +264,12 @@ describe Maremma do
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
       expect(stub).to have_been_requested
     end
+
+    it "put xml" do
+      stub = stub_request(:put, url).with(:body => post_data.to_xml).to_timeout
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
+      expect(stub).to have_been_requested
+    end
   end
 
   context "rate limit exceeded" do
@@ -263,6 +300,13 @@ describe Maremma do
       subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
       expect(stub).to have_been_requested
     end
+
+    it "put xml" do
+      stub = stub_request(:put, url).with(:body => post_data.to_xml)
+        .to_return(status: 200, headers: { 'X-Rate-Limit-Remaining' => 3 })
+      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(response.body).to be_nil }
+      expect(stub).to have_been_requested
+    end
   end
 
   context "redirect requests" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: 3.0.1
 platform: ruby
 authors:
 - Martin Fenner