mods_display 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd385f9d4aea6c14524378831877c327c6fdfd2664356e148b457af9c26a5623
-  data.tar.gz: b66857f71c766dc6edb03b8783d1d63486e94c63c8e9a71a0474f6b5a11d44cc
+  metadata.gz: 8f82b0048ccbf7b94b1c15326c364b4133adf8c241145e98809e6e258cc15164
+  data.tar.gz: '04349a0206e891f2ab84d23c7a182e5a5bd1b1e8227bb08deda07d23824b4511'
 SHA512:
-  metadata.gz: 6b4760e8eee0c1eef22badaf5087b4095c4c88766c3b128bbaa1e841e2b1aa34294ced0be7199875b6aa57cdf1b3385dd5c11d624f4ce818afcc7fa4f1da25ab
-  data.tar.gz: 93c93c4249b55816c9716b1c632d0b4c5b5a2874365e33139fbbf6cd9421f01d3aa9800d347c72ae7837bcf98ef763650e8151a3cab547cecb287a72ff7a9ace
+  metadata.gz: 5e8ae4be6ab26e6e30fa74f0b71cc3a03c19ca33906770c5cf5c9819ccf11be9c92281e5b6443b8cb8905b0df285c93470a963d2c11ad2a37c1390166b77ee54
+  data.tar.gz: 0e982271c57bdc0058dc5f005f2f0a9a84962e4ce01f1e0740bb3143e9332c2b8f4a398adc190520dd5509bdd8b85eb58bdeeaf8544910405759a703ff121198

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/README.md

@@ -1,6 +1,15 @@
 # ModsDisplay
 
-A gem for displaying MODS Metadata in a configurable way.
+A gem for displaying MODS Metadata in a configurable way.  
+
+This gem is used to centralize the display logic of MODS metadata by creating html fragments such as
+
+```
+   <dt>Publisher</dt>
+   <dd>Diagon Alley Publications</dd>
+```
+
+which can be styled in consuming apps such as SearchWorks or Exhibits.
 
 ## Demo
 
@@ -20,23 +29,6 @@ Or install it yourself as:
 
     $ gem install mods_display
 
-## Release/Upgrade Notes
-
-#### v0.5.0
-There are three major changes in this version.
-
-1. RelatedItem nodes with a type of `constituent` or `host` are now treated separately and will render the full MODS display of any nested metadata.  If accessing the `ModsDisplay::Values` directly through their accessors (e.g. custom grouping), this new metadata is available under `.nested_related_items`.
-    * _**Note:** You may want to style and add some javascript toggling behavior (see exhibits for an example)._
-2. Name nodes are now grouped/labeled by their role.  If you were iterating over the names and splitting them out by their labels, that will need to change.
-3. Table of contents/Summaries are now split on `--` and rendered as an unordered list.
-    * _**Note:** You may want to style this list._
-
-#### v0.3.0
-
-Labels now have internationalization support.  We have added colons to the english labels due to certain languages' punctuation rules requiring different spacing between the label and colon.
-
-Given that fact, you will want to update any pre 0.3.0 code that searches for elements by label in a way that would fail with the presence of a colon.
-
 ## Contributing
 
 1. Fork it

data/app/components/mods_display/row_field_component.html.erb

@@ -0,0 +1,11 @@
+<% values.each do |value| %>
+  <tr>
+    <% if label %>
+      <%= tag.th label, **label_html_attributes %>
+    <% end %>
+
+    <%= tag.td **value_html_attributes do %>
+      <%= value %>
+    <% end %>
+  </tr>
+<% end %>

data/app/components/mods_display/row_field_component.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class RowFieldComponent < ViewComponent::Base
+    with_collection_parameter :field
+
+    def initialize(field:, delimiter: nil, label_html_attributes: {}, value_html_attributes: {}, value_transformer: nil)
+      super
+
+      @field = field
+      @delimiter = delimiter
+      @value_transformer = value_transformer
+      @label_html_attributes = label_html_attributes
+      @value_html_attributes = value_html_attributes
+    end
+
+    attr_reader :field, :delimiter, :label_html_attributes, :value_html_attributes
+
+    def render?
+      field.values.any?(&:present?)
+    end
+
+    def format_value(value)
+      if @value_transformer
+        @value_transformer.call(value)
+      else
+        helpers.format_mods_html(value, field: field)
+      end
+    end
+
+    def values
+      if delimiter
+        [safe_join(field.values.select(&:present?).map { |value| format_value(value) }, delimiter)]
+      else
+        field.values.select(&:present?).map { |value| format_value(value) }
+      end
+    end
+
+    def label
+      field.label&.sub(/:$/, '')
+    end
+  end
+end

data/app/helpers/mods_display/record_helper.rb

@@ -17,6 +17,14 @@ module ModsDisplay
       render component.new(field: field, delimiter: delimiter, value_transformer: block)
     end
 
+    def mods_record_definition_field(field, delimiter: nil, label_html_attributes: {}, &block)
+      render ModsDisplay::FieldComponent.new(field: field, delimiter: delimiter, label_html_attributes: label_html_attributes, value_transformer: block)
+    end
+
+    def mods_record_row_field(field, delimiter: ', ', &block)
+      render ModsDisplay::RowFieldComponent.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|
@@ -41,12 +49,24 @@ module ModsDisplay
       end
     end
 
+    def mods_subject_row_field(field, delimiter: nil, &block)
+      mods_record_row_field(field, delimiter: delimiter) do |subject_line|
+        safe_join(link_mods_subjects(subject_line, &block), ' > ')
+      end
+    end
+
     def mods_genre_field(field, &block)
       mods_record_field(field) do |genre_line|
         link_to_mods_subject(genre_line, &block)
       end
     end
 
+    def mods_genre_row_field(field, delimiter: nil, &block)
+      mods_record_row_field(field, delimiter: delimiter) do |genre_line|
+        link_to_mods_subject(genre_line, &block)
+      end
+    end
+
     # @private
     def link_mods_genres(genre, &block)
       link_buffer = []

data/config/locales/en.yml

@@ -17,11 +17,13 @@ en:
     creation_production_credits: "Creation/Production credits:"
     date_captured: "Date captured:"
     date_created: "Date created:"
+    date_issued: "Publication date:"
     date_modified: "Date modified:"
     date_sequential_designation: "Date/Sequential designation:"
     date_valid: "Date valid:"
     digital_origin: "Digital origin:"
     doi: "DOI:"
+    edition: "Edition:"
     extent: "Extent:"
     form: "Form:"
     frequency: "Frequency:"

data/lib/mods_display/fields/cartographics.rb

@@ -18,7 +18,7 @@ module ModsDisplay
                          [projection, coordinates].compact.join(' ')
                        end
           return_fields << ModsDisplay::Values.new(
-            label: (displayLabel(field) || label || I18n.t('mods_display.map_data')),
+            label: displayLabel(field) || label || I18n.t('mods_display.map_data'),
             values: [[scale, post_scale].compact.join(' ; ')]
           )
         end

data/lib/mods_display/fields/copyright_date.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class CopyrightDate < Field
+    def fields
+      date_fields(:copyrightDate)
+    end
+  end
+end

data/lib/mods_display/fields/date_captured.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class DateCaptured < Field
+    def fields
+      date_fields(:dateCaptured)
+    end
+  end
+end

data/lib/mods_display/fields/date_created.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class DateCreated < Field
+    def fields
+      date_fields(:dateCreated)
+    end
+  end
+end

data/lib/mods_display/fields/date_issued.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class DateIssued < Field
+    def fields
+      date_fields(:dateIssued)
+    end
+  end
+end

data/lib/mods_display/fields/date_modified.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class DateModified < Field
+    def fields
+      date_fields(:dateModified)
+    end
+  end
+end

data/lib/mods_display/fields/date_valid.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class DateValid < Field
+    def fields
+      date_fields(:dateValid)
+    end
+  end
+end

data/lib/mods_display/fields/edition.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class Edition < Field
+    def fields
+      return_fields = @values.map do |value|
+        edition_value = Stanford::Mods::Imprint.new(value).edition_vals_str
+        next unless edition_value.present?
+
+        # remove trailing spaces (thanks MARC for catalog card formatting!)
+        edition_value.gsub!(%r{ */$}, '')
+
+        ModsDisplay::Values.new(
+          label: I18n.t('mods_display.edition'),
+          values: [edition_value],
+          field: self
+        )
+      end.compact
+      collapse_fields(return_fields)
+    end
+  end
+end

data/lib/mods_display/fields/field.rb

@@ -57,5 +57,46 @@ module ModsDisplay
     def element_text(element)
       element.xpath('.//text()').to_html.strip
     end
+
+    # used for originInfo date fields, e.g. DateCreated, DateIssued ...
+    def date_fields(date_symbol)
+      return_fields = @values.map do |value|
+        date_values = Stanford::Mods::Imprint.new(value).dates([date_symbol])
+        next unless date_values.present?
+
+        ModsDisplay::Values.new(
+          label: I18n.t("mods_display.#{date_symbol.to_s.underscore}"),
+          values: select_best_date(date_values),
+          field: self
+        )
+      end.compact
+      collapse_fields(return_fields)
+    end
+
+    # used for originInfo dates, e.g. for Imprint, DateCreated, DateIssued, etc.
+    def select_best_date(dates)
+      # ensure dates are unique with respect to their base values
+      dates = dates.group_by(&:base_value).map do |_value, group|
+        group.first if group.one?
+
+        # if one of the duplicates wasn't encoded, use that one. see:
+        # https://consul.stanford.edu/display/chimera/MODS+display+rules#MODSdisplayrules-3b.%3CoriginInfo%3E
+        if group.reject(&:encoding).any?
+          group.reject(&:encoding).first
+
+        # otherwise just randomly pick the last in the group
+        else
+          group.last
+        end
+      end
+
+      # if any single dates are already part of a range, discard them
+      range_base_values = dates.select { |date| date.is_a?(Stanford::Mods::Imprint::DateRange) }
+                               .map(&:base_values).flatten
+      dates = dates.reject { |date| range_base_values.include?(date.base_value) }
+
+      # output formatted dates with qualifiers, CE/BCE, etc.
+      dates.map(&:qualified_value)
+    end
   end
 end

data/lib/mods_display/fields/frequency.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class Frequency < Field
+    def fields
+      return_fields = @values.map do |origin_info_element|
+        frequency_value = origin_info_element.frequency&.text&.strip
+        next unless frequency_value.present?
+
+        ModsDisplay::Values.new(
+          label: I18n.t('mods_display.frequency'),
+          values: [frequency_value],
+          field: self
+        )
+      end.compact
+      collapse_fields(return_fields)
+    end
+  end
+end

data/lib/mods_display/fields/imprint.rb

@@ -48,7 +48,7 @@ module ModsDisplay
 
         ModsDisplay::Values.new(
           label: displayLabel(element) || pub_info_labels[date_field],
-          values: select_the_best_date(date_values)
+          values: select_best_date(date_values)
         )
       end.compact
     end
@@ -117,6 +117,8 @@ module ModsDisplay
       end.map(&:text).join(' ').strip
     end
 
+    # not an exact duplicate of the method in ModsDisplay::Place, particularly trailing punctuation code
+    #  as ModsDisplay::Place is not intended to combine with publisher in an imprint string
     def place_element(value)
       return if value.place.text.strip.empty?
 
@@ -142,7 +144,7 @@ module ModsDisplay
         date_values = imprint.dates([date_field])
         next if date_values.empty?
 
-        select_the_best_date(date_values)
+        select_best_date(date_values)
       end.flatten.compact.reject do |date|
         date.strip.empty?
       end.map(&:strip)
@@ -162,30 +164,5 @@ module ModsDisplay
         issuance: I18n.t('mods_display.issuance'),
         frequency: I18n.t('mods_display.frequency') }
     end
-
-    def select_the_best_date(dates)
-      # ensure dates are unique with respect to their base values
-      dates = dates.group_by(&:base_value).map do |_value, group|
-        group.first if group.one?
-
-        # if one of the duplicates wasn't encoded, use that one. see:
-        # https://consul.stanford.edu/display/chimera/MODS+display+rules#MODSdisplayrules-3b.%3CoriginInfo%3E
-        if group.reject(&:encoding).any?
-          group.reject(&:encoding).first
-
-        # otherwise just randomly pick the last in the group
-        else
-          group.last
-        end
-      end
-
-      # if any single dates are already part of a range, discard them
-      range_base_values = dates.select { |date| date.is_a?(Stanford::Mods::Imprint::DateRange) }
-                               .map(&:base_values).flatten
-      dates = dates.reject { |date| range_base_values.include?(date.base_value) }
-
-      # output formatted dates with qualifiers, CE/BCE, etc.
-      dates.map(&:qualified_value)
-    end
   end
 end

data/lib/mods_display/fields/issuance.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class Issuance < Field
+    def fields
+      return_fields = @values.map do |origin_info_element|
+        issuance_value = origin_info_element.issuance&.text&.strip
+        next unless issuance_value.present?
+
+        ModsDisplay::Values.new(
+          label: displayLabel(origin_info_element) || I18n.t('mods_display.issuance'),
+          values: [issuance_value],
+          field: self
+        )
+      end.compact
+      collapse_fields(return_fields)
+    end
+  end
+end

data/lib/mods_display/fields/nested_related_item.rb

@@ -8,59 +8,66 @@ module ModsDisplay
   class NestedRelatedItem < Field
     include ModsDisplay::RelatedItemConcerns
 
+    def initialize(values, value_renderer: ValueRenderer)
+      super(values)
+      @value_renderer = value_renderer
+    end
+
     def fields
       @fields ||= begin
         return_fields = RelatedItemValue.for_values(@values).map do |value|
           next if value.collection?
           next unless render_nested_related_item?(value)
 
-          related_item_mods_object(value)
+          related_item_text = @value_renderer.new(value).render
+
+          ModsDisplay::Values.new(
+            label: related_item_label(value),
+            values: [related_item_text]
+          )
         end.compact
         collapse_fields(return_fields)
       end
     end
 
-    def to_html(view_context = ApplicationController.renderer)
-      helpers = view_context.respond_to?(:simple_format) ? view_context : ApplicationController.new.view_context
+    class ValueRenderer
+      def initialize(value)
+        @value = value
+      end
 
-      component = ModsDisplay::ListFieldComponent.with_collection(
-        fields,
-        value_transformer: ->(value) { helpers.format_mods_html(value.to_s) },
-        list_html_attributes: { class: 'mods_display_nested_related_items' },
-        list_item_html_attributes: { class: 'mods_display_nested_related_item open' }
-      )
+      def render
+        [Array.wrap(mods_display_html.title).first, body_presence(mods_display_html.body)].compact.join
+      end
 
-      view_context.render component, layout: false
-    end
+      protected
 
-    private
+      attr_reader :value
 
-    def related_item_mods_object(value)
-      mods = ::Stanford::Mods::Record.new.tap do |r|
-        # dup'ing the value adds the appropriate namespaces, but...
-        munged_node = value.dup.tap do |x|
-          # ... the mods gem also expects the root of the document to have the root tag <mods>
-          x.name = 'mods'
-        end
-
-        r.from_nk_node(munged_node)
+      def mods_display_html
+        @mods_display_html ||= ModsDisplay::HTML.new(mods)
       end
-      related_item = ModsDisplay::HTML.new(mods)
 
-      ModsDisplay::Values.new(
-        label: related_item_label(value),
-        values: [[Array.wrap(related_item.title).first, related_item_body(related_item)].compact.join]
-      )
-    end
+      def mods
+        @mods ||= ::Stanford::Mods::Record.new.tap do |r|
+          # dup'ing the value adds the appropriate namespaces, but...
+          munged_node = value.dup.tap do |x|
+            # ... the mods gem also expects the root of the document to have the root tag <mods>
+            x.name = 'mods'
+          end
 
-    def related_item_body(related_item)
-      body = related_item.body
+          r.from_nk_node(munged_node)
+        end
+      end
 
-      return if body == '<dl></dl>'
+      def body_presence(body)
+        return if body == '<dl></dl>'
 
-      body
+        body
+      end
     end
 
+    private
+
     def related_item_label(item)
       return displayLabel(item) if displayLabel(item)
       return I18n.t('mods_display.constituent') if item.constituent?

data/lib/mods_display/fields/note.rb

@@ -18,9 +18,9 @@ module ModsDisplay
 
     def note_fields
       @values.select do |value|
-        (!value.attributes['type'].respond_to?(:value) ||
-           (value.attributes['type'].respond_to?(:value) &&
-              value.attributes['type'].value.downcase != 'contact'))
+        !value.attributes['type'].respond_to?(:value) ||
+          (value.attributes['type'].respond_to?(:value) &&
+             value.attributes['type'].value.downcase != 'contact')
       end
     end
 

data/lib/mods_display/fields/place.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class Place < Field
+    include ModsDisplay::CountryCodes
+
+    def fields
+      return_fields = @values.map do |value|
+        place_value = place_element(value)
+        next unless place_value.present?
+
+        ModsDisplay::Values.new(
+          label: I18n.t('mods_display.place'),
+          values: [place_value],
+          field: self
+        )
+      end.compact
+      collapse_fields(return_fields)
+    end
+
+    private
+
+    # not an exact duplicate of the method in Imprint, particularly trailing punctuation code
+    def place_element(value)
+      return if value.place.text.strip.empty?
+
+      places = ModsDisplay::Imprint.new(value).place_terms(value).filter_map { |p| p.text unless p.text.strip.empty? }
+      compact_and_remove_trailing_delimiter(places, ':').join
+    end
+
+    def compact_and_remove_trailing_delimiter(values, delimiter = ':')
+      values.flatten.filter_map { |v| v.gsub(/ *#{delimiter}$/, '') if v.present? }.compact
+    end
+  end
+end

data/lib/mods_display/fields/publisher.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class Publisher < Field
+    def fields
+      return_fields = @values.map do |value|
+        publisher_value = Stanford::Mods::Imprint.new(value).publisher_vals_str
+        next unless publisher_value.present?
+
+        publisher_value.gsub!(/ *,$/, '')
+
+        ModsDisplay::Values.new(
+          label: I18n.t('mods_display.publisher'),
+          values: [publisher_value],
+          field: self
+        )
+      end.compact
+      collapse_fields(return_fields)
+    end
+  end
+end

data/lib/mods_display/fields/reference_title.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class ReferenceTitle < Field
+    def fields
+      # Reference title is a composite field that includes parts from elsewhere in the record.
+      return [] unless @values.present?
+
+      return_fields = [ModsDisplay::Values.new(label: displayLabel(@values.first) || label, values: [title_value].compact)]
+      collapse_fields(return_fields)
+    end
+
+    private
+
+    def root
+      @root ||= @values.first.document.root
+    end
+
+    def displayLabel(element)
+      super(element) || I18n.t('mods_display.referenced_by')
+    end
+
+    def title_value
+      [@values,
+       root.xpath('mods:originInfo/mods:dateOther', mods: MODS_NS),
+       root.xpath('mods:part/mods:detail/mods:number', mods: MODS_NS),
+       root.xpath('mods:note', mods: MODS_NS)].flatten.compact.map!(&:text).map!(&:strip).join(' ').presence
+    end
+  end
+end

data/lib/mods_display/fields/related_item.rb

@@ -4,12 +4,17 @@ module ModsDisplay
   class RelatedItem < Field
     include ModsDisplay::RelatedItemConcerns
 
+    def initialize(values, value_renderer: ValueRenderer)
+      super(values)
+      @value_renderer = value_renderer
+    end
+
     def fields
       return_fields = RelatedItemValue.for_values(@values).map do |value|
         next if value.collection?
         next if render_nested_related_item?(value)
 
-        text = related_item_value(value)
+        text = @value_renderer.new(value).render
 
         next if text.nil? || text.empty?
 
@@ -18,41 +23,57 @@ module ModsDisplay
       collapse_fields(return_fields)
     end
 
-    private
+    class ValueRenderer
+      def initialize(value)
+        @value = value
+      end
 
-    def delimiter
-      '<br />'.html_safe
-    end
+      def render
+        if value.location?
+          element_text(value.location_nodeset)
+        elsif value.reference?
+          reference_title(value)
+        elsif value.titleInfo_nodeset.any?
+          title = element_text(value.titleInfo_nodeset)
+          location = nil
+          location = element_text(value.location_url_nodeset) if value.location_url_nodeset.length.positive?
+
+          return if title.empty?
 
-    def related_item_value(item)
-      if item.location?
-        element_text(item.location_nodeset)
-      elsif item.reference?
-        reference_title(item)
-      elsif item.titleInfo_nodeset.any?
-        title = element_text(item.titleInfo_nodeset)
-        location = nil
-        location = element_text(item.location_url_nodeset) if item.location_url_nodeset.length.positive?
-
-        return if title.empty?
-
-        if location
-          "<a href='#{location}'>#{title}</a>".html_safe
-        else
-          title
+          if location
+            "<a href='#{location}'>#{title}</a>".html_safe
+          else
+            title
+          end
+        elsif value.note_nodeset.any?
+          citation = value.note_nodeset.find { |note| note['type'] == 'preferred citation' }
+
+          element_text(citation) if citation
         end
-      elsif item.note_nodeset.any?
-        citation = item.note_nodeset.find { |note| note['type'] == 'preferred citation' }
+      end
 
-        element_text(citation) if citation
+      protected
+
+      attr_reader :value
+
+      def element_text(element)
+        element.xpath('.//text()').to_html.strip
+      end
+
+      def reference_title(item)
+        [item.titleInfo_nodeset,
+         item.originInfo.dateOther,
+         item.part.detail.number,
+         item.note_nodeset].flatten.compact.map!(&:text).map!(&:strip).join(' ')
       end
     end
 
-    def reference_title(item)
-      [item.titleInfo_nodeset,
-       item.originInfo.dateOther,
-       item.part.detail.number,
-       item.note_nodeset].flatten.compact.map!(&:text).map!(&:strip).join(' ')
+    private
+
+    attr_reader :value_renderer
+
+    def delimiter
+      '<br />'.html_safe
     end
 
     def related_item_label(item)

data/lib/mods_display/fields/title.rb

@@ -2,6 +2,11 @@
 
 module ModsDisplay
   class Title < Field
+    def initialize(values, link: nil)
+      @link = link
+      super(values)
+    end
+
     def fields
       return_values = sorted_values.map do |value|
         ModsDisplay::Values.new(
@@ -31,21 +36,7 @@ module ModsDisplay
         str = value.text.strip
         next if str.empty?
 
-        delimiter = if title.empty? || title.end_with?(' ')
-                      nil
-                    elsif previous_element&.name == 'nonSort' && title.end_with?('-', '\'')
-                      nil
-                    elsif title.end_with?('.', ',', ':', ';')
-                      ' '
-                    elsif value.name == 'subTitle'
-                      ' : '
-                    elsif value.name == 'partName' && previous_element.name == 'partNumber'
-                      ', '
-                    elsif value.name == 'partNumber' || value.name == 'partName'
-                      '. '
-                    else
-                      ' '
-                    end
+        delimiter = title_delimiter(title, previous_element, value)
 
         title += delimiter if delimiter
         title += str
@@ -53,13 +44,38 @@ module ModsDisplay
         previous_element = value
       end
 
-      if element['type'] == 'uniform' && element['nameTitleGroup'].present?
-        [uniform_title_name_part(element), title].compact.join('. ')
+      full_title = if element['type'] == 'uniform' && element['nameTitleGroup'].present?
+                     [uniform_title_name_part(element), title].compact.join('. ')
+                   else
+                     title
+                   end
+      linked_title(full_title)
+    end
+
+    def title_delimiter(title, previous_element, value)
+      if title.empty? || title.end_with?(' ')
+        nil
+      elsif previous_element&.name == 'nonSort' && title.end_with?('-', '\'')
+        nil
+      elsif title.end_with?('.', ',', ':', ';')
+        ' '
+      elsif value.name == 'subTitle'
+        ' : '
+      elsif value.name == 'partName' && previous_element.name == 'partNumber'
+        ', '
+      elsif value.name == 'partNumber' || value.name == 'partName'
+        '. '
       else
-        title
+        ' '
       end
     end
 
+    def linked_title(title)
+      return title unless @link
+
+      "<a href=\"#{@link}\">#{title}</a>"
+    end
+
     def uniform_title_name_part(element)
       names = element.xpath("//m:name[@nameTitleGroup=\"#{element['nameTitleGroup']}\"]", **Mods::Record::NS_HASH)
       names = element.xpath("//name[@nameTitleGroup=\"#{element['nameTitleGroup']}\"]") if names.empty?

data/lib/mods_display/html.rb

@@ -5,13 +5,25 @@ module ModsDisplay
     MODS_DISPLAY_FIELD_MAPPING = {
       title: :title_info,
       subTitle: :title_info,
+      referenceTitle: :title_info,
       name: :plain_name,
       resourceType: :typeOfResource,
       genre: :genre,
       form: :physical_description,
       extent: :physical_description,
       geo: :extension,
+      copyrightDate: :origin_info,
+      dateCaptured: :origin_info,
+      dateCreated: :origin_info,
+      dateIssued: :origin_info,
+      dateModified: :origin_info,
+      dateValid: :origin_info,
+      edition: :origin_info,
+      frequency: :origin_info,
       imprint: :origin_info,
+      issuance: :origin_info,
+      place: :origin_info,
+      publisher: :origin_info,
       language: :language,
       description: :physical_description,
       cartographics: :subject,
@@ -29,11 +41,13 @@ module ModsDisplay
       accessCondition: :accessCondition
     }.freeze
 
-    def initialize(xml)
-      @stanford_mods = xml
-      @xml = xml.mods_ng_xml
+    def initialize(mods)
+      @mods = mods
+      @xml = mods.mods_ng_xml
     end
 
+    attr_reader :xml
+
     def title
       title_fields = mods_field(:title).fields
       title_fields.empty? ? '' : title_fields.first.values
@@ -46,8 +60,8 @@ module ModsDisplay
     # Need to figure out how to get the 1st title out of the list.
     # Maybe have a separate class that will omit the first title natively
     # and replace the first key in the the fields list with that.
-    def body(view_context = ApplicationController.renderer)
-      view_context.render ModsDisplay::RecordComponent.new(record: self), layout: false
+    def body(view_context = ApplicationController.renderer, html_attributes: {}, component: ModsDisplay::RecordComponent)
+      view_context.render component.new(record: self, html_attributes: html_attributes), layout: false
     end
 
     # @deprecated
@@ -56,22 +70,22 @@ module ModsDisplay
       view_context.render ModsDisplay::RecordComponent.new(record: self, fields: fields), layout: false
     end
 
-    MODS_DISPLAY_FIELD_MAPPING.each do |key, _value|
+    MODS_DISPLAY_FIELD_MAPPING.each_key do |key|
       next if key == :title
 
-      define_method(key) do |raw: false|
-        field = mods_field(key)
+      define_method(key) do |raw: false, **field_args|
+        field = mods_field(key, field_args: field_args)
         next field if raw
 
         field.fields
       end
     end
 
-    def mods_field(key)
+    def mods_field(key, field_args: {})
       raise ArgumentError unless MODS_DISPLAY_FIELD_MAPPING[key] && @xml.respond_to?(MODS_DISPLAY_FIELD_MAPPING[key])
 
       field = @xml.public_send(MODS_DISPLAY_FIELD_MAPPING[key])
-      mods_field_class(key).new(field)
+      mods_field_class(key).new(field, **field_args)
     end
 
     private

data/lib/mods_display/version.rb

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

data/lib/mods_display.rb

@@ -13,20 +13,32 @@ require 'mods_display/fields/audience'
 require 'mods_display/fields/collection'
 require 'mods_display/fields/contact'
 require 'mods_display/fields/contents'
+require 'mods_display/fields/copyright_date'
 require 'mods_display/fields/cartographics'
+require 'mods_display/fields/date_created'
+require 'mods_display/fields/date_captured'
+require 'mods_display/fields/date_issued'
+require 'mods_display/fields/date_modified'
+require 'mods_display/fields/date_valid'
 require 'mods_display/fields/description'
+require 'mods_display/fields/edition'
 require 'mods_display/fields/extent'
+require 'mods_display/fields/frequency'
 require 'mods_display/fields/form'
 require 'mods_display/fields/genre'
 require 'mods_display/fields/geo'
 require 'mods_display/fields/identifier'
 require 'mods_display/fields/imprint'
+require 'mods_display/fields/issuance'
 require 'mods_display/fields/language'
 require 'mods_display/fields/location'
 require 'mods_display/fields/name'
 require 'mods_display/fields/nested_related_item'
 require 'mods_display/fields/note'
+require 'mods_display/fields/place'
+require 'mods_display/fields/publisher'
 require 'mods_display/fields/related_item'
+require 'mods_display/fields/reference_title'
 require 'mods_display/fields/resource_type'
 require 'mods_display/fields/subject'
 require 'mods_display/fields/title'

data/mods_display.gemspec

@@ -21,7 +21,7 @@ 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', '>=3.3.7' # require stanford-mods 3.3.7 for orcid support
+  gem.add_dependency 'stanford-mods', '~> 3.3', '>=3.3.9' # require stanford-mods 3.3.9 for edition field
   gem.add_dependency 'i18n'
   gem.add_dependency 'view_component'
   gem.add_dependency 'rails_autolink'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -19,7 +19,7 @@ dependencies:
         version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.3.9
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Gemfile
@@ -189,6 +190,8 @@ files:
 - app/components/mods_display/list_field_component.rb
 - app/components/mods_display/record_component.html.erb
 - app/components/mods_display/record_component.rb
+- app/components/mods_display/row_field_component.html.erb
+- app/components/mods_display/row_field_component.rb
 - app/helpers/mods_display/record_helper.rb
 - app/models/mods_display/record.rb
 - config.ru
@@ -203,19 +206,31 @@ files:
 - lib/mods_display/fields/collection.rb
 - lib/mods_display/fields/contact.rb
 - lib/mods_display/fields/contents.rb
+- lib/mods_display/fields/copyright_date.rb
+- lib/mods_display/fields/date_captured.rb
+- lib/mods_display/fields/date_created.rb
+- lib/mods_display/fields/date_issued.rb
+- lib/mods_display/fields/date_modified.rb
+- lib/mods_display/fields/date_valid.rb
 - lib/mods_display/fields/description.rb
+- lib/mods_display/fields/edition.rb
 - lib/mods_display/fields/extent.rb
 - lib/mods_display/fields/field.rb
 - lib/mods_display/fields/form.rb
+- lib/mods_display/fields/frequency.rb
 - lib/mods_display/fields/genre.rb
 - lib/mods_display/fields/geo.rb
 - lib/mods_display/fields/identifier.rb
 - lib/mods_display/fields/imprint.rb
+- lib/mods_display/fields/issuance.rb
 - lib/mods_display/fields/language.rb
 - lib/mods_display/fields/location.rb
 - lib/mods_display/fields/name.rb
 - lib/mods_display/fields/nested_related_item.rb
 - lib/mods_display/fields/note.rb
+- lib/mods_display/fields/place.rb
+- lib/mods_display/fields/publisher.rb
+- lib/mods_display/fields/reference_title.rb
 - lib/mods_display/fields/related_item.rb
 - lib/mods_display/fields/resource_type.rb
 - lib/mods_display/fields/sub_title.rb