orcid_client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06aedf6fc89c166ce34cf962980c670b03002dc6
-  data.tar.gz: 99915c37f16c28789753bdbd0e4ff7cc962d63c2
+  metadata.gz: 4029bf25df2ad75c7ae622f7ac356f1e87edbcba
+  data.tar.gz: 484dd8e735ac80dedb219487f29b4271205dec19
 SHA512:
-  metadata.gz: 1f12959214bdabcc005dffc01d0171d3a513ecad5c200008d3e991ddad59bea309132e454f5963fd30934408bd0b02fdb60af391f737ffa42ddd927cdaa31b4b
-  data.tar.gz: e59c507d30647c106c508ccd112c0054f41bc4bc7dc4d992d950f44178e7dda7fa29c953d5394b45b38e9a0590b8483fdb78aa2f08177008563a4c04ecdc5fd2
+  metadata.gz: 2412a070c7648ba1c4fe0d154ac9e2a1d3b782326d4e562d47ff1f6707304fd81b7ef6fd7f0cdd0707498e85e56804d725898f9e133603f99abba15d8b338691
+  data.tar.gz: 77e3a8897944889b34ffc617e07c4a8b5a35b42f9a789dc8050473fd93a2acd129b8d83ec61369f7fed7233160ff742fb189707e0148452ebe7542daf88611b7

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    orcid_client (0.1.3)
+    orcid_client (0.1.4)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       dotenv (~> 2.1, >= 2.1.1)
-      maremma (~> 2.5)
+      maremma (~> 3.0)
       namae (~> 0.10.1)
       nokogiri (~> 1.6.8)
       sanitize (~> 4.0, >= 4.0.1)
@@ -37,10 +37,10 @@ GEM
       faraday
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.0)
+    hashdiff (0.3.1)
     i18n (0.7.0)
     json (1.8.3)
-    maremma (2.5.3)
+    maremma (3.0.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)

data/lib/orcid_client/api.rb

@@ -20,8 +20,9 @@ module OrcidClient
 
       url = "#{orcid_api_url}/v#{API_VERSION}/#{orcid}/work"
       response = Maremma.post(url, content_type: 'application/vnd.orcid+xml', data: data, bearer: access_token)
-      put_code = response.fetch("headers", {}).fetch("Location", "").split("/").last
-      response.merge("put_code" => put_code.present? ? put_code.to_i : nil)
+      put_code = response.headers.fetch("Location", "").split("/").last
+      response.body["put_code"] = put_code.present? ? put_code.to_i : nil
+      response
     end
 
     def update_work(options={})
@@ -32,8 +33,9 @@ module OrcidClient
 
       url = "#{orcid_api_url}/v#{API_VERSION}/#{orcid}/work/#{put_code}"
       response = Maremma.put(url, content_type: 'application/vnd.orcid+xml', data: data, bearer: access_token)
-      put_code = response.fetch("headers", {}).fetch("Location", "").split("/").last
-      response.merge("put_code" => put_code.present? ? put_code.to_i : nil)
+      put_code = response.headers.fetch("Location", "").split("/").last
+      response.body["put_code"] = put_code.present? ? put_code.to_i : nil
+      response
     end
 
     def delete_work(options={})
@@ -66,8 +68,9 @@ module OrcidClient
 
       url = "#{orcid_api_url}/v#{API_VERSION}/#{orcid}/notification-permission"
       response = Maremma.post(url, content_type: 'application/vnd.orcid+xml', data: data, bearer: notification_access_token)
-      put_code = response.fetch("headers", {}).fetch("Location", "").split("/").last
-      response.merge("put_code" => put_code.present? ? put_code.to_i : nil)
+      put_code = response.headers.fetch("Location", "").split("/").last
+      response.body["put_code"] = put_code.present? ? put_code.to_i : nil
+      response
     end
   end
 end

data/lib/orcid_client/metadata.rb

@@ -15,9 +15,9 @@ module OrcidClient
 
       url = "http://api.crossref.org/works/" + PostRank::URI.escape(doi)
       response = Maremma.get(url, options.merge(host: true))
-      return response if response["errors"]
+      return response if response.body["errors"]
 
-      metadata = response.fetch("data", {}).fetch("message", {})
+      metadata = response.body.fetch("data", {}).fetch("message", {})
       return { "errors" => [{ "title" => "Not found.", "status" => 404 }] } if metadata.blank?
 
       date_parts = metadata.fetch("issued", {}).fetch("date-parts", []).first
@@ -56,9 +56,9 @@ module OrcidClient
                  wt: "json" }
       url = "http://search.datacite.org/api?" + URI.encode_www_form(params)
       response = Maremma.get(url, options)
-      return response if response["errors"]
+      return response if response.body["errors"]
 
-      metadata = response.fetch("data", {}).fetch("response", {}).fetch("docs", []).first
+      metadata = response.body.fetch("data", {}).fetch("response", {}).fetch("docs", []).first
       return { "errors" => [{ "title" => "Not found.", "status" => 404 }] } if metadata.blank?
 
       doi = metadata.fetch("doi", nil)
@@ -88,9 +88,9 @@ module OrcidClient
 
       url = "http://pub.orcid.org/v1.2/#{orcid}/orcid-bio"
       response = Maremma.get(url, options)
-      return response if response["errors"]
+      return response if response.body["errors"]
 
-      metadata = response.fetch("data", {}).fetch("orcid_message", {}).fetch("orcid_profile", nil)
+      metadata = response.body.fetch("data", {}).fetch("orcid_message", {}).fetch("orcid_profile", nil)
       metadata.extend Hashie::Extensions::DeepFetch
 
       personal_details = metadata.deep_fetch("orcid_bio", "personal_details") { {} }
@@ -115,9 +115,9 @@ module OrcidClient
 
       url = "http://doi.crossref.org/doiRA/" + CGI.unescape(doi)
       response = Maremma.get(url, options.merge(host: true))
-      return response if response["errors"]
+      return response if response.body["errors"]
 
-      ra = response.fetch("data", {}).first.fetch("RA", nil)
+      ra = response.body.fetch("data", {}).first.fetch("RA", nil)
       if ra.present?
         ra.delete(' ').downcase
       else

data/lib/orcid_client/version.rb

@@ -1,3 +1,3 @@
 module OrcidClient
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/orcid_client.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Declary dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '~> 2.5'
+  s.add_dependency 'maremma', '~> 3.0'
   s.add_dependency 'nokogiri', '~> 1.6.8'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'namae', '~> 0.10.1'

data/spec/api_spec.rb

@@ -16,14 +16,15 @@ describe OrcidClient, vcr: true do
 
       it 'should create work' do
         response = subject.create_work(sandbox: true)
-        expect(response["put_code"]).not_to be_blank
+        expect(response.body["put_code"]).not_to be_blank
+        expect(response.status).to eq(201)
       end
     end
 
     describe 'get' do
       it 'should get works' do
         response = subject.get_works(sandbox: true)
-        works = response.fetch("data", {}).fetch("group", {})
+        works = response.body.fetch("data", {}).fetch("group", {})
         expect(works.length).to eq(27)
         work = works.first
         expect(work["external-ids"]).to eq("external-id"=>[{"external-id-type"=>"doi", "external-id-value"=>"10.5167/UZH-19531", "external-id-url"=>nil, "external-id-relationship"=>"SELF"}])
@@ -33,15 +34,17 @@ describe OrcidClient, vcr: true do
     describe 'put' do
       it 'should update work' do
         response = subject.update_work(sandbox: true)
-        expect(response.fetch("data", {}).fetch("work", {}).fetch("put_code", nil)).to eq(put_code)
+        expect(response.body.fetch("data", {}).fetch("work", {}).fetch("put_code", nil)).to eq(put_code)
+        expect(response.status).to eq(200)
       end
     end
 
     describe 'delete' do
       it 'should delete work' do
         response = subject.delete_work(sandbox: true)
-        expect(response["data"]).to be_blank
-        expect(response["errors"]).to be_nil
+        expect(response.body["data"]).to be_blank
+        expect(response.body["errors"]).to be_nil
+        expect(response.status).to eq(204)
       end
     end
   end
@@ -52,7 +55,8 @@ describe OrcidClient, vcr: true do
     describe 'post' do
       it 'should create notification' do
         response = subject.create_notification(sandbox: true)
-        expect(response["put_code"]).not_to be_blank
+        expect(response.body["put_code"]).not_to be_blank
+        expect(response.status).to eq(201)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orcid_client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement