orcid_client 0.3.3 → 0.4.1

data/resources/{record_2.0/samples/write_sample/education-2.0.xml → record_2.1/samples/write_samples/education-2.1.xml}

@@ -2,7 +2,7 @@
 <education:education
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:education="http://www.orcid.org/ns/education"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/education ../education-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/education ../education-2.1.xsd ">	
 	<education:department-name>Department</education:department-name>
 	<education:role-title>Degree</education:role-title>
 	<common:start-date>

data/resources/{record_2.0/samples/write_sample/employment-2.0.xml → record_2.1/samples/write_samples/employment-2.1.xml}

@@ -2,7 +2,7 @@
 <employment:employment 
 	xmlns:employment="http://www.orcid.org/ns/employment" xmlns:common="http://www.orcid.org/ns/common"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/employment ../employment-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/employment ../employment-2.1.xsd ">	
 	<employment:department-name>Department</employment:department-name>
 	<employment:role-title>Role</employment:role-title> 
 	<common:start-date>

data/resources/{record_2.0/samples/write_sample/external-identifier-2.0.xml → record_2.1/samples/write_samples/external-identifier-2.1.xml}

@@ -2,7 +2,7 @@
 <external-identifier:external-identifier
 	xmlns:external-identifier="http://www.orcid.org/ns/external-identifier"
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/external-identifier ../person-external-identifier-2.0.xsd ">
+	xsi:schemaLocation="http://www.orcid.org/ns/external-identifier ../person-external-identifier-2.1.xsd ">
 	<common:external-id-type>My ID System</common:external-id-type>
 	<common:external-id-value>A-0003</common:external-id-value>
 	<common:external-id-url>https://myid.com/A-0003</common:external-id-url>

data/resources/{record_2.0/samples/write_sample/funding-2.0.xml → record_2.1/samples/write_samples/funding-2.1.xml}

@@ -2,7 +2,7 @@
 <funding:funding
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:funding="http://www.orcid.org/ns/funding"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/funding /funding-2.0.xsd ">    
+	xsi:schemaLocation="http://www.orcid.org/ns/funding /funding-2.1.xsd ">    
 	<funding:type>grant</funding:type>
 	<funding:organization-defined-type>Funding sub-type</funding:organization-defined-type>
 	<funding:title>

data/resources/{record_2.0/samples/write_sample/keyword-2.0.xml → record_2.1/samples/write_samples/keyword-2.1.xml}

@@ -2,6 +2,6 @@
 <keyword:keyword
 	xmlns:keyword="http://www.orcid.org/ns/keyword"
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/keyword ../keyword-2.0.xsd ">		
+	xsi:schemaLocation="http://www.orcid.org/ns/keyword ../keyword-2.1.xsd ">		
 	<keyword:content>keyword1</keyword:content>
 </keyword:keyword>

data/resources/{record_2.0/samples/write_sample/other-name-2.0.xml → record_2.1/samples/write_samples/other-name-2.1.xml}

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <other-name:other-name xmlns:other-name="http://www.orcid.org/ns/other-name"
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/other-name ../other-name-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/other-name ../other-name-2.1.xsd ">	
 	<other-name:content>Other Name</other-name:content>
 </other-name:other-name>	

data/resources/{record_2.0/samples/write_sample/peer-review-full-2.0.xml → record_2.1/samples/write_samples/peer-review-full-2.1.xml}

@@ -2,7 +2,7 @@
 <peer-review:peer-review xmlns:common="http://www.orcid.org/ns/common"
 	xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:work="http://www.orcid.org/ns/work"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/peer-review ../peer-review-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/peer-review ../peer-review-2.1.xsd ">	
 	<peer-review:reviewer-role>reviewer</peer-review:reviewer-role>	
 	<peer-review:review-identifiers>	
 		<common:external-id>

data/resources/{record_2.0/samples/write_sample/peer-review-simple-2.0.xml → record_2.1/samples/write_samples/peer-review-simple-2.1.xml}

@@ -2,7 +2,7 @@
 <peer-review:peer-review xmlns:common="http://www.orcid.org/ns/common"
 	xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:work="http://www.orcid.org/ns/work"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/peer-review ../peer-review-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/peer-review ../peer-review-2.1.xsd ">	
 	<peer-review:reviewer-role>reviewer</peer-review:reviewer-role>	
 	<peer-review:review-identifiers>	
 		<common:external-id>

data/resources/{record_2.0/samples/write_sample/researcher-url-2.0.xml → record_2.1/samples/write_samples/researcher-url-2.1.xml}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <researcher-url:researcher-url xmlns:researcher-url="http://www.orcid.org/ns/researcher-url"
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/researcher-url ../researcher-url-2.0.xsd">
+	xsi:schemaLocation="http://www.orcid.org/ns/researcher-url ../researcher-url-2.1.xsd">
 	<researcher-url:url-name>Site # 1</researcher-url:url-name>
 	<researcher-url:url>https://site1.com/</researcher-url:url>	
 </researcher-url:researcher-url>

data/resources/{record_2.0/samples/write_sample/work-full-2.0.xml → record_2.1/samples/write_samples/work-full-2.1.xml}

@@ -2,7 +2,7 @@
 <work:work
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:work="http://www.orcid.org/ns/work"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/work /work-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/work /work-2.1.xsd ">	
 	<work:title>
 		<common:title>Work Title</common:title>
 		<common:subtitle>Sub title</common:subtitle>
@@ -38,7 +38,7 @@
 	<work:contributors>
 		<work:contributor>
 			<common:contributor-orcid>
-				<common:uri>http://orcid.org/0000-0001-5109-3700</common:uri>
+				<common:uri>https://orcid.org/0000-0001-5109-3700</common:uri>
 				<common:path>0000-0001-5109-3700</common:path>
 				<common:host>orcid.org</common:host>
 			</common:contributor-orcid>

data/resources/{record_2.0/samples/write_sample/work-simple-2.0.xml → record_2.1/samples/write_samples/work-simple-2.1.xml}

@@ -2,7 +2,7 @@
 <work:work
 	xmlns:common="http://www.orcid.org/ns/common" xmlns:work="http://www.orcid.org/ns/work"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.orcid.org/ns/work /work-2.0.xsd ">	
+	xsi:schemaLocation="http://www.orcid.org/ns/work /work-2.1.xsd ">	
 	<work:title>
 		<common:title>Work Title</common:title>
 	</work:title>

data/resources/{record_2.0/search-2.0.xsd → record_2.1/search-2.1.xsd}

@@ -30,7 +30,7 @@
 		</xs:documentation>
 	</xs:annotation>
     <xs:import namespace="http://www.orcid.org/ns/common"
-        schemaLocation="../common_2.0/common-2.0.xsd" />
+        schemaLocation="../common_2.1/common-2.1.xsd" />
 
 	<xs:element name="search">
 		<xs:complexType>

data/resources/{record_2.0/work-2.0.xsd → record_2.1/work-2.1.xsd}

@@ -33,10 +33,10 @@
 		</xs:appinfo>
 	</xs:annotation>
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0/common-2.0.xsd" />
+		schemaLocation="../common_2.1/common-2.1.xsd" />
 
 	<xs:import namespace="http://www.orcid.org/ns/error"
- 		schemaLocation="error-2.0.xsd" />
+ 		schemaLocation="error-2.1.xsd" />
 
 	<xs:element name="work">
 		<xs:complexType>

data/resources/xml.xsd

@@ -0,0 +1,286 @@
+<?xml version='1.0'?>
+<?xml-stylesheet href="../../2008/09/xsd.xsl" type="text/xsl"?>
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns   ="http://www.w3.org/1999/xhtml"
+  xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   <div>
+    <h1>About the XML namespace</h1>
+
+    <div class="bodytext">
+     <p>
+      This schema document describes the XML namespace, in a form
+      suitable for import by other schema documents.
+     </p>
+     <p>
+      See <a href="http://www.w3.org/XML/1998/namespace.html">
+      http://www.w3.org/XML/1998/namespace.html</a> and
+      <a href="http://www.w3.org/TR/REC-xml">
+      http://www.w3.org/TR/REC-xml</a> for information 
+      about this namespace.
+     </p>
+     <p>
+      Note that local names in this namespace are intended to be
+      defined only by the World Wide Web Consortium or its subgroups.
+      The names currently defined in this namespace are listed below.
+      They should not be used with conflicting semantics by any Working
+      Group, specification, or document instance.
+     </p>
+     <p>   
+      See further below in this document for more information about <a
+      href="#usage">how to refer to this schema document from your own
+      XSD schema documents</a> and about <a href="#nsversioning">the
+      namespace-versioning policy governing this schema document</a>.
+     </p>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang">
+  <xs:annotation>
+   <xs:documentation>
+    <div>
+     
+      <h3>lang (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose value
+       is a language code for the natural language of the content of
+       any element; its value is inherited.  This name is reserved
+       by virtue of its definition in the XML specification.</p>
+     
+    </div>
+    <div>
+     <h4>Notes</h4>
+     <p>
+      Attempting to install the relevant ISO 2- and 3-letter
+      codes as the enumerated possible values is probably never
+      going to be a realistic possibility.  
+     </p>
+     <p>
+      See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+       http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
+      and the IANA language subtag registry at
+      <a href="http://www.iana.org/assignments/language-subtag-registry">
+       http://www.iana.org/assignments/language-subtag-registry</a>
+      for further information.
+     </p>
+     <p>
+      The union allows for the 'un-declaration' of xml:lang with
+      the empty string.
+     </p>
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+  <xs:simpleType>
+   <xs:union memberTypes="xs:language">
+    <xs:simpleType>    
+     <xs:restriction base="xs:string">
+      <xs:enumeration value=""/>
+     </xs:restriction>
+    </xs:simpleType>
+   </xs:union>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="space">
+  <xs:annotation>
+   <xs:documentation>
+    <div>
+     
+      <h3>space (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose
+       value is a keyword indicating what whitespace processing
+       discipline is intended for the content of the element; its
+       value is inherited.  This name is reserved by virtue of its
+       definition in the XML specification.</p>
+     
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+ 
+ <xs:attribute name="base" type="xs:anyURI"> <xs:annotation>
+   <xs:documentation>
+    <div>
+     
+      <h3>base (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose value
+       provides a URI to be used as the base for interpreting any
+       relative URIs in the scope of the element on which it
+       appears; its value is inherited.  This name is reserved
+       by virtue of its definition in the XML Base specification.</p>
+     
+     <p>
+      See <a
+      href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
+      for information about this attribute.
+     </p>
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+ 
+ <xs:attribute name="id" type="xs:ID">
+  <xs:annotation>
+   <xs:documentation>
+    <div>
+     
+      <h3>id (as an attribute name)</h3> 
+      <p>
+       denotes an attribute whose value
+       should be interpreted as if declared to be of type ID.
+       This name is reserved by virtue of its definition in the
+       xml:id specification.</p>
+     
+     <p>
+      See <a
+      href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a>
+      for information about this attribute.
+     </p>
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+  <xs:attribute ref="xml:id"/>
+ </xs:attributeGroup>
+
+ <xs:annotation>
+  <xs:documentation>
+   <div>
+   
+    <h3>Father (in any context at all)</h3> 
+
+    <div class="bodytext">
+     <p>
+      denotes Jon Bosak, the chair of 
+      the original XML Working Group.  This name is reserved by 
+      the following decision of the W3C XML Plenary and 
+      XML Coordination groups:
+     </p>
+     <blockquote>
+       <p>
+	In appreciation for his vision, leadership and
+	dedication the W3C XML Plenary on this 10th day of
+	February, 2000, reserves for Jon Bosak in perpetuity
+	the XML name "xml:Father".
+       </p>
+     </blockquote>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>
+   <div xml:id="usage" id="usage">
+    <h2><a name="usage">About this schema document</a></h2>
+
+    <div class="bodytext">
+     <p>
+      This schema defines attributes and an attribute group suitable
+      for use by schemas wishing to allow <code>xml:base</code>,
+      <code>xml:lang</code>, <code>xml:space</code> or
+      <code>xml:id</code> attributes on elements they define.
+     </p>
+     <p>
+      To enable this, such a schema must import this schema for
+      the XML namespace, e.g. as follows:
+     </p>
+     <pre>
+          &lt;schema . . .>
+           . . .
+           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+     </pre>
+     <p>
+      or
+     </p>
+     <pre>
+           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
+     </pre>
+     <p>
+      Subsequently, qualified reference to any of the attributes or the
+      group defined below will have the desired effect, e.g.
+     </p>
+     <pre>
+          &lt;type . . .>
+           . . .
+           &lt;attributeGroup ref="xml:specialAttrs"/>
+     </pre>
+     <p>
+      will define a type which will schema-validate an instance element
+      with any of those attributes.
+     </p>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>
+   <div id="nsversioning" xml:id="nsversioning">
+    <h2><a name="nsversioning">Versioning policy for this schema document</a></h2>
+    <div class="bodytext">
+     <p>
+      In keeping with the XML Schema WG's standard versioning
+      policy, this schema document will persist at
+      <a href="http://www.w3.org/2009/01/xml.xsd">
+       http://www.w3.org/2009/01/xml.xsd</a>.
+     </p>
+     <p>
+      At the date of issue it can also be found at
+      <a href="http://www.w3.org/2001/xml.xsd">
+       http://www.w3.org/2001/xml.xsd</a>.
+     </p>
+     <p>
+      The schema document at that URI may however change in the future,
+      in order to remain compatible with the latest version of XML
+      Schema itself, or with the XML namespace itself.  In other words,
+      if the XML Schema or XML namespaces change, the version of this
+      document at <a href="http://www.w3.org/2001/xml.xsd">
+       http://www.w3.org/2001/xml.xsd 
+      </a> 
+      will change accordingly; the version at 
+      <a href="http://www.w3.org/2009/01/xml.xsd">
+       http://www.w3.org/2009/01/xml.xsd 
+      </a> 
+      will not change.
+     </p>
+     <p>
+      Previous dated (and unchanging) versions of this schema 
+      document are at:
+     </p>
+     <ul>
+      <li><a href="http://www.w3.org/2009/01/xml.xsd">
+	http://www.w3.org/2009/01/xml.xsd</a></li>
+      <li><a href="http://www.w3.org/2007/08/xml.xsd">
+	http://www.w3.org/2007/08/xml.xsd</a></li>
+      <li><a href="http://www.w3.org/2004/10/xml.xsd">
+	http://www.w3.org/2004/10/xml.xsd</a></li>
+      <li><a href="http://www.w3.org/2001/03/xml.xsd">
+	http://www.w3.org/2001/03/xml.xsd</a></li>
+     </ul>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+</xs:schema>

data/spec/api_spec.rb

@@ -5,7 +5,7 @@ describe OrcidClient, vcr: true do
   let(:orcid) { "0000-0001-6528-2027" }
   let(:access_token) { ENV['ACCESS_TOKEN'] }
   let(:notification_access_token) { ENV['NOTIFICATION_ACCESS_TOKEN'] }
-  let(:put_code) { "837845" }
+  let(:put_code) { "921977" }
   let(:fixture_path) { "spec/fixtures/" }
 
   subject { OrcidClient::Work.new(doi: doi, orcid: orcid, access_token: access_token, put_code: put_code) }
@@ -31,9 +31,9 @@ describe OrcidClient, vcr: true do
       it 'should get works' do
         response = subject.get_works(sandbox: true)
         works = response.body.fetch("data", {}).fetch("group", {})
-        expect(works.length).to eq(27)
+        expect(works.length).to eq(23)
         work = works.first
-        expect(work["external-ids"]).to eq("external-id"=>[{"external-id-type"=>"doi", "external-id-value"=>"10.5281/zenodo.59983", "external-id-url"=>nil, "external-id-relationship"=>"SELF"}])
+        expect(work["external-ids"]).to eq("external-id"=>[{"external-id-type"=>"doi", "external-id-value"=>"10.5438/53NZ-N4G7", "external-id-url"=>nil, "external-id-relationship"=>"SELF"}])
       end
 
       it 'access_token missing' do
@@ -74,7 +74,7 @@ describe OrcidClient, vcr: true do
   end
 
   describe "external_identifier", :order => :defined do
-    subject { OrcidClient::ExternalIdentifier.new(type: "GitHub", value: "mfenner", url: "https://github.com/mfenner", orcid: orcid, access_token: access_token, put_code: "3824") }
+    subject { OrcidClient::ExternalIdentifier.new(type: "GitHub", value: "mfenner", url: "https://github.com/mfenner", orcid: orcid, access_token: access_token, put_code: "4833") }
 
     describe 'post' do
       subject { OrcidClient::ExternalIdentifier.new(type: "GitHub", value: "mfenner", url: "https://github.com/mfenner", orcid: orcid, access_token: access_token) }
@@ -109,7 +109,7 @@ describe OrcidClient, vcr: true do
   end
 
   describe "notifications", :order => :defined do
-    subject { OrcidClient::Notification.new(doi: doi, orcid: orcid, notification_access_token: notification_access_token, put_code: "144941", subject: "Request to add a work", intro: "This is an intro", sandbox: true) }
+    subject { OrcidClient::Notification.new(doi: doi, orcid: orcid, notification_access_token: notification_access_token, put_code: "292000", subject: "Request to add a work", intro: "This is an intro", sandbox: true) }
 
     describe 'post' do
       subject { OrcidClient::Notification.new(doi: doi, orcid: orcid, notification_access_token: notification_access_token, subject: "Request to add a work", intro: "This is an intro", sandbox: true) }
@@ -131,8 +131,8 @@ describe OrcidClient, vcr: true do
       it 'should get notification' do
         response = subject.get_notification(sandbox: true)
         notification = response.body.fetch("data", {}).fetch("notification", {})
-        expect(notification["put_code"]).to eq("144941")
-        expect(notification["items"]["item"]).to eq("item_type"=>"work", "item_name"=>"omniauth-orcid: v.1.1.5", "external_id"=>{"external_id_type"=>"DOI", "external_id_value"=>"10.5281/zenodo.59983"})
+        expect(notification["put_code"]).to eq("292000")
+        expect(notification["items"]["item"]).to eq("item_type"=>"work", "item_name"=>"Omniauth-Orcid: V.1.1.5", "external_id"=>nil)
         expect(response.status).to eq(200)
       end
 
@@ -147,8 +147,8 @@ describe OrcidClient, vcr: true do
       it 'should delete notification' do
         response = subject.delete_notification(sandbox: true)
         notification = response.body.fetch("data", {}).fetch("notification", {})
-        expect(notification["put_code"]).to eq("144941")
-        expect(notification["items"]["item"]).to eq("item_type"=>"work", "item_name"=>"omniauth-orcid: v.1.1.5", "external_id"=>{"external_id_type"=>"DOI", "external_id_value"=>"10.5281/zenodo.59983"})
+        expect(notification["put_code"]).to eq("292000")
+        expect(notification["items"]["item"]).to eq("item_type"=>"work", "item_name"=>"Omniauth-Orcid: V.1.1.5", "external_identifier"=>nil)
         expect(response.status).to eq(200)
       end