commonmeta-ruby 3.9.0 → 3.12.0

data/resources/{datacite-v4.json → datacite-v45.json}

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "id": "datacite-v4.json",
-  "title": "DataCite v4",
-  "description": "JSON representation of the DataCite v4 schema.",
+  "id": "datacite-v45.json",
+  "title": "DataCite v4.5",
+  "description": "JSON representation of the DataCite v4.5 schema.",
   "additionalProperties": true,
   "definitions": {
     "nameType": {
@@ -110,6 +110,7 @@
         "Dissertation",
         "Event",
         "Image",
+        "Instrument",
         "InteractiveResource",
         "Journal",
         "JournalArticle",
@@ -123,6 +124,7 @@
         "Software",
         "Sound",
         "Standard",
+        "StudyRegistration",
         "Text",
         "Workflow",
         "Other"
@@ -187,7 +189,9 @@
         "IsRequiredBy",
         "Requires",
         "IsObsoletedBy",
-        "Obsoletes"
+        "Obsoletes",
+        "Collects",
+        "IsCollectedBy"
       ]
     },
     "descriptionType": {
@@ -276,7 +280,24 @@
       "uniqueItems": true
     },
     "publisher": {
-      "type": "string"
+      "type": ["object", "string"],
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
+            "name": { "type": "string" },
+            "publisherIdentifier": { "type": "string", "format": "uri" },
+            "publisherIdentifierScheme": { "type": "string" },
+            "schemeUri": { "type": "string", "format": "uri" },
+            "lang": { "type": "string" }
+          },
+          "required": ["name"]
+        },
+        {
+          "type": "string",
+          "minLength": 1
+        }
+      ]
     },
     "publication_year": {
       "type": "integer"

data/resources/kernel-4/include/datacite-relationType-v4.xsd

@@ -46,6 +46,8 @@
       <xs:enumeration value="IsRequiredBy" />
       <xs:enumeration value="Obsoletes" />
       <xs:enumeration value="IsObsoletedBy" />
+      <xs:enumeration value="Collects" />
+      <xs:enumeration value="IsCollectedBy" />
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

data/resources/kernel-4/include/datacite-resourceType-v4.xsd

@@ -22,6 +22,7 @@
       <xs:enumeration value="Dissertation" />
       <xs:enumeration value="Event" />
       <xs:enumeration value="Image" />
+      <xs:enumeration value="Instrument" />
       <xs:enumeration value="InteractiveResource" />
       <xs:enumeration value="Journal" />
       <xs:enumeration value="JournalArticle" />
@@ -35,6 +36,7 @@
       <xs:enumeration value="Software" />
       <xs:enumeration value="Sound" />
       <xs:enumeration value="Standard" />
+      <xs:enumeration value="StudyRegistration" />
       <xs:enumeration value="Text" />
       <xs:enumeration value="Workflow" />
       <xs:enumeration value="Other" />

data/resources/kernel-4/metadata.xsd

@@ -2,7 +2,7 @@
 <!-- Revision history
   2010-08-26 Complete revision according to new common specification by the metadata work group after review. AJH, DTIC
   2010-11-17 Revised to current state of kernel review, FZ, TIB
-  2011-01-17 Complete revsion after community review. FZ, TIB
+  2011-01-17 Complete revision after community review. FZ, TIB
   2011-03-17 Release of v2.1: added a namespace; mandatory properties got minLength; changes in the definitions of relationTypes IsDocumentedBy/Documents and isCompiledBy/Compiles; changes type of property "Date" from xs:date to xs:string. FZ, TIB
   2011-06-27 v2.2: namespace: kernel-2.2, additions to controlled lists "resourceType", "contributorType", "relatedIdentifierType", and "descriptionType". Removal of intermediate include-files.
   2013-07-24 v3.0: namespace: kernel-3.0; delete LastMetadataUpdate & MetadateVersionNumber; additions to controlled lists "contributorType", "dateType", "descriptionType", "relationType", "relatedIdentifierType" & "resourceType"; deletion of "StartDate" & "EndDate" from list "dateType" and "Film" from "resourceType";  allow arbitrary order of elements; allow optional wrapper elements to be empty; include xml:lang attribute for title, subject & description; include attribute schemeURI for nameIdentifier of creator, contributor & subject; added new attributes "relatedMetadataScheme", "schemeURI" & "schemeType" to relatedIdentifier; included new property "geoLocation"
@@ -12,7 +12,8 @@
   2018-09-08 v4.1.1 Make schema 4.1 backwards compatible to 4.0 by allowing geolocation elements in any order
   2019-02-14 v4.2: Addition of dateType value "Withdrawn", relationType values "Obsoletes", "isObsoletedBy", addition of new subproperties for Rights: rightsIdentifier, rightsIdentifierScheme, schemeURI, addition of the XML language attribute to the properties Creator, Contributor and Publisher for organizational names, don't check format of DOI
   2019-07-13 v4.3: Addition of new subproperties for Affiliation: "affiliationIdentifier", "affiliationIdentifierScheme", "schemeURI", addition of new sub-property for funderIdentifier: "schemeURI", addition of new funderIdentifierScheme: "ROR", added documentation for nameIdentifier 
-  2021-03-08 v4.4: Addition of new property relatedItem, relationType value "isPublishedIn", subject subproperty "classificationCode", controlled list "numberType", additional 13 properties for controlled list "resourceType" -->
+  2021-03-08 v4.4: Addition of new property relatedItem, relationType value "isPublishedIn", subject subproperty "classificationCode", controlled list "numberType", additional 13 properties for controlled list "resourceType" 
+  2024-01-22 v4.5: Addition of new subproperties for publisher: "publisherIdentifier", "publisherIdentifierScheme", and "schemeURI"; addition of new resourceTypeGeneral values "Instrument" and "StudyRegistration"; addition of new relationType values "Collects" and "IsCollectedBy".-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified" xml:lang="EN">
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="include/xml.xsd" />
   <xs:include schemaLocation="include/datacite-titleType-v4.xsd" />
@@ -105,6 +106,9 @@
           <xs:complexType>
             <xs:simpleContent>
               <xs:extension base="nonemptycontentStringType">
+                <xs:attribute name="publisherIdentifier" type="xs:string" use="optional" />
+                <xs:attribute name="publisherIdentifierScheme" type="xs:string" use="optional" />
+                <xs:attribute name="schemeURI" type="xs:anyURI" use="optional" />
                 <xs:attribute ref="xml:lang" />
               </xs:extension>
             </xs:simpleContent>
@@ -161,7 +165,7 @@
             <xs:sequence>
               <xs:element name="contributor" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
-                  <xs:documentation>The institution or person responsible for collecting, creating, or otherwise contributing to the developement of the dataset.</xs:documentation>
+                  <xs:documentation>The institution or person responsible for collecting, creating, or otherwise contributing to the development of the dataset.</xs:documentation>
                   <xs:documentation>The personal name format should be: Family, Given.</xs:documentation>
                 </xs:annotation>
                 <xs:complexType>
@@ -524,7 +528,7 @@ Use the complete title of a license and include version information if applicabl
                     </xs:element>
                     <xs:element name="number" minOccurs="0">
                       <xs:annotation>
-                        <xs:documentation>Issue number or name of the related item.</xs:documentation>
+                        <xs:documentation>Number of the related item e.g. report number of article number.</xs:documentation>
                       </xs:annotation>
                       <xs:complexType>
                         <xs:simpleContent>
@@ -641,19 +645,19 @@ Use the complete title of a license and include version information if applicabl
       <xs:pattern value="\d{2}(\d{2}|\?\?|\d(\d|\?))(-(\d{2}|\?\?))?~?\??" />
       <!--  
       The following pattern is for  yearMonthDay - yyyymmdd,  where 'dd' may be '??'  so '200412??' means "some day during the month of 12/2004". 
-      The whole  string may be followed by '?' or '~'  to mean "questionable" or "approximate".     Hypens are  not allowed for this pattern. 
+      The whole  string may be followed by '?' or '~'  to mean "questionable" or "approximate".     Hyphens are  not allowed for this pattern. 
       -->
       <xs:pattern value="\d{6}(\d{2}|\?\?)~?\??" />
       <!--  
 
       The following pattern is for date and time with T separator:'yyyymmddThhmmss'. 
-      Hypens in date and colons in time not allowed for this pattern.   
+      Hyphens in date and colons in time not allowed for this pattern.   
       -->
       <xs:pattern value="\d{8}T\d{6}" />
       <!--  
 
       The following pattern is for a date range. in years: 'yyyy/yyyy'; or year/month: yyyy-mm/yyyy-mm, or year/month/day: yyyy-mm-dd/yyyy-mm-dd. Beginning or end of range value may be 'unknown'. End of range value may be 'open'.
-      Hypens mandatory when month is present. 
+      Hyphens mandatory when month is present. 
       -->
       <xs:pattern value="((-)?(\d{4}(-\d{2})?(-\d{2})?)|unknown)/((-)?(\d{4}(-\d{2})?(-\d{2})?)|unknown|open)" />
     </xs:restriction>

data/spec/author_utils_spec.rb

@@ -58,6 +58,16 @@ describe Commonmeta::Metadata, vcr: true do
       author = { "name" => "Tejas S. Sathe, MD" }
       expect(subject.is_personal_name?(name: author["name"])).to be true
     end
+
+    it "name with organization string" do
+      author = { "name" => "University of California, Santa Barbara" }
+      expect(subject.is_personal_name?(name: author["name"])).to be false
+    end
+
+    it "name with another organization string" do
+      author = { "name" => "Research Graph" }
+      expect(subject.is_personal_name?(name: author["name"])).to be false
+    end
   end
 
   context "cleanup_author" do

data/spec/fixtures/commonmeta.json

@@ -406,6 +406,6 @@
   ],
   "subjects": [],
   "provider": "Crossref",
-  "schema_version": "https://commonmeta.org/commonmeta_v0.10.5.json",
+  "schema_version": "https://commonmeta.org/commonmeta_v0.10",
   "state": "findable"
 }