mods_display 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a10b1a255b452e15abe4bb8efefa442a09e17722689eeada14c2e5b210f80f8
-  data.tar.gz: 6cb1fb4fa43419a3820e303cec2da27c9c03d2bd3d4e2db32d3d4189071207e1
+  metadata.gz: db5aacb765a91a03b8fe5fbb6c41b52ab0cb2f94467808f5e896f9b95c5b72ad
+  data.tar.gz: b0572788c7868f49d98340668a28e71dde9cd41f676927436ce2ec9d09f24f83
 SHA512:
-  metadata.gz: 221cf2e30ffc91d3c11afdc2c200552577d7bd2b7975b022bf897668b1342edd7d9a3d21c0cc2724d48ad30b0d1a0be2af46cbab15cc398072aeb5761387d80c
-  data.tar.gz: 6f945ced7697570d76661f72e6a16d81fd03a32225f669e133c4e8428f03c1d816b282a2c40c9217d23af23a5f5ff6f49fe807917fbbfbafc34ac1f414f911d6
+  metadata.gz: 283a91d3efc90f2cdac50c2adae6133e758084ed454bbc9c79000567d9f83696e15369089290609c709e2c38b4e9e02a19d264297ff48e529aaf232bfd02f773
+  data.tar.gz: a22877a514a7379219856dc941dfca980eb23aa7c8b0d2e8f12a8d023300dee4655ca1ef7e87e3ec36fe980c524eb07af848425d8b920b5d41324ae995871751

data/app/helpers/mods_display/record_helper.rb

@@ -17,6 +17,7 @@ module ModsDisplay
       render component.new(field: field, delimiter: delimiter, value_transformer: block)
     end
 
+    # this returns a role's label and the display names for ModsDisplay:Name:Person
     def mods_name_field(field)
       mods_record_field(field) do |name|
         block_given? ? capture { yield(name.name) } : name.name
@@ -90,8 +91,12 @@ module ModsDisplay
       # Martin Wong data has significant linebreaks in abstracts and notes that we want
       # to preserve and display in HTML.
       #
+      # Some user-deposited items have complex use and reproduction statements that also
+      # need linebreaks preserved.
+      #
       # See https://github.com/sul-dlss/mods_display/issues/78
-      simple_formatted_fields = [ModsDisplay::Abstract, ModsDisplay::Contents, ModsDisplay::Note]
+      # and https://github.com/sul-dlss/mods_display/issues/145
+      simple_formatted_fields = [ModsDisplay::Abstract, ModsDisplay::Contents, ModsDisplay::Note, ModsDisplay::AccessCondition]
       if simple_formatted_fields.any? { |klass| field&.field.is_a? klass } && formatted_val.include?("\n")
         simple_format(formatted_val, {}, sanitize: false)
       else

data/lib/mods_display/fields/access_condition.rb

@@ -54,7 +54,8 @@ module ModsDisplay
       return_fields = @values.map do |value|
         ModsDisplay::Values.new(
           label: displayLabel(value) || access_label(value),
-          values: [process_access_statement(value)]
+          values: [process_access_statement(value)],
+          field: self
         )
       end
       collapse_fields(return_fields)
@@ -82,10 +83,21 @@ module ModsDisplay
     end
 
     def license_statement(element)
-      matches = element_text(element).match(/^(?<code>.*) (?<type>.*):(?<description>.*)$/)
+      element_text = element_text(element)
+      legacy_matches = element_text.match(/^(?<code>.*) (?<type>.*):(?<description>.*)$/)
+      return legacy_license_statement(element, legacy_matches) if legacy_matches
 
-      return element_text(element) unless matches
+      matches = element_text.match(/^This work is licensed under a (.+?)\.$/)
+      return linked_licensed_statement(element, matches) if matches && element['xlink:href'].present?
 
+      element_text
+    end
+
+    def linked_licensed_statement(element, matches)
+      "This work is licensed under a <a href='#{element['xlink:href']}'>#{matches[1]}</a>."
+    end
+
+    def legacy_license_statement(_element, matches)
       code = matches[:code].downcase
       type = matches[:type].downcase
       description = license_description(code, type) || matches[:description]

data/lib/mods_display/fields/name.rb

@@ -3,6 +3,9 @@
 module ModsDisplay
   class Name < Field
     include ModsDisplay::RelatorCodes
+
+    # this returns a hash:
+    #  { role1 label => [ ModsDisplay:Name:Person,  ModsDisplay:Name:Person, ...], role2 label => [ ModsDisplay:Name:Person,  ModsDisplay:Name:Person, ...] }
     def fields
       return_fields = @values.map do |value|
         name_identifiers = value.element_children.select { |child| child.name == 'nameIdentifier' }

data/lib/mods_display/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display