mods_display 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d059d0bb717d798e323ae91d62ac65420e0b7e34
-  data.tar.gz: bea28312f2984465139f312e585a315ec8de992f
+SHA256:
+  metadata.gz: 3ac207676bdeba25c5fe05931498d9404d37d3417f2eac034f0dba58f4bbabbd
+  data.tar.gz: 8a1de09dadf358278f6268a41a1e858957c45acdf9fdd5acd5c5c825a391c710
 SHA512:
-  metadata.gz: a7f53d54b8fbbd9dee47ccbee7120e63725e63057602da3a3cd50f569fc1d3335ed38a326d0ae072a25457f207d4ccc7722aa79a28dab3f442b2bf78f81ea35a
-  data.tar.gz: 306dee0b66098f941dcfbb8c8f8138b001cf4f34b06b398b73a118c9f785b73c9ebab33f9e7b0233aa7cb6d8122034a0bc77f87ba355d5bc29fa45046ba6dca6
+  metadata.gz: 84317fe034efa431a52105abd35529992a657e331b8f42f4571b8fc0369c82297a87b7dbb6c0156cd16e4708aa3232c133106f66f55563898a300faf6f10e6a2
+  data.tar.gz: 22f10cbd6bca1feb6796a7a3b2be2e7620f6b25ea285395f075446a8571c1b32f53e9c3f58310b8ac48812d4c31eef72344332950b86ece74cc56f86d395577b

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile

@@ -3,5 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in mods_display.gemspec
 gemspec
 
-# Pin to activesupport 4.x for older versions of ruby
-gem 'activesupport', '~> 4.2' if RUBY_VERSION < '2.2.2'

data/lib/mods_display.rb

@@ -49,3 +49,14 @@ require 'i18n/backend/fallbacks'
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 I18n.load_path += Dir["#{File.expand_path('../..', __FILE__)}/config/locales/*.yml"]
 I18n.backend.load_translations
+
+# load Rails/Railtie
+begin
+  require 'rails'
+rescue LoadError
+  #do nothing
+end
+
+if defined? ::Rails::Railtie
+  require 'mods_display/railtie'
+end

data/lib/mods_display/fields/access_condition.rb

@@ -1,5 +1,53 @@
 module ModsDisplay
   class AccessCondition < Field
+    LICENSES = {
+      'cc-none' => { desc: '' },
+      'cc-by' => {
+        link: 'http://creativecommons.org/licenses/by/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution 3.0 Unported License'
+      },
+      'cc-by-sa' => {
+        link: 'http://creativecommons.org/licenses/by-sa/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License'
+      },
+      'cc-by-nd' => {
+        link: 'http://creativecommons.org/licenses/by-nd/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-No Derivative Works 3.0 Unported License'
+      },
+      'cc-by-nc' => {
+        link: 'http://creativecommons.org/licenses/by-nc/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License'
+      },
+      'cc-by-nc-sa' => {
+        link: 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License'
+      },
+      'cc-by-nc-nd' => {
+        link: 'http://creativecommons.org/licenses/by-nc-nd/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 Unported License'
+      },
+      'cc-pdm' => {
+        link: 'http://creativecommons.org/publicdomain/mark/1.0/',
+        desc: 'This work is in the public domain per Creative Commons Public Domain Mark 1.0'
+      },
+      'odc-odc-pddl' => {
+        link: 'http://opendatacommons.org/licenses/pddl/',
+        desc: 'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
+      },
+      'odc-pddl' => {
+        link: 'http://opendatacommons.org/licenses/pddl/',
+        desc: 'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
+      },
+      'odc-odc-by' => {
+        link: 'http://opendatacommons.org/licenses/by/',
+        desc: 'This work is licensed under a Open Data Commons Attribution License'
+      },
+      'odc-odc-odbl' => {
+        link: 'http://opendatacommons.org/licenses/odbl/',
+        desc: 'This work is licensed under a Open Data Commons Open Database License (ODbL)'
+      }
+    }.freeze
+
     def fields
       return_fields = @values.map do |value|
         ModsDisplay::Values.new(
@@ -28,26 +76,32 @@ module ModsDisplay
     end
 
     def license_statement(element)
-      element.text[/^(.*) (.*):(.*)$/]
-      output = "<div class='#{[Regexp.last_match(1), Regexp.last_match(2)].join('-').downcase}'>"
-      if license_link(Regexp.last_match(1), Regexp.last_match(2))
-        link = "<a href='#{license_link(Regexp.last_match(1), Regexp.last_match(2))}'>#{Regexp.last_match(3).strip}</a>"
-        output << link
-      else
-        output << Regexp.last_match(3).strip
-      end
+      matches = element.text.match(/^(?<code>.*) (?<type>.*):(?<description>.*)$/)
+      code = matches[:code].downcase
+      type = matches[:type].downcase
+      description = license_description(code, type) || matches[:description]
+      url = license_url(code, type)
+      output = "<div class='#{code}-#{type}'>"
+      output << if url
+                  "<a href='#{url}'>#{description}</a>"
+                else
+                  description
+                end
       output << '</div>'
     end
 
-    def license_code_urls
-      { 'cc'  => 'http://creativecommons.org/licenses/',
-        'odc' => 'http://opendatacommons.org/licenses/' }
+    def license_url(code, type)
+      key = "#{code}-#{type}"
+      return unless LICENSES.key?(key)
+
+      LICENSES[key][:link]
     end
 
-    def license_link(code, type)
-      code = code.downcase
-      return unless license_code_urls.key?(code)
-      "#{license_code_urls[code]}#{type.downcase}#{"/#{@config.cc_license_version}/" if code == 'cc'}"
+    def license_description(code, type)
+      key = "#{code}-#{type}"
+      return unless LICENSES.key?(key) && LICENSES[key][:desc]
+
+      LICENSES[key][:desc]
     end
 
     def access_label(element)

data/lib/mods_display/fields/extent.rb

@@ -13,7 +13,7 @@ module ModsDisplay
     private
 
     def extent_fields
-      @values.map(&:extent)
+      @values.map(&:extent).flatten
     end
   end
 end

data/lib/mods_display/fields/form.rb

@@ -5,7 +5,7 @@ module ModsDisplay
       [
         ModsDisplay::Values.new(
           label: I18n.t('mods_display.form'),
-          values: form_fields.map(&:text)
+          values: form_fields.map(&:text).uniq { |x| x.downcase.gsub(/\s/, '').gsub(/[[:punct:]]/, '') }
         )
       ]
     end
@@ -13,7 +13,7 @@ module ModsDisplay
     private
 
     def form_fields
-      @values.map(&:form)
+      @values.map(&:form).flatten
     end
   end
 end

data/lib/mods_display/fields/imprint.rb

@@ -68,6 +68,8 @@ module ModsDisplay
       date_fields.map do |date_field|
         if date_is_w3cdtf?(date_field)
           process_w3cdtf_date(date_field)
+        elsif date_is_iso8601?(date_field)
+          process_iso8601_date(date_field)
         else
           date_field
         end
@@ -158,6 +160,10 @@ module ModsDisplay
       field_is_encoded?(date_field, 'w3cdtf')
     end
 
+    def date_is_iso8601?(date_field)
+      field_is_encoded?(date_field, 'iso8601')
+    end
+
     def process_w3cdtf_date(date_field)
       date_field = date_field.clone
       date_field.content = begin
@@ -174,6 +180,16 @@ module ModsDisplay
       date_field
     end
 
+    def process_iso8601_date(date_field)
+      date_field = date_field.clone
+      date_field.content = begin
+        Date.iso8601(date_field.text).strftime(@config.full_date_format)
+      rescue
+        date_field.content
+      end
+      date_field
+    end
+
     def dedup_dates(date_fields)
       date_text = date_fields.map { |d| normalize_date(d.text) }
       if date_text != date_text.uniq

data/lib/mods_display/fields/nested_related_item.rb

@@ -7,30 +7,34 @@ module ModsDisplay
     include ModsDisplay::RelatedItemConcerns
 
     def fields
-      return_fields = @values.map do |value|
-        next if related_item_is_a_collection?(value)
-        next unless render_nested_related_item?(value)
+      @fields ||= begin
+        return_fields = @values.map do |value|
+          next if related_item_is_a_collection?(value)
+          next unless render_nested_related_item?(value)
 
-        related_item_mods_object(value)
-      end.compact
-      collapse_fields(return_fields)
+          related_item_mods_object(value)
+        end.compact
+        collapse_fields(return_fields)
+      end
     end
 
     def to_html
-      return nil if fields.empty? || @config.ignore?
-      output = ''
-      fields.each do |field|
-        next unless field.values.any? { |f| f && !f.empty? }
-        output << "<dt#{label_class} #{sanitized_field_title(field.label)}>#{field.label}</dt>"
-        output << "<dd#{value_class}>"
-        output << '<ul class="mods_display_nested_related_items">'
-        output << field.values.map do |val|
-          "<li class='mods_display_nested_related_item open'>#{link_urls_and_email(val.to_s)}</li>"
-        end.join
-        output << '</ul>'
-        output << '</dd>'
+      return if fields.empty? || @config.ignore?
+      @to_html ||= begin
+        output = ''
+        fields.each do |field|
+          next unless field.values.any? { |f| f && !f.empty? }
+          output << "<dt#{label_class} #{sanitized_field_title(field.label)}>#{field.label}</dt>"
+          output << "<dd#{value_class}>"
+          output << '<ul class="mods_display_nested_related_items">'
+          output << field.values.map do |val|
+            "<li class='mods_display_nested_related_item open'>#{link_urls_and_email(val.to_s)}</li>"
+          end.join
+          output << '</ul>'
+          output << '</dd>'
+        end
+        output
       end
-      output
     end
 
     private

data/lib/mods_display/helpers/record_helper.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  module Helpers
+    module RecordHelper
+      def display_content_field(field)
+        return unless field.respond_to?(:label, :values) && field.values.any?(&:present?)
+
+        display_content_label(field.label) + display_content_values(field.values)
+      end
+
+      def display_content_label(label)
+        content_tag :dt, label
+      end
+
+      def display_content_values(values)
+        values.map do |value|
+          content_tag :dd, value
+        end.join('').html_safe
+      end
+
+      def mods_display_label(label)
+        content_tag(:dt, label.delete(':')) + "\n".html_safe
+      end
+
+      def mods_display_content(values, delimiter = nil)
+        if delimiter
+          content_tag(:dd, values.map do |value|
+            link_urls_and_email(value) if value.present?
+          end.compact.join(delimiter).html_safe)
+        else
+          Array[values].flatten.map do |value|
+            content_tag(:dd, link_urls_and_email(value.to_s).html_safe) if value.present?
+          end.join.html_safe
+        end
+      end
+
+      def mods_record_field(field, delimiter = nil)
+        return unless field.respond_to?(:label, :values) && field.values.any?(&:present?)
+
+        mods_display_label(field.label) + mods_display_content(field.values, delimiter)
+      end
+
+      def mods_name_field(field, &block)
+        return unless field.respond_to?(:label, :values) && field.values.any?(&:present?)
+
+        mods_display_label(field.label) + mods_display_name(field.values, &block)
+      end
+
+      def mods_display_name(names, &block)
+        names.map do |name|
+          content_tag(:dd) do
+            block_given? ? yield(name.name) : name.name
+          end
+        end.join.html_safe
+      end
+
+      # We need this to remove the ending ":" from the role labels only in data from
+      # mods_display
+      def sanitize_mods_name_label(label)
+        label.sub(/:$/, '')
+      end
+
+      def mods_subject_field(subject, &block)
+        return unless subject.values.any?(&:present?)
+
+        fields = subject.values.map do |subject_line|
+          content_tag :dd, safe_join(link_mods_subjects(subject_line, &block), ' > ')
+        end
+
+        (mods_display_label(subject.label) + safe_join(fields))
+      end
+
+      def mods_genre_field(genre, &block)
+        return unless genre.values.any?(&:present?)
+
+        fields = genre.values.map do |genre_line|
+          content_tag :dd, link_mods_genres(genre_line, &block)
+        end
+
+        mods_display_label(genre.label) + safe_join(fields)
+      end
+
+      def link_mods_genres(genre, &block)
+        link_buffer = []
+        link_to_mods_subject(genre, link_buffer, &block)
+      end
+
+      def link_mods_subjects(subjects, &block)
+        link_buffer = []
+        linked_subjects = []
+        subjects.each do |subject|
+          if subject.present?
+            linked_subjects << link_to_mods_subject(subject, link_buffer, &block)
+          end
+        end
+        linked_subjects
+      end
+
+      def link_to_mods_subject(subject, buffer, &block)
+        subject_text = subject.respond_to?(:name) ? subject.name : subject
+        link = block_given? ? yield(subject_text, buffer) : subject_text
+        buffer << subject_text.strip
+        link << " (#{subject.roles.join(', ')})" if subject.respond_to?(:roles) && subject.roles.present?
+        link
+      end
+
+      # rubocop:disable Layout/LineLength
+      def link_urls_and_email(val)
+        val = val.dup
+        # 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
+              val.gsub!(match, "<a href='#{match}'>#{match}</a>")
+            end
+          end
+        end
+        val
+      end
+      # rubocop:enable Layout/LineLength
+
+    end
+  end
+end

data/lib/mods_display/html.rb

@@ -1,6 +1,5 @@
 module ModsDisplay
   class HTML
-    attr_reader :title, :body
     def initialize(config, xml, klass)
       @config = config
       @stanford_mods = xml
@@ -24,9 +23,7 @@ module ModsDisplay
       body_fields[0] = :subTitle
       body_fields.each do |field_key|
         field = mods_field(@xml, field_key)
-        unless field.nil? || field.to_html.nil?
-          output << mods_field(@xml, field_key).to_html
-        end
+        output << field.to_html unless field.nil? || field.to_html.nil?
       end
       output << '</dl>'
     end
@@ -43,7 +40,7 @@ module ModsDisplay
     def method_missing(method_name, *args, &block)
       if to_s.respond_to?(method_name)
         to_html.send(method_name, *args, &block)
-      elsif mods_display_fields.include?(method_name)
+      elsif method_name == :subTitle || mods_display_fields.include?(method_name)
         mods_field(@xml, method_name).fields
       else
         super

data/lib/mods_display/railtie.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class Railtie < ::Rails::Railtie
+    ActiveSupport.on_load :action_view do
+      require 'mods_display/helpers/record_helper'
+      ::ActionView::Base.send :include, ModsDisplay::Helpers::RecordHelper
+    end
+  end
+end

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = '0.5.0'
+  VERSION = '0.8.0'
 end

data/mods_display.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'byebug'
+  gem.add_development_dependency 'rails', '~> 6.0'
 end

data/spec/fake_app.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+class ModsDisplayTestApp < Rails::Application
+end
+
+Rails.application.routes.draw do
+  resources 'searches', only: :index
+end
+
+class ApplicationController < ActionController::Base; end
+class SearchesController < ApplicationController
+  def index; end
+end
+
+Object.const_set(:ApplicationHelper, Module.new)

data/spec/fields/access_condition_spec.rb

@@ -8,14 +8,6 @@ def mods_display_access_condition(mods_record)
   )
 end
 
-def mods_display_versioned_access_condition(mods_record, version)
-  ModsDisplay::AccessCondition.new(
-    mods_record,
-    ModsDisplay::Configuration::AccessCondition.new { cc_license_version version },
-    double('controller')
-  )
-end
-
 def mods_display_non_ignore_access_condition(mods_record)
   ModsDisplay::AccessCondition.new(
     mods_record,
@@ -68,31 +60,19 @@ describe ModsDisplay::AccessCondition do
         expect(fields.first.values.length).to eq(1)
         expect(fields.first.values.first).to include("<a href='http://creativecommons.org/licenses/by-sa/3.0/'>")
         expect(fields.first.values.first).to include(
-          'This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License'
+          'This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License'
         )
       end
       it 'should itentify and link OpenDataCommons licenses properly' do
         fields = mods_display_access_condition(@odc_license_note).fields
         expect(fields.length).to eq(1)
         expect(fields.first.values.length).to eq(1)
-        expect(fields.first.values.first).to include("<a href='http://opendatacommons.org/licenses/pddl'>")
+        expect(fields.first.values.first).to include("<a href='http://opendatacommons.org/licenses/pddl/'>")
         expect(fields.first.values.first).to include(
           'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
         )
       end
-      it 'should have a configurable version for CC licenses' do
-        fields = mods_display_versioned_access_condition(@cc_license_note, '4.0').fields
-        expect(fields.length).to eq(1)
-        expect(fields.first.values.length).to eq(1)
-        expect(fields.first.values.first).to include('http://creativecommons.org/licenses/by-sa/4.0/')
-        expect(fields.first.values.first).not_to include('http://creativecommons.org/licenses/by-sa/3.0/')
-      end
-      it 'should not apply configured version to NON-CC licenses' do
-        fields = mods_display_versioned_access_condition(@odc_license_note, '4.0').fields
-        expect(fields.length).to eq(1)
-        expect(fields.first.values.length).to eq(1)
-        expect(fields.first.values.first).not_to include('/4.0/')
-      end
+
       it 'should not attempt unknown license types' do
         fields = mods_display_access_condition(@no_link_license_note).fields
         expect(fields.length).to eq(1)

data/spec/fields/extent_spec.rb

@@ -6,6 +6,7 @@ describe ModsDisplay::Extent do
       <mods>
         <physicalDescription>
           <extent>Extent Value</extent>
+          <extent>Extent Value 2</extent>
         </physicalDescription>
       </mods>
     XML
@@ -24,7 +25,7 @@ describe ModsDisplay::Extent do
 
   describe 'values' do
     it 'returns the text of the extent element' do
-      expect(subject.first.values).to eq ['Extent Value']
+      expect(subject.first.values).to eq ['Extent Value', 'Extent Value 2']
     end
   end
 end

data/spec/fields/form_spec.rb

@@ -6,6 +6,7 @@ describe ModsDisplay::Form do
       <mods>
         <physicalDescription>
           <form>Form Value</form>
+          <form>Form Value 2</form>
         </physicalDescription>
       </mods>
     XML
@@ -24,7 +25,25 @@ describe ModsDisplay::Form do
 
   describe 'values' do
     it 'returns the text of the form element' do
-      expect(subject.first.values).to eq ['Form Value']
+      expect(subject.first.values).to eq ['Form Value', 'Form Value 2']
+    end
+
+    context 'duplicated data' do
+      let(:mods) do
+        <<-XML
+          <mods>
+            <physicalDescription>
+              <form authority="gmd">electronic resource.</form>
+              <form authority="zxy">electronicresource!</form>
+              <form authority="marccategory">electronic Resource</form>
+            </physicalDescription>
+          </mods>
+        XML
+      end
+
+      it 'uses only unique form values, ignore differences in case, punctuation or whitespace' do
+        expect(subject.first.values).to match_array ['electronic resource.']
+      end
     end
   end
 end

data/spec/fields/imprint_spec.rb

@@ -43,6 +43,7 @@ describe ModsDisplay::Imprint do
     @imprint_date_range = Stanford::Mods::Record.new.from_str(imprint_date_range, false).origin_info
     @encoded_place = Stanford::Mods::Record.new.from_str(encoded_place, false).origin_info
     @encoded_dates = Stanford::Mods::Record.new.from_str(encoded_dates, false).origin_info
+    @iso8601_encoded_dates = Stanford::Mods::Record.new.from_str(iso8601_encoded_dates, false).origin_info
     @bad_dates = Stanford::Mods::Record.new.from_str(bad_dates, false).origin_info
     @invalid_dates = Stanford::Mods::Record.new.from_str(invalid_dates, false).origin_info
     @punctuation_imprint = Stanford::Mods::Record.new.from_str(punctuation_imprint_fixture, false).origin_info
@@ -209,6 +210,23 @@ describe ModsDisplay::Imprint do
           end.values).to eq(['July (2013)'])
         end
       end
+
+      describe 'iso8601' do
+        it 'handles full dates properly' do
+          fields = mods_display_imprint(@iso8601_encoded_dates).fields
+          expect(fields.length).to eq(2)
+          expect(fields.find do |field|
+            field.label == 'Date created:'
+          end.values).to eq(['November 14, 2013'])
+        end
+        it "should not try to handle dates we can't parse" do
+          fields = mods_display_imprint(@iso8601_encoded_dates).fields
+          expect(fields.length).to eq(2)
+          expect(fields.find do |field|
+            field.label == 'Date modified:'
+          end.values).to eq(['Jul. 22, 2013'])
+        end
+      end
     end
     describe 'bad dates' do
       it 'should ignore date values' do

data/spec/fields/nested_related_item_spec.rb

@@ -29,11 +29,18 @@ describe ModsDisplay::NestedRelatedItem do
   end
 
   describe '#fields' do
+    let(:mods) { multi_constituent_fixture }
     subject(:fields) { nested_related_item.fields }
 
-    context 'when an element that should be nested' do
-      let(:mods) { multi_constituent_fixture }
+    describe 'memoization' do
+      it 'only calls related_item_mods_object once per item regardless of how many times the method is called' do
+        expect(nested_related_item).to receive(:related_item_mods_object).exactly(2).times
+
+        5.times { nested_related_item.fields }
+      end
+    end
 
+    context 'when an element that should be nested' do
       it 'has a field for each related item' do
         expect(fields.length).to eq 1
       end
@@ -59,6 +66,16 @@ describe ModsDisplay::NestedRelatedItem do
     subject(:html) { Capybara.string(nested_related_item.to_html) }
     let(:mods) { related_item_host_fixture }
 
+    describe 'memoization' do
+      let(:mods) { multi_constituent_fixture }
+
+      it 'only loops throug hthe fields once regardless of how many times the method is called' do
+        expect(nested_related_item.fields).to receive(:each).exactly(1).times.and_call_original
+
+        5.times { nested_related_item.to_html }
+      end
+    end
+
     it 'renders an unordered list with an embedded dl containing the metadata of the related item' do
       within(html.first('dd')) do |dd|
         expect(dd).to have_css('ul.mods_display_nested_related_items')

data/spec/fixtures/imprint_fixtures.rb

@@ -280,6 +280,17 @@ module ImprintFixtures
     MODS
   end
 
+  def iso8601_encoded_dates
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated encoding="iso8601">20131114161429</dateCreated>
+          <dateModified encoding="iso8601">Jul. 22, 2013</dateModified>
+        </originInfo>
+      </mods>
+    MODS
+  end
+
   def bad_dates
     <<-MODS
       <mods>

data/spec/helpers/record_helper_spec.rb

@@ -0,0 +1,241 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'byebug'
+
+describe ModsDisplay::Helpers::RecordHelper, type: :helper do
+  let(:empty_field) { OpenStruct.new(label: 'test', values: ['']) }
+
+  describe 'display_content_field' do
+    let(:values) { ['guitar (1)', 'solo cowbell, trombone (2)'] }
+    let(:content) { OpenStruct.new(label: 'Instrumentation', values: values) }
+
+    it 'should return dt with label and dd with values' do
+      expect(helper.display_content_field(content)).to have_css('dt', text: 'Instrumentation')
+      expect(helper.display_content_field(content)).to have_css('dd', count: 2)
+    end
+  end
+
+  describe 'display_content_label' do
+    it 'should return correct dt' do
+      expect(helper.display_content_label('test')).to have_css('dt', text: 'test')
+    end
+  end
+
+  describe 'display_content_values' do
+    let(:values) { ['guitar (1)', 'solo cowbell, trombone (2)'] }
+
+    it 'should return dds of values' do
+      expect(helper.display_content_values(values)).to have_css('dd', count: 2)
+      expect(helper.display_content_values(values)).to have_css('dd', text: 'guitar (1)')
+      expect(helper.display_content_values(values)).to have_css('dd', text: 'solo cowbell, trombone (2)')
+    end
+  end
+
+  describe 'mods_display_label' do
+    it 'should return correct label' do
+      expect(helper.mods_display_label('test:')).not_to have_content ':'
+      expect(helper.mods_display_label('test:')).to have_css('dt', text: 'test')
+    end
+  end
+
+  describe 'mods_display_content' do
+    it 'should return correct content' do
+      expect(helper.mods_display_content('hello, there')).to have_css('dd', text: 'hello, there')
+    end
+    it 'should return multiple dd elements when a multi-element array is passed' do
+      expect(helper.mods_display_content(%w(hello there))).to have_css('dd', count: 2)
+    end
+    it 'should handle nil values correctly' do
+      expect(helper.mods_display_content(['something', nil])).to have_css('dd', count: 1)
+    end
+  end
+
+  describe 'mods_record_field' do
+    let(:mods_field) { OpenStruct.new(label: 'test', values: ['hello, there']) }
+    let(:url_field) { OpenStruct.new(label: 'test', values: ['https://library.stanford.edu']) }
+    let(:multi_values) { double(label: 'test', values: %w(123 321)) }
+
+    it 'should return correct content' do
+      expect(helper.mods_record_field(mods_field)).to have_css('dt', text: 'test')
+      expect(helper.mods_record_field(mods_field)).to have_css('dd', text: 'hello, there')
+    end
+    it 'should link fields with URLs' do
+      expect(mods_record_field(url_field)).to have_css("a[href='https://library.stanford.edu']", text: 'https://library.stanford.edu')
+    end
+    it 'should not print empty labels' do
+      expect(helper.mods_record_field(empty_field)).not_to be_present
+    end
+    it 'should join values with a <dd> by default' do
+      expect(helper.mods_record_field(multi_values)).to have_css('dd', count: 2)
+    end
+    it 'should join values with a supplied delimiter' do
+      expect(helper.mods_record_field(multi_values, 'DELIM')).to have_css('dd', count: 1)
+      expect(helper.mods_record_field(multi_values, 'DELIM')).to have_css('dd', text: '123DELIM321')
+    end
+  end
+
+  describe 'names' do
+    let(:name_field) do
+      OpenStruct.new(
+        label: 'Contributor',
+        values: [
+          OpenStruct.new(name: 'Winefrey, Oprah', roles: %w(Host Producer)),
+          OpenStruct.new(name: 'Kittenz, Emergency')
+        ]
+      )
+    end
+
+    describe '#mods_name_field' do
+      it 'should join the label and values' do
+        name = mods_name_field(name_field) do |name|
+          link_to(name, searches_path(q: "\"#{name}\"", search_field: 'search_author'))
+        end
+        expect(name).to match /<dt>Contributor<\/dt>/
+        expect(name).to match /<dd><a href.*<\/dd>/
+      end
+      it 'should not print empty labels' do
+        expect(mods_name_field(empty_field)).not_to be_present
+      end
+    end
+
+    describe '#mods_display_name' do
+      let(:name) do
+        mods_display_name(name_field.values) do |name|
+          link_to(name, searches_path(q: "\"#{name}\"", search_field: 'search_author'))
+        end
+      end
+
+      it 'should link to the name' do
+        expect(name).to match /<a href=.*%22Winefrey%2C\+Oprah%22.*>Winefrey, Oprah<\/a>/
+        expect(name).to match /<a href=.*%22Kittenz%2C\+Emergency%22.*>Kittenz, Emergency<\/a>/
+      end
+      it 'should link to an author search' do
+        expect(name).to match /<a href.*search_field=search_author.*>/
+      end
+    end
+
+    describe '#sanitize_mods_name_label' do
+      it 'removes a ":" at the end of label if present' do
+        expect(sanitize_mods_name_label('Test String:')).to eq 'Test String'
+        expect(sanitize_mods_name_label('Test String')).to eq 'Test String'
+      end
+    end
+  end
+
+  describe 'subjects' do
+    let(:subjects) { [OpenStruct.new(label: 'Subjects', values: [%w(Subject1a Subject1b), %w(Subject2a Subject2b Subject2c)])] }
+    let(:name_subjects) { [OpenStruct.new(label: 'Subjects', values: [OpenStruct.new(name: 'Person Name', roles: %w(Role1 Role2))])] }
+    let(:genres) { [OpenStruct.new(label: 'Genres', values: %w(Genre1 Genre2 Genre3))] }
+
+    describe '#mods_subject_field' do
+      let(:subject) do
+        mods_subject_field(subjects.first) do |subject_text|
+          link_to(
+            subject_text,
+            searches_path(
+              q: "\"#{[[], subject_text.strip].flatten.join(' ')}\"",
+              search_field: 'subject_terms'
+            )
+          )
+        end
+      end
+      it 'should join the subject fields in a dd' do
+        expect(subject).to match /<dd><a href=*.*\">Subject1a*.*Subject1b<\/a><\/dd><dd><a/
+      end
+      it "should join the individual subjects with a '>'" do
+        expect(subject).to match /Subject2b<\/a> &gt; <a href/
+      end
+      it 'should not print empty labels' do
+        expect(mods_subject_field(empty_field)).not_to be_present
+      end
+    end
+
+    describe '#mods_genre_field' do
+      it 'should join the genre fields with a dd' do
+        expect(mods_genre_field(genres.first) do |text|
+          link_to(text, searches_path(q: text))
+        end).to match /<dd><a href=*.*>Genre1*.*<\/a><\/dd><dd><a*.*Genre2<\/a><\/dd>/
+      end
+      it 'should not print empty labels' do
+        expect(mods_genre_field(empty_field)).not_to be_present
+      end
+    end
+
+    describe '#link_mods_subjects' do
+      let(:linked_subjects) do
+        link_mods_subjects(subjects.first.values.last) do |subject_text, buffer|
+          link_to(
+            subject_text,
+            searches_path(
+              q: "\"#{[buffer, subject_text.strip].flatten.join(' ')}\"",
+              search_field: 'subject_terms'
+            )
+          )
+        end
+      end
+
+      it 'should return all subjects' do
+        expect(linked_subjects.length).to eq 3
+      end
+      it 'should link to the subject hierarchically' do
+        expect(linked_subjects[0]).to match /^<a href=.*q=%22Subject2a%22.*>Subject2a<\/a>$/
+        expect(linked_subjects[1]).to match /^<a href=.*q=%22Subject2a\+Subject2b%22.*>Subject2b<\/a>$/
+        expect(linked_subjects[2]).to match /^<a href=.*q=%22Subject2a\+Subject2b\+Subject2c%22.*>Subject2c<\/a>$/
+      end
+      it 'should link to subject terms search field' do
+        linked_subjects.each do |subject|
+          expect(subject).to match /search_field=subject_terms/
+        end
+      end
+    end
+
+    describe '#link_mods_genres' do
+      let(:linked_genres) do
+        link_mods_genres(genres.first.values.last) do |text|
+          link_to(
+            text,
+            searches_path(
+              q: "\"#{[[], text.strip].flatten.join(' ')}\"",
+              search_field: 'subject_terms'
+            )
+          )
+        end
+      end
+
+      it 'should return correct link' do
+        expect(linked_genres).to match /<a href=*.*Genre3*.*<\/a>/
+      end
+      it 'should link to subject terms search field' do
+        expect(linked_genres).to match /search_field=subject_terms/
+      end
+    end
+
+    describe '#link_to_mods_subject' do
+      it 'should handle subjects that behave like names' do
+        name_subject = link_to_mods_subject(name_subjects.first.values.first, []) do |subject_text|
+          link_to(
+            subject_text,
+            searches_path(
+              q: "\"#{[[], subject_text.strip].flatten.join(' ')}\"",
+              search_field: 'subject_terms'
+            )
+          )
+        end
+        expect(name_subject).to match /<a href=.*%22Person\+Name%22.*>Person Name<\/a> \(Role1, Role2\)/
+      end
+    end
+  end
+
+  describe '#link_urls_and_email' do
+    let(:url) { 'This is a field that contains an https://library.stanford.edu URL' }
+    let(:email) { 'This is a field that contains an email@email.com address' }
+
+    it 'should link URLs' do
+      expect(link_urls_and_email(url)).to eq "This is a field that contains an <a href='https://library.stanford.edu'>https://library.stanford.edu</a> URL"
+    end
+    it 'should link email addresses' do
+      expect(link_urls_and_email(email)).to eq "This is a field that contains an <a href='mailto:email@email.com'>email@email.com</a> address"
+    end
+  end
+end

data/spec/integration/html_spec.rb

@@ -5,6 +5,7 @@ def html_from_mods(xml, locale = nil)
   model = TestModel.new
   model.modsxml = xml
   I18n.locale = locale if locale
+  I18n.fallbacks[:fr] = [:fr, :en]
   TestController.new.render_mods_display(model)
 end
 
@@ -53,6 +54,14 @@ describe 'HTML Output' do
       expect(@multiple_titles.body).not_to include('<dd>Main Title</dd>')
       expect(@multiple_titles.body).to include('<dd>Alternate Title</dd>')
     end
+
+    it 'should allow access to the subTitle independently from the title (for use with #body or fields)' do
+      sub_title = @multiple_titles.subTitle
+      expect(sub_title.length).to eq 1
+      expect(sub_title.first).to be_a ModsDisplay::Values
+      expect(sub_title.first.label).to match(/^Alternative title/i)
+      expect(sub_title.first.values).to eq(['Alternate Title'])
+    end
   end
   describe 'individual fields' do
     it 'should return ModsDispaly::Values for the specefied field' do

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
+ENV['RAILS_ENV'] ||= 'test'
 require 'mods_display'
 require 'stanford-mods'
 require 'capybara'
+require 'rails'
+require 'fake_app'
+require 'rspec/rails'
+require 'mods_display/helpers/record_helper'
 
 Dir["#{File.expand_path('..', __FILE__)}/fixtures/*.rb"].each { |file| require file }
 # Load i18n test file.
@@ -24,6 +29,7 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+  config.include Rails.application.routes.url_helpers
 end
 class TestModel
   attr_accessor :modsxml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jessie Keck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: MODS Display is a gem to centralize the display logic of MODS medadata.
 email:
 - jessie.keck@gmail.com
@@ -115,10 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -163,14 +191,17 @@ files:
 - lib/mods_display/fields/subject.rb
 - lib/mods_display/fields/title.rb
 - lib/mods_display/fields/values.rb
+- lib/mods_display/helpers/record_helper.rb
 - lib/mods_display/html.rb
 - lib/mods_display/model_extension.rb
+- lib/mods_display/railtie.rb
 - lib/mods_display/related_item_concerns.rb
 - lib/mods_display/relator_codes.rb
 - lib/mods_display/version.rb
 - mods_display.gemspec
 - spec/configuration/access_condition_spec.rb
 - spec/configuration/base_spec.rb
+- spec/fake_app.rb
 - spec/fields/abstract_spec.rb
 - spec/fields/access_condition_spec.rb
 - spec/fields/audience_spec.rb
@@ -203,6 +234,7 @@ files:
 - spec/fixtures/related_item_fixtures.rb
 - spec/fixtures/subjects_fixtures.rb
 - spec/fixtures/title_fixtures.rb
+- spec/helpers/record_helper_spec.rb
 - spec/integration/configuration_spec.rb
 - spec/integration/html_spec.rb
 - spec/integration/installation_spec.rb
@@ -226,8 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display
@@ -236,6 +267,7 @@ summary: The MODS Display gem allows implementers to configure a customized disp
 test_files:
 - spec/configuration/access_condition_spec.rb
 - spec/configuration/base_spec.rb
+- spec/fake_app.rb
 - spec/fields/abstract_spec.rb
 - spec/fields/access_condition_spec.rb
 - spec/fields/audience_spec.rb
@@ -268,6 +300,7 @@ test_files:
 - spec/fixtures/related_item_fixtures.rb
 - spec/fixtures/subjects_fixtures.rb
 - spec/fixtures/title_fixtures.rb
+- spec/helpers/record_helper_spec.rb
 - spec/integration/configuration_spec.rb
 - spec/integration/html_spec.rb
 - spec/integration/installation_spec.rb

data/.travis.yml

@@ -1,6 +0,0 @@
-notifications:
-  email: false
-rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.8