mods_display 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c2bc98c15b659a075bccc6e3dea41e55f757f3318ad4d1e34109c314d10792
-  data.tar.gz: 3fc189b77cd0088578718fa5f1645e5390c0442825faacc51e7ec9de92f568c7
+  metadata.gz: 5a10b1a255b452e15abe4bb8efefa442a09e17722689eeada14c2e5b210f80f8
+  data.tar.gz: 6cb1fb4fa43419a3820e303cec2da27c9c03d2bd3d4e2db32d3d4189071207e1
 SHA512:
-  metadata.gz: 2a35e824baad68b451eb64f126a3eea9eb61c0fd190c767933c4f6946336034d5f604fa8f81a24c1060ab9e29ed7c9d72c941f526b7bf42288870e51862d60fc
-  data.tar.gz: 9fbd968fe4409450090e9f3285a19f9eb86f3834ddf36061e6d4b5d5c617efaeb2996cdc88a8363a6cb29e79525403578e62266b0873423266d85ea484c461ed
+  metadata.gz: 221cf2e30ffc91d3c11afdc2c200552577d7bd2b7975b022bf897668b1342edd7d9a3d21c0cc2724d48ad30b0d1a0be2af46cbab15cc398072aeb5761387d80c
+  data.tar.gz: 6f945ced7697570d76661f72e6a16d81fd03a32225f669e133c4e8428f03c1d816b282a2c40c9217d23af23a5f5ff6f49fe807917fbbfbafc34ac1f414f911d6

data/.rubocop.yml

@@ -12,11 +12,6 @@ AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
 
-# Warn only for long lines
-Layout/LineLength:
-  Max: 120
-  Severity: warning
-
 # Use single-quoted strings where possible
 Style/StringLiterals:
   Enabled: true
@@ -34,26 +29,4 @@ RSpec/MultipleExpectations:
   Enabled: false
 
 RSpec/ExampleLength:
-  Enabled: false
-
-# Warn only for complexity-related metrics
-Metrics/MethodLength:
-  Severity: warning
-
-Metrics/ClassLength:
-  Severity: warning
-
-Metrics/BlockLength:
-  Severity: warning
-
-Metrics/ModuleLength:
-  Severity: warning
-
-Metrics/PerceivedComplexity:
-  Severity: warning
-
-Metrics/CyclomaticComplexity:
-  Severity: warning
-
-Metrics/AbcSize:
-  Severity: warning
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,17 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-01-24 23:44:41 UTC using RuboCop version 1.25.0.
+# on 2023-10-25 22:18:52 UTC using RuboCop version 1.57.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 28
-# Cop supports --auto-correct.
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 255
+# Offense count: 1
+Capybara/SpecificMatcher:
+  Exclude:
+    - 'spec/helpers/record_helper_spec.rb'
 
 # Offense count: 2
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
@@ -24,43 +22,39 @@ Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'spec/helpers/record_helper_spec.rb'
 
-# Offense count: 18
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 16
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 48
-
-# Offense count: 37
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 257
+  Max: 44
 
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 298
+  Max: 146
+
+# Offense count: 1
+# Configuration parameters: LengthThreshold.
+Metrics/CollectionLiteralLength:
+  Exclude:
+    - 'lib/mods_display/relator_codes.rb'
 
-# Offense count: 11
-# Configuration parameters: IgnoredMethods.
+# Offense count: 10
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 18
 
-# Offense count: 21
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Offense count: 16
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 378
-
-# Offense count: 2
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ModuleLength:
-  Max: 380
+  Max: 29
 
 # Offense count: 8
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 20
 
 # Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -68,7 +62,7 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/mods_display/fields/geo.rb'
 
 # Offense count: 7
-# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# Configuration parameters: EnforcedStyle, AllowedPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
@@ -80,12 +74,12 @@ Naming/MethodName:
     - 'lib/mods_display/fields/resource_type.rb'
     - 'lib/mods_display/fields/subject.rb'
 
-# Offense count: 19
+# Offense count: 18
 RSpec/BeforeAfterAll:
   Enabled: false
 
 # Offense count: 2
-# Configuration parameters: Prefixes.
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
@@ -104,10 +98,10 @@ RSpec/DescribeClass:
     - 'spec/integration/html_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 RSpec/ExpectActual:
   Exclude:
-    - 'spec/routing/**/*'
+    - '**/spec/routing/**/*'
     - 'spec/fields/name_spec.rb'
 
 # Offense count: 25
@@ -116,7 +110,7 @@ RSpec/ExpectActual:
 RSpec/FilePath:
   Enabled: false
 
-# Offense count: 111
+# Offense count: 99
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
@@ -139,13 +133,22 @@ RSpec/MultipleMemoizedHelpers:
   Max: 6
 
 # Offense count: 2
+# Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 4
 
-# Offense count: 2
-RSpec/RepeatedExampleGroupDescription:
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpec/Rails/InferredSpecType:
   Exclude:
-    - 'spec/integration/html_spec.rb'
+    - 'spec/helpers/record_helper_spec.rb'
+
+# Offense count: 25
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Enabled: false
 
 # Offense count: 1
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
@@ -153,7 +156,7 @@ RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/helpers/record_helper_spec.rb'
 
-# Offense count: 35
+# Offense count: 36
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -176,9 +179,9 @@ Style/OpenStructUse:
   Exclude:
     - 'spec/helpers/record_helper_spec.rb'
 
-# Offense count: 28
-# Cop supports --auto-correct.
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 33
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 255
+  Max: 273

data/Gemfile

@@ -2,8 +2,8 @@
 
 source 'https://rubygems.org'
 
-gem 'rubocop-rspec', require: false
 gem 'debug'
+gem 'rubocop-rspec', require: false
 
 # Specify your gem's dependencies in mods_display.gemspec
 gemspec

data/README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/sul-dlss/mods_display.png?branch=master)](https://travis-ci.org/sul-dlss/mods_display)
-
 # ModsDisplay
 
 A gem for displaying MODS Metadata in a configurable way.

data/Rakefile

@@ -4,11 +4,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new do |task|
-  task.requires << 'rubocop-rspec'
-  task.options = ['--fail-level', 'error']
-end
-
+RuboCop::RakeTask.new(:rubocop)
 RSpec::Core::RakeTask.new(:spec)
 
 task :ci do

data/app/helpers/mods_display/record_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rails_autolink/helpers'
+
 module ModsDisplay
   module RecordHelper
     def mods_display_label(label)
@@ -69,43 +71,21 @@ module ModsDisplay
       link
     end
 
-    def format_mods_html(val, tags: %w[a dl dd dt i b em strong cite br], field: nil)
-      val = val.gsub(%r{<[^/> ]+}) do |possible_tag|
-        # Allow potentially valid HTML tags through to the sanitizer step, and HTML escape the rest
-        if tags.include?(possible_tag[1..])
-          possible_tag
-        else
-          "&lt;#{possible_tag[1..]}"
-        end
+    class MetadataScrubber < Rails::Html::PermitScrubber
+      # Override the superclass to escape the non-permitted nodes
+      def scrub_node(node)
+        node.add_next_sibling Nokogiri::XML::Text.new(node.to_s, node.document)
+        node.remove
       end
+    end
 
-      val = val.gsub(%r{</[^> ]+}) do |possible_tag|
-        # Allow potentially valid HTML tags through to the sanitizer step, and HTML escape the rest
-        if tags.include?(possible_tag[2..])
-          possible_tag
-        else
-          "&lt;#{possible_tag[1..]}"
-        end
-      end
+    def format_mods_html(val, tags: %w[a dl dd dt i b em strong cite br], field: nil)
+      scrubber = MetadataScrubber.new
+      scrubber.tags = tags
 
-      # http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-      url = %r{(?i)\b(?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\([^\s()<>]+|\([^\s()<>]+\)*\))+(?:\([^\s()<>]+|\([^\s()<>]+\)*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’])}i
-      # http://www.regular-expressions.info/email.html
-      email = %r{[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|asia|jobs|museum)\b}i
-      matches = [val.scan(url), val.scan(email)].flatten.uniq
-      unless val =~ /<a/ # we'll assume that linking has alraedy occured and we don't want to double link
-        matches.each do |match|
-          if match =~ email
-            val.gsub!(match, "<a href='mailto:#{match}'>#{match}</a>")
-          else
-            match = match.delete_suffix('&gt')
-
-            val.gsub!(match, "<a href='#{match}'>#{match}</a>")
-          end
-        end
-      end
+      formatted_val = Loofah.fragment(val).scrub!(scrubber).to_s
 
-      formatted_val = sanitize val, tags: tags, attributes: %w[href]
+      formatted_val = auto_link(formatted_val) unless formatted_val =~ /<a/ # we'll assume that linking has alraedy occured and we don't want to double link
 
       # Martin Wong data has significant linebreaks in abstracts and notes that we want
       # to preserve and display in HTML.
@@ -115,15 +95,13 @@ module ModsDisplay
       if simple_formatted_fields.any? { |klass| field&.field.is_a? klass } && formatted_val.include?("\n")
         simple_format(formatted_val, {}, sanitize: false)
       else
-        formatted_val
+        formatted_val.html_safe
       end
     end
 
-    # rubocop:disable Layout/LineLength
     # @private, but used in PURL currently
     def link_urls_and_email(val, tags: %w[a dl dd dt i b em strong cite br])
       format_mods_html(val, tags: tags)
     end
-    # rubocop:enable Layout/LineLength
   end
 end

data/lib/mods_display/country_codes.rb

@@ -1,388 +1,11 @@
 # frozen_string_literal: true
 
+require 'mods/marc_country_codes'
+
 module ModsDisplay
   module CountryCodes
     def country_codes
-      { 'aa' => 'Albania',
-        'abc' => 'Alberta',
-        'ac' => 'Ashmore and Cartier Islands',
-        'aca' => 'Australian Capital Territory',
-        'ae' => 'Algeria',
-        'af' => 'Afghanistan',
-        'ag' => 'Argentina',
-        'ai' => 'Armenia (Republic)',
-        'air' => 'Armenian S.S.R.',
-        'aj' => 'Azerbaijan',
-        'ajr' => 'Azerbaijan S.S.R.',
-        'aku' => 'Alaska',
-        'alu' => 'Alabama',
-        'am' => 'Anguilla',
-        'an' => 'Andorra',
-        'ao' => 'Angola',
-        'aq' => 'Antigua and Barbuda',
-        'aru' => 'Arkansas',
-        'as' => 'American Samoa',
-        'at' => 'Australia',
-        'au' => 'Austria',
-        'aw' => 'Aruba',
-        'ay' => 'Antarctica',
-        'azu' => 'Arizona',
-        'ba' => 'Bahrain',
-        'bb' => 'Barbados',
-        'bcc' => 'British Columbia',
-        'bd' => 'Burundi',
-        'be' => 'Belgium',
-        'bf' => 'Bahamas',
-        'bg' => 'Bangladesh',
-        'bh' => 'Belize',
-        'bi' => 'British Indian Ocean Territory',
-        'bl' => 'Brazil',
-        'bm' => 'Bermuda Islands',
-        'bn' => 'Bosnia and Hercegovina',
-        'bo' => 'Bolivia',
-        'bp' => 'Solomon Islands',
-        'br' => 'Burma',
-        'bs' => 'Botswana',
-        'bt' => 'Bhutan',
-        'bu' => 'Bulgaria',
-        'bv' => 'Bouvet Island',
-        'bw' => 'Belarus',
-        'bwr' => 'Byelorussian S.S.R.',
-        'bx' => 'Brunei',
-        'ca' => 'Caribbean Netherlands',
-        'cau' => 'California',
-        'cb' => 'Cambodia',
-        'cc' => 'China',
-        'cd' => 'Chad',
-        'ce' => 'Sri Lanka',
-        'cf' => 'Congo (Brazzaville)',
-        'cg' => 'Congo (Democratic Republic)',
-        'ch' => 'China (Republic : 1949- )',
-        'ci' => 'Croatia',
-        'cj' => 'Cayman Islands',
-        'ck' => 'Colombia',
-        'cl' => 'Chile',
-        'cm' => 'Cameroon',
-        'cn' => 'Canada',
-        'co' => 'Curaçao',
-        'cou' => 'Colorado',
-        'cp' => 'Canton and Enderbury Islands',
-        'cq' => 'Comoros',
-        'cr' => 'Costa Rica',
-        'cs' => 'Czechoslovakia',
-        'ctu' => 'Connecticut',
-        'cu' => 'Cuba',
-        'cv' => 'Cape Verde',
-        'cw' => 'Cook Islands',
-        'cx' => 'Central African Republic',
-        'cy' => 'Cyprus',
-        'cz' => 'Canal Zone',
-        'dcu' => 'District of Columbia',
-        'deu' => 'Delaware',
-        'dk' => 'Denmark',
-        'dm' => 'Benin',
-        'dq' => 'Dominica',
-        'dr' => 'Dominican Republic',
-        'ea' => 'Eritrea',
-        'ec' => 'Ecuador',
-        'eg' => 'Equatorial Guinea',
-        'em' => 'Timor-Leste',
-        'enk' => 'England',
-        'er' => 'Estonia',
-        'err' => 'Estonia',
-        'es' => 'El Salvador',
-        'et' => 'Ethiopia',
-        'fa' => 'Faroe Islands',
-        'fg' => 'French Guiana',
-        'fi' => 'Finland',
-        'fj' => 'Fiji',
-        'fk' => 'Falkland Islands',
-        'flu' => 'Florida',
-        'fm' => 'Micronesia (Federated States)',
-        'fp' => 'French Polynesia',
-        'fr' => 'France',
-        'fs' => 'Terres australes et antarctiques françaises',
-        'ft' => 'Djibouti',
-        'gau' => 'Georgia',
-        'gb' => 'Kiribati',
-        'gd' => 'Grenada',
-        'ge' => 'Germany (East)',
-        'gh' => 'Ghana',
-        'gi' => 'Gibraltar',
-        'gl' => 'Greenland',
-        'gm' => 'Gambia',
-        'gn' => 'Gilbert and Ellice Islands',
-        'go' => 'Gabon',
-        'gp' => 'Guadeloupe',
-        'gr' => 'Greece',
-        'gs' => 'Georgia (Republic)',
-        'gsr' => 'Georgian S.S.R.',
-        'gt' => 'Guatemala',
-        'gu' => 'Guam',
-        'gv' => 'Guinea',
-        'gw' => 'Germany',
-        'gy' => 'Guyana',
-        'gz' => 'Gaza Strip',
-        'hiu' => 'Hawaii',
-        'hk' => 'Hong Kong',
-        'hm' => 'Heard and McDonald Islands',
-        'ho' => 'Honduras',
-        'ht' => 'Haiti',
-        'hu' => 'Hungary',
-        'iau' => 'Iowa',
-        'ic' => 'Iceland',
-        'idu' => 'Idaho',
-        'ie' => 'Ireland',
-        'ii' => 'India',
-        'ilu' => 'Illinois',
-        'inu' => 'Indiana',
-        'io' => 'Indonesia',
-        'iq' => 'Iraq',
-        'ir' => 'Iran',
-        'is' => 'Israel',
-        'it' => 'Italy',
-        'iu' => 'Israel-Syria Demilitarized Zones',
-        'iv' => "Côte d'Ivoire",
-        'iw' => 'Israel-Jordan Demilitarized Zones',
-        'iy' => 'Iraq-Saudi Arabia Neutral Zone',
-        'ja' => 'Japan',
-        'ji' => 'Johnston Atoll',
-        'jm' => 'Jamaica',
-        'jn' => 'Jan Mayen',
-        'jo' => 'Jordan',
-        'ke' => 'Kenya',
-        'kg' => 'Kyrgyzstan',
-        'kgr' => 'Kirghiz S.S.R.',
-        'kn' => 'Korea (North)',
-        'ko' => 'Korea (South)',
-        'ksu' => 'Kansas',
-        'ku' => 'Kuwait',
-        'kv' => 'Kosovo',
-        'kyu' => 'Kentucky',
-        'kz' => 'Kazakhstan',
-        'kzr' => 'Kazakh S.S.R.',
-        'lau' => 'Louisiana',
-        'lb' => 'Liberia',
-        'le' => 'Lebanon',
-        'lh' => 'Liechtenstein',
-        'li' => 'Lithuania',
-        'lir' => 'Lithuania',
-        'ln' => 'Central and Southern Line Islands',
-        'lo' => 'Lesotho',
-        'ls' => 'Laos',
-        'lu' => 'Luxembourg',
-        'lv' => 'Latvia',
-        'lvr' => 'Latvia',
-        'ly' => 'Libya',
-        'mau' => 'Massachusetts',
-        'mbc' => 'Manitoba',
-        'mc' => 'Monaco',
-        'mdu' => 'Maryland',
-        'meu' => 'Maine',
-        'mf' => 'Mauritius',
-        'mg' => 'Madagascar',
-        'mh' => 'Macao',
-        'miu' => 'Michigan',
-        'mj' => 'Montserrat',
-        'mk' => 'Oman',
-        'ml' => 'Mali',
-        'mm' => 'Malta',
-        'mnu' => 'Minnesota',
-        'mo' => 'Montenegro',
-        'mou' => 'Missouri',
-        'mp' => 'Mongolia',
-        'mq' => 'Martinique',
-        'mr' => 'Morocco',
-        'msu' => 'Mississippi',
-        'mtu' => 'Montana',
-        'mu' => 'Mauritania',
-        'mv' => 'Moldova',
-        'mvr' => 'Moldavian S.S.R.',
-        'mw' => 'Malawi',
-        'mx' => 'Mexico',
-        'my' => 'Malaysia',
-        'mz' => 'Mozambique',
-        'na' => 'Netherlands Antilles',
-        'nbu' => 'Nebraska',
-        'ncu' => 'North Carolina',
-        'ndu' => 'North Dakota',
-        'ne' => 'Netherlands',
-        'nfc' => 'Newfoundland and Labrador',
-        'ng' => 'Niger',
-        'nhu' => 'New Hampshire',
-        'nik' => 'Northern Ireland',
-        'nju' => 'New Jersey',
-        'nkc' => 'New Brunswick',
-        'nl' => 'New Caledonia',
-        'nm' => 'Northern Mariana Islands',
-        'nmu' => 'New Mexico',
-        'nn' => 'Vanuatu',
-        'no' => 'Norway',
-        'np' => 'Nepal',
-        'nq' => 'Nicaragua',
-        'nr' => 'Nigeria',
-        'nsc' => 'Nova Scotia',
-        'ntc' => 'Northwest Territories',
-        'nu' => 'Nauru',
-        'nuc' => 'Nunavut',
-        'nvu' => 'Nevada',
-        'nw' => 'Northern Mariana Islands',
-        'nx' => 'Norfolk Island',
-        'nyu' => 'New York (State)',
-        'nz' => 'New Zealand',
-        'ohu' => 'Ohio',
-        'oku' => 'Oklahoma',
-        'onc' => 'Ontario',
-        'oru' => 'Oregon',
-        'ot' => 'Mayotte',
-        'pau' => 'Pennsylvania',
-        'pc' => 'Pitcairn Island',
-        'pe' => 'Peru',
-        'pf' => 'Paracel Islands',
-        'pg' => 'Guinea-Bissau',
-        'ph' => 'Philippines',
-        'pic' => 'Prince Edward Island',
-        'pk' => 'Pakistan',
-        'pl' => 'Poland',
-        'pn' => 'Panama',
-        'po' => 'Portugal',
-        'pp' => 'Papua New Guinea',
-        'pr' => 'Puerto Rico',
-        'pt' => 'Portuguese Timor',
-        'pw' => 'Palau',
-        'py' => 'Paraguay',
-        'qa' => 'Qatar',
-        'qea' => 'Queensland',
-        'quc' => 'Québec (Province)',
-        'rb' => 'Serbia',
-        're' => 'Réunion',
-        'rh' => 'Zimbabwe',
-        'riu' => 'Rhode Island',
-        'rm' => 'Romania',
-        'ru' => 'Russia (Federation)',
-        'rur' => 'Russian S.F.S.R.',
-        'rw' => 'Rwanda',
-        'ry' => 'Ryukyu Islands, Southern',
-        'sa' => 'South Africa',
-        'sb' => 'Svalbard',
-        'sc' => 'Saint-Barthélemy',
-        'scu' => 'South Carolina',
-        'sd' => 'South Sudan',
-        'sdu' => 'South Dakota',
-        'se' => 'Seychelles',
-        'sf' => 'Sao Tome and Principe',
-        'sg' => 'Senegal',
-        'sh' => 'Spanish North Africa',
-        'si' => 'Singapore',
-        'sj' => 'Sudan',
-        'sk' => 'Sikkim',
-        'sl' => 'Sierra Leone',
-        'sm' => 'San Marino',
-        'sn' => 'Sint Maarten',
-        'snc' => 'Saskatchewan',
-        'so' => 'Somalia',
-        'sp' => 'Spain',
-        'sq' => 'Swaziland',
-        'sr' => 'Surinam',
-        'ss' => 'Western Sahara',
-        'st' => 'Saint-Martin',
-        'stk' => 'Scotland',
-        'su' => 'Saudi Arabia',
-        'sv' => 'Swan Islands',
-        'sw' => 'Sweden',
-        'sx' => 'Namibia',
-        'sy' => 'Syria',
-        'sz' => 'Switzerland',
-        'ta' => 'Tajikistan',
-        'tar' => 'Tajik S.S.R.',
-        'tc' => 'Turks and Caicos Islands',
-        'tg' => 'Togo',
-        'th' => 'Thailand',
-        'ti' => 'Tunisia',
-        'tk' => 'Turkmenistan',
-        'tkr' => ' 	Turkmen S.S.R.',
-        'tl' => 'Tokelau',
-        'tma' => 'Tasmania',
-        'tnu' => 'Tennessee',
-        'to' => 'Tonga',
-        'tr' => 'Trinidad and Tobago',
-        'ts' => 'United Arab Emirates',
-        'tt' => 'Trust Territory of the Pacific Islands',
-        'tu' => 'Turkey',
-        'tv' => 'Tuvalu',
-        'txu' => 'Texas',
-        'tz' => 'Tanzania',
-        'ua' => 'Egypt',
-        'uc' => 'United States Misc. Caribbean Islands',
-        'ug' => 'Uganda',
-        'ui' => 'United Kingdom Misc. Islands',
-        'uik' => 'United Kingdom Misc. Islands',
-        'uk' => 'United Kingdom',
-        'un' => 'Ukraine',
-        'unr' => 'Ukraine',
-        'up' => 'United States Misc. Pacific Islands',
-        'ur' => 'Soviet Union',
-        'us' => 'United States',
-        'utu' => 'Utah',
-        'uv' => 'Burkina Faso',
-        'uy' => 'Uruguay',
-        'uz' => 'Uzbekistan',
-        'uzr' => 'Uzbek S.S.R.',
-        'vau' => 'Virginia',
-        'vb' => 'British Virgin Islands',
-        'vc' => 'Vatican City',
-        've' => 'Venezuela',
-        'vi' => 'Virgin Islands of the United States',
-        'vm' => 'Vietnam',
-        'vn' => 'Vietnam, North',
-        'vp' => 'Various places',
-        'vra' => 'Victoria',
-        'vs' => 'Vietnam, South',
-        'vtu' => 'Vermont',
-        'wau' => 'Washington (State)',
-        'wb' => 'West Berlin',
-        'wea' => 'Western Australia',
-        'wf' => 'Wallis and Futuna',
-        'wiu' => 'Wisconsin',
-        'wj' => 'West Bank of the Jordan River',
-        'wk' => 'Wake Island',
-        'wlk' => 'Wales',
-        'ws' => 'Samoa',
-        'wvu' => 'West Virginia',
-        'wyu' => 'Wyoming',
-        'xa' => 'Christmas Island (Indian Ocean)',
-        'xb' => 'Cocos (Keeling) Islands',
-        'xc' => 'Maldives',
-        'xd' => 'Saint Kitts-Nevis',
-        'xe' => 'Marshall Islands',
-        'xf' => 'Midway Islands',
-        'xga' => 'Coral Sea Islands Territory',
-        'xh' => 'Niue',
-        'xi' => 'Saint Kitts-Nevis-Anguilla',
-        'xj' => 'Saint Helena',
-        'xk' => 'Saint Lucia',
-        'xl' => 'Saint Pierre and Miquelon',
-        'xm' => 'Saint Vincent and the Grenadines',
-        'xn' => 'Macedonia',
-        'xna' => 'New South Wales',
-        'xo' => 'Slovakia',
-        'xoa' => 'Northern Territory',
-        'xp' => 'Spratly Island',
-        'xr' => 'Czech Republic',
-        'xra' => 'South Australia',
-        'xs' => 'South Georgia and the South Sandwich Islands',
-        'xv' => 'Slovenia',
-        # Removing per METADOR-32
-        # "xx" => "No place, unknown, or undetermined",
-        'xxc' => 'Canada',
-        'xxk' => 'United Kingdom',
-        'xxr' => 'Soviet Union',
-        'xxu' => 'United States',
-        'ye' => 'Yemen',
-        'ykc' => 'Yukon Territory',
-        'ys' => "Yemen (People's Democratic Republic)",
-        'yu' => 'Serbia and Montenegro',
-        'za' => 'Zambia' }
+      @country_codes ||= MARC_COUNTRY.except('xx') # Removing per METADOR-32
     end
   end
 end

data/lib/mods_display/fields/collection.rb

@@ -29,8 +29,8 @@ module ModsDisplay
     end
 
     def resource_type_is_collection?(value)
-      return unless value.respond_to?(:typeOfResource)
-      return unless value.typeOfResource.attributes.length.positive?
+      return false unless value.respond_to?(:typeOfResource)
+      return false unless value.typeOfResource.attributes.length.positive?
 
       value.typeOfResource.attributes.length.positive? &&
         value.typeOfResource.attributes.first.key?('collection') &&

data/lib/mods_display/fields/identifier.rb

@@ -12,9 +12,7 @@ module ModsDisplay
     private
 
     def identifier_label(element)
-      if element.attributes['type'].respond_to?(:value)
-        return identifier_labels[element.attributes['type'].value] || "#{element.attributes['type'].value}:"
-      end
+      return identifier_labels[element.attributes['type'].value] || "#{element.attributes['type'].value}:" if element.attributes['type'].respond_to?(:value)
 
       I18n.t('mods_display.identifier')
     end

data/lib/mods_display/fields/location.rb

@@ -10,7 +10,8 @@ module ModsDisplay
 
           if child.name.to_sym == :url
             loc_label = displayLabel(location) || I18n.t('mods_display.location')
-            value = "<a href='#{element_text(child)}'>#{(displayLabel(child) || element_text(child)).gsub(/:$/, '')}</a>"
+            value = "<a href='#{element_text(child)}'>#{(displayLabel(child) || element_text(child)).gsub(/:$/,
+                                                                                                          '')}</a>"
           else
             loc_label = location_label(child) || displayLabel(location) || I18n.t('mods_display.location')
             value = element_text(child)

data/lib/mods_display/fields/name.rb

@@ -5,10 +5,11 @@ module ModsDisplay
     include ModsDisplay::RelatorCodes
     def fields
       return_fields = @values.map do |value|
+        name_identifiers = value.element_children.select { |child| child.name == 'nameIdentifier' }
         person = if value.displayForm.length.positive?
-                   ModsDisplay::Name::Person.new(name: element_text(value.displayForm))
+                   ModsDisplay::Name::Person.new(name: element_text(value.displayForm), name_identifiers: name_identifiers)
                  elsif !name_parts(value).empty?
-                   ModsDisplay::Name::Person.new(name: name_parts(value))
+                   ModsDisplay::Name::Person.new(name: name_parts(value), name_identifiers: name_identifiers)
                  end
         # The person may have multiple roles, so we have to divide them up into an array
         role_labels(value).collect do |role_label|
@@ -163,7 +164,7 @@ module ModsDisplay
       # Build the new fields data, stripping out the roles within the Person classes
       label_keys.uniq.map do |k|
         values = results[k].map do |person|
-          ModsDisplay::Name::Person.new(name: person.name)
+          ModsDisplay::Name::Person.new(name: person.name, orcid: person.orcid)
         end
 
         ModsDisplay::Values.new(label: k, values: values)
@@ -171,15 +172,29 @@ module ModsDisplay
     end
 
     class Person
-      attr_accessor :name
+      attr_accessor :name, :orcid
 
       def initialize(data)
         @name = data[:name]
+        @orcid = if data[:orcid].present?
+                   data[:orcid]
+                 elsif data[:name_identifiers].present?
+                   orcid_identifier(data[:name_identifiers])
+                 end
       end
 
       def to_s
         @name
       end
+
+      private
+
+      def orcid_identifier(name_identifiers)
+        orcid = name_identifiers.select do |name_identifier|
+          name_identifier.attribute('type')&.value == 'orcid'
+        end
+        orcid.first&.text
+      end
     end
   end
 end

data/lib/mods_display/fields/note.rb

@@ -4,7 +4,8 @@ module ModsDisplay
   class Note < Field
     def fields
       return_fields = note_fields.map do |value|
-        ModsDisplay::Values.new(label: displayLabel(value) || note_label(value), values: [element_text(value)], field: self)
+        ModsDisplay::Values.new(label: displayLabel(value) || note_label(value), values: [element_text(value)],
+                                field: self)
       end
       collapse_fields(return_fields)
     end
@@ -24,9 +25,7 @@ module ModsDisplay
     end
 
     def note_label(element)
-      if element.attributes['type'].respond_to?(:value)
-        return note_labels[element.attributes['type'].value] || "#{element.attributes['type'].value.capitalize}:"
-      end
+      return note_labels[element.attributes['type'].value] || "#{element.attributes['type'].value.capitalize}:" if element.attributes['type'].respond_to?(:value)
 
       I18n.t('mods_display.note')
     end

data/lib/mods_display/relator_codes.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module ModsDisplay
-  module RelatorCodes
-    def relator_codes
+  module RelatorCodes # rubocop:disable Metrics/ModuleLength
+    def relator_codes # rubocop:disable Metrics/MethodLength
       { 'abr' => 'Abridger',
         'acp' => 'Art copyist',
         'act' => 'Actor',

data/lib/mods_display/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ModsDisplay
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/mods_display.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'stanford-mods', '~> 3.3'
+  gem.add_dependency 'stanford-mods', '~> 3.3', '>=3.3.7' # require stanford-mods 3.3.7 for orcid support
   gem.add_dependency 'i18n'
   gem.add_dependency 'view_component'
+  gem.add_dependency 'rails_autolink'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.7
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails_autolink
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display