maremma 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2622dc1207e73ccef92d34558f7e48cfea352be0
-  data.tar.gz: 6dd16a78e92871da8d96dfa30506c33d7f27abc0
+  metadata.gz: 7f0dba7886b660d888aad1396336217da1fbb38a
+  data.tar.gz: 9e4f2ddefab4fe463e42084b4bd1393768feae67
 SHA512:
-  metadata.gz: 7c116e6d1cc8fe6ec3550b631041467f6411176cb2ab2220e8a79903f59aa8a024275876238027219f3237a091f9523772df0a408bf1fef9beaf883becb7ce66
-  data.tar.gz: 63e1086232fbd8fe2b3cf3025c7b881c82db6d4ee5df5eb6abbb8e36dd4c7c9c3c8d52f580351c58fecdf297df2c394359d5f24117f2213b580311acf6ecbb57
+  metadata.gz: f618a4c3cf13f2457ad73e05a90e09e41e1e05c831d9fb5451d8a2781a00a62cfbc89d7fc375c772b255a609f5bf75eda2bed6cc5bd799c83d64ecc8efd1a003
+  data.tar.gz: 8ce548a82f8f108bb52ed6d30ae76df2e91987da32ee1bed9070a9f7500f6c9ce64203e2c682b6b323e79f7905777e084f4ac487ac977557c0947e573467b249

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.2.5.4 (November 23, 2016)
+
+[maremma 2.5](https://github.com/datacite/maremma/releases/tag/v.2.5.4) was released on November 23, 2016:
+
+* fixed regression error in parsing response body
+
 ## v.2.5 (November 18, 2016)
 
 [maremma 2.5](https://github.com/datacite/maremma/releases/tag/v.2.5) was released on November 18, 2016:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (2.5.3)
+    maremma (2.5.4)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -24,7 +24,8 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     builder (3.2.2)
-    codeclimate-test-reporter (1.0.0)
+    codeclimate-test-reporter (1.0.3)
+      simplecov
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
@@ -46,7 +47,7 @@ GEM
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     oj (2.13.1)
-    public_suffix (2.0.3)
+    public_suffix (2.0.4)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -94,4 +95,4 @@ DEPENDENCIES
   webmock (~> 1.22, >= 1.22.3)
 
 BUNDLED WITH
-   1.13.6
+   1.12.5

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "2.5.3"
+  VERSION = "2.5.4"
 end

data/lib/maremma.rb

@@ -30,7 +30,7 @@ module Maremma
     response = conn.post url, {}, options[:headers] do |request|
       request.body = options[:data]
     end
-    { "data" => parse_success_response(response.body), "headers" => response.headers }
+    parse_success_response(response.body).merge("headers" => response.headers)
   rescue *NETWORKABLE_EXCEPTIONS => error
     rescue_faraday_error(error)
   end
@@ -46,7 +46,7 @@ module Maremma
     response = conn.put url, {}, options[:headers] do |request|
       request.body = options[:data]
     end
-    { "data" => parse_success_response(response.body), "headers" => response.headers }
+    parse_success_response(response.body).merge("headers" => response.headers)
   rescue *NETWORKABLE_EXCEPTIONS => error
     rescue_faraday_error(error)
   end
@@ -61,7 +61,7 @@ module Maremma
 
     response = conn.delete url, {}, options[:headers]
 
-    { "data" => parse_success_response(response.body), "headers" => response.headers }
+    parse_success_response(response.body).merge("headers" => response.headers)
   rescue *NETWORKABLE_EXCEPTIONS => error
     rescue_faraday_error(error)
   end
@@ -80,7 +80,7 @@ module Maremma
       return { 'errors' => [{ 'status' => 429, 'title' => "Too many requests" }] }
     end
 
-    { "data" => parse_success_response(response.body), "headers" => response.headers }
+    parse_success_response(response.body).merge("headers" => response.headers)
   rescue *NETWORKABLE_EXCEPTIONS => error
     rescue_faraday_error(error)
   end
@@ -181,13 +181,13 @@ module Maremma
     string = parse_response(string)
 
     if string == ""
-      nil
+      { 'data' => nil }
     elsif string.is_a?(Hash) && string['data']
-      string['data']
+      string
     elsif string.is_a?(Hash) && string['hash']
-      string['hash']
+      { 'data' => string['hash'] }
     else
-      string
+      { 'data' => string }
     end
   end
 

data/spec/maremma_spec.rb

@@ -320,27 +320,32 @@ describe Maremma do
   context 'parse_success_response' do
     it 'from_json' do
       string = '{ "word": "abc" }'
-      expect(subject.parse_success_response(string)).to eq("word"=>"abc")
+      expect(subject.parse_success_response(string)).to eq({"data"=>{"word"=>"abc"}})
     end
 
     it 'from_json with data' do
       string = '{ "data": { "word": "abc" }}'
-      expect(subject.parse_success_response(string)).to eq("word"=>"abc")
+      expect(subject.parse_success_response(string)).to eq({"data"=>{"word"=>"abc"}})
+    end
+
+    it 'from_json with data and meta' do
+      string = '{ "data": { "word": "abc" }, "meta": { "total": 12 }}'
+      expect(subject.parse_success_response(string)).to eq({"data"=>{"word"=>"abc"},"meta"=>{"total"=>12}})
     end
 
     it 'from_xml' do
       string = "<word>abc</word>"
-      expect(subject.parse_success_response(string)).to eq("word"=>"abc")
+      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>"abc"})
     end
 
     it 'from_string' do
       string = "abc"
-      expect(subject.parse_success_response(string)).to eq("abc")
+      expect(subject.parse_success_response(string)).to eq("data"=>"abc")
     end
 
     it 'from_string with utf-8' do
       string = "fön  "
-      expect(subject.parse_success_response(string)).to eq("fön")
+      expect(subject.parse_success_response(string)).to eq("data"=>"fön")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday