mods 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cea16c53599001b8cede7fb85bffef53aa28de61718785af76fd5445915fc80c
-  data.tar.gz: fba29c21dd8bc15483de289aafb690616b6bd6af817d6252915e41238bf1ed70
+  metadata.gz: ba231dc5a8e9d54605e9b7a066419c6d0bb63430bf0a245b7c143b206360daf6
+  data.tar.gz: 9ae4a4448f22fb661ff683dc1f4612be5a0531a7f41a1f8d0f2b59ef2232d180
 SHA512:
-  metadata.gz: e6ec16f53b9355f57315248e6eabd57d3db32743e4235365f119a519c36abc0d47e75af9c600ac2666bc5db9b2c77a6629e1ace33b847077606ef3bd32d65f78
-  data.tar.gz: 2028457eec91d93b8a44d48d2da3152d6808e850dbc201a199deb43465464497d18611049b888b5a0f2029db5166e7c99e34206f9bde2480e04e4bcf3d6eb7b2
+  metadata.gz: 7d8680c108fb0b5f915474530a73d097b52efd5ecb940b701a02d08228f56bf63be8194e034713949dfed6548a38236fe736089e0a792e453a50b00e627442ef
+  data.tar.gz: 3ddc2d8b385002a230a5a913f9f393ae8aabe4919569a19cd1c847404fe51e9ecc2e8e0951c87e07a312971eb5095619672487ffa9d0963cb7dfebbca11c8437

data/lib/mods/date.rb

@@ -183,7 +183,7 @@ module Mods
 
       def self.munge_to_yyyy(text)
         value = roman_to_int(text.upcase)
-        (value - 1).to_s.rjust(2, "0") + 'XX'
+        (value - 1).to_s.rjust(2, "0") + 'xx'
       end
     end
 
@@ -194,7 +194,7 @@ module Mods
       REGEX = /(?<century>\d{2})--/
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:century]}XX"
+        "#{matches[:century]}xx"
       end
     end
 
@@ -204,7 +204,7 @@ module Mods
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:century].to_i - 1}XX"
+        "#{matches[:century].to_i - 1}xx"
       end
     end
 
@@ -224,7 +224,7 @@ module Mods
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:year]}X"
+        "#{matches[:year]}x"
       end
     end
 
@@ -234,7 +234,7 @@ module Mods
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:year]}X"
+        "#{matches[:year]}x"
       end
     end
 
@@ -460,6 +460,8 @@ module Mods
         :century
       elsif date_range.is_a? EDTF::Decade
         :decade
+      elsif date.is_a? EDTF::Season
+        :month
       elsif date.is_a? EDTF::Interval
         date_range.precision
       else
@@ -497,7 +499,7 @@ module Mods
       case date_range
       when EDTF::Unknown
         nil
-      when EDTF::Epoch, EDTF::Interval
+      when EDTF::Epoch, EDTF::Interval, EDTF::Season
         date_range.min
       when EDTF::Set
         date_range.to_a.first
@@ -522,7 +524,7 @@ module Mods
       case date_range
       when EDTF::Unknown
         nil
-      when EDTF::Epoch, EDTF::Interval
+      when EDTF::Epoch, EDTF::Interval, EDTF::Season
         date_range.max
       when EDTF::Set
         date_range.to_a.last.change(month: 12, day: 31)
@@ -538,7 +540,7 @@ module Mods
 
     def date_range
       @date_range ||= if text =~ /u/
-        ::Date.edtf(text.gsub('u', 'X')) || date
+        ::Date.edtf(text.gsub('u', 'x').gsub('X', 'x')) || date
       else
         date
       end

data/lib/mods/name.rb

@@ -2,8 +2,8 @@ module Mods
 
   class Name
 
-    CHILD_ELEMENTS = ['namePart', 'displayForm', 'affiliation', 'role', 'description']
-        
+    CHILD_ELEMENTS = ['namePart', 'displayForm', 'affiliation', 'role', 'nameIdentifier', 'description']
+
     # attributes on name node
     ATTRIBUTES = Mods::AUTHORITY_ATTRIBS + Mods::LANG_ATTRIBS + ['type', 'displayLabel', 'usage', 'altRepGroup', 'nameTitleGroup']
 
@@ -11,7 +11,7 @@ module Mods
     TYPES = ['personal', 'corporate', 'conference', 'family']
     # valid values for type attribute on namePart node <name><namePart type="val"/></name>
     NAME_PART_TYPES = ['date', 'family', 'given', 'termsOfAddress']
-  
+
   end
-  
+
 end

data/lib/mods/nom_terminology.rb

@@ -143,6 +143,9 @@ module Mods
           end
           n.displayForm :path => 'm:displayForm'
           n.affiliation :path => 'm:affiliation'
+          n.nameIdentifier :path => 'm:nameIdentifier' do |ni|
+            with_attributes(ni, Mods::LANG_ATTRIBS | %w[displayLabel type typeURI invalid])
+          end
           n.description_el :path => 'm:description' # description is used by Nokogiri
           n.role :path => 'm:role' do |r|
             r.roleTerm :path => 'm:roleTerm' do |rt|

data/lib/mods/version.rb

@@ -1,4 +1,4 @@
 module Mods
   # this is the Ruby Gem version
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.4'.freeze
 end

data/spec/lib/date_spec.rb

@@ -101,7 +101,8 @@ RSpec.describe Mods::Date do
       '1900-06' => :month,
       '1900-06-uu' => :month,
       '1900-06-15' => :day,
-      '2014-01-01/2020-12-31' => :day
+      '2014-01-01/2020-12-31' => :day,
+      '1986-22' => :month
     }.each do |data, expected|
       describe "with #{data}" do
         let(:date_element) { "<dateCreated encoding=\"edtf\">#{data}</dateCreated>" }
@@ -201,9 +202,9 @@ RSpec.describe Mods::Date do
     {
       '1905' => Date.parse('1905-01-01')..Date.parse('1905-12-31'),
       '190u' => Date.parse('1900-01-01')..Date.parse('1909-12-31'),
-      '190X' => Date.parse('1900-01-01')..Date.parse('1909-12-31'),
+      '190x' => Date.parse('1900-01-01')..Date.parse('1909-12-31'),
       '19uu' => Date.parse('1900-01-01')..Date.parse('1999-12-31'),
-      '19XX' => Date.parse('1900-01-01')..Date.parse('1999-12-31'),
+      '19xx' => Date.parse('1900-01-01')..Date.parse('1999-12-31'),
       '1856/1876' => Date.parse('1856-01-01')..Date.parse('1876-12-31'),
       '[1667,1668,1670..1672]' => Date.parse('1667-01-01')..Date.parse('1672-12-31'),
       '1900-uu' => Date.parse('1900-01-01')..Date.parse('1900-12-31'),

data/spec/lib/name_spec.rb

@@ -197,6 +197,7 @@ RSpec.describe "Mods <name> Element" do
         <name>
           <namePart>Exciting Prints</namePart>
           <affiliation>whatever</affiliation>
+          <nameIdentifier typeURI="https://orcid.org" type="orcid">0000-0002-0666-0666</nameIdentifier>
           <description>anything</description>
           <role><roleTerm type='text'>some role</roleTerm></role>
         </name>
@@ -280,6 +281,26 @@ RSpec.describe "Mods <name> Element" do
     end
   end
 
+  context 'with a nameIdentifier' do
+    subject(:record) do
+      mods_record(<<-XML)
+        <name>
+          <name type="personal">Whoopie Goldberg</name>
+          <nameIdentifier typeURI="https://orcid.org" type="orcid">0000-0002-0666-0666</nameIdentifier>
+          <role><roleTerm type='text'>some role</roleTerm></role>
+        </name>
+      XML
+    end
+
+    it 'has the expected attributes for nameIdentifier' do
+      expect(record.plain_name.nameIdentifier.first).to have_attributes(
+        text: '0000-0002-0666-0666',
+        typeURI: 'https://orcid.org',
+        type_at: 'orcid'
+      )
+    end
+  end
+
   context 'without a family name and given name' do
     subject(:record) do
       mods_record("<name type='personal'>
@@ -349,6 +370,7 @@ RSpec.describe "Mods <name> Element" do
         </name>
         <name>
             <namePart>Daniel Craig</namePart>
+            <nameIdentifier typeURI="https://orcid.org" type="orcid">0000-0002-0666-0666</nameIdentifier>
             <role>
               <roleTerm type='text' authority='marcrelator'>Actor</roleTerm>
               <roleTerm type='code' authority='marcrelator'>cre</roleTerm>
@@ -363,6 +385,12 @@ RSpec.describe "Mods <name> Element" do
         have_attributes(role: have_attributes(value: ['CreatorFake', 'Actor'], code: ['cre'], authority: ['marcrelator', 'marcrelator'], size: 2)),
         have_attributes(role: have_attributes(value: ['Actor'], code: ['cre'], authority: ['marcrelator'], size: 1)),
       ])
+      expect(record.plain_name.last.nameIdentifier.first).to have_attributes(
+        text: '0000-0002-0666-0666',
+        typeURI: 'https://orcid.org',
+        type_at: 'orcid'
+      )
+      expect(record.plain_name.first.nameIdentifier).to be_empty
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Parse MODS (Metadata Object Description Schema) records.