maremma 3.0.2 → 3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db640552c55496aa0dc1ea7abe56a66cd95f44ee
-  data.tar.gz: be819fe1b4ca496f34a70e7ce993b41b02a27bb6
+  metadata.gz: 0fa8efffa613ac1806ff563a3fae7a430976baa9
+  data.tar.gz: 71f604839289779969077528a757a0cc1aa8f175
 SHA512:
-  metadata.gz: 70afab2fd2d2f2e2f39451e1d7fee815f4b3b0cc78be4c8dfc0168ef2091d0232c08e5f097f704f923f6beda0d851916ddeb29d53db969e57deeed36d399a4a9
-  data.tar.gz: 21ede85ceb69692685c9eaec5e31f69e869a022d4d95b2e47bd197c17b8e668a5c88f2fe2b514ec7eec3706cac0597813052e91a3906f628f0523b9a8a5168a2
+  metadata.gz: a391693917452149062b1f5053cde47fa387bf552667a8dd352f43b3fe2d6f283f544d1fc734ec9f6c2bb127ed1a3ff162aa441e966ad7f5bf5416e13b973246
+  data.tar.gz: 9bf52ef7911ef0994806ab8d483f6d7a670cc767d3d17e0af940929004305ef0831820a66b9969a3dc5e6982a0f81b523c5fd1b612cf951e0e7909d5b656da0e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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:
+
+* added `:raw` option to disable automatic parsing of JSON and XML responses.
+
 ## v.3.0.2 (December 10, 2016)
 
 [maremma 3.0.2](https://github.com/datacite/maremma/releases/tag/v.3.0.2) was released on December 10, 2016:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.0.2)
+    maremma (3.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.0.2"
+  VERSION = "3.1"
 end

data/lib/maremma.rb

@@ -30,7 +30,7 @@ module Maremma
     response = conn.post url, {}, options[:headers] do |request|
       request.body = options[:data]
     end
-    OpenStruct.new(body: parse_success_response(response.body),
+    OpenStruct.new(body: parse_success_response(response.body, options),
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
@@ -48,7 +48,7 @@ module Maremma
     response = conn.put url, {}, options[:headers] do |request|
       request.body = options[:data]
     end
-    OpenStruct.new(body: parse_success_response(response.body),
+    OpenStruct.new(body: parse_success_response(response.body, options),
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
@@ -65,7 +65,7 @@ module Maremma
 
     response = conn.delete url, {}, options[:headers]
 
-    OpenStruct.new(body: parse_success_response(response.body),
+    OpenStruct.new(body: parse_success_response(response.body, options),
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
@@ -87,7 +87,7 @@ module Maremma
                             headers: response.headers,
                             status: response.status)
     end
-    OpenStruct.new(body: parse_success_response(response.body),
+    OpenStruct.new(body: parse_success_response(response.body, options),
                    headers: response.headers,
                    status: response.status)
   rescue *NETWORKABLE_EXCEPTIONS => error
@@ -188,8 +188,8 @@ module Maremma
     end
   end
 
-  def self.parse_success_response(string)
-    string = parse_response(string)
+  def self.parse_success_response(string, options={})
+    string = parse_response(string, options)
 
     if string.blank?
       { "data" => nil }
@@ -212,7 +212,9 @@ module Maremma
     end
   end
 
-  def self.parse_response(string)
+  def self.parse_response(string, options={})
+    return string if options[:raw]
+
     from_json(string) || from_xml(string) || from_string(string)
   end
 

data/spec/maremma_spec.rb

@@ -70,6 +70,14 @@ describe Maremma do
       expect(response.headers).to eq("Content-Type"=>"application/json")
       expect(stub).to have_been_requested
     end
+
+    it "get xml raw" do
+      stub = stub_request(:get, url).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "application/xml" })
+      response = subject.get(url, accept: 'xml', raw: true)
+      expect(response.body).to eq("data"=>data.to_xml)
+      expect(response.headers).to eq("Content-Type"=>"application/xml")
+      expect(stub).to have_been_requested
+    end
   end
 
   context "empty response" do

metadata

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