mods_display 1.4.0 → 1.6.0

data/lib/mods_display/fields/title.rb

@@ -2,11 +2,16 @@
 
 module ModsDisplay
   class Title < Field
+    def initialize(values, link: nil)
+      @link = link
+      super(values)
+    end
+
     def fields
-      return_values = sorted_values.map do |value|
+      return_values = sorted_title_info_elements.map do |title_info_element|
         ModsDisplay::Values.new(
-          label: displayLabel(value) || title_label(value),
-          values: [assemble_title(value)]
+          label: displayLabel(title_info_element) || title_label(title_info_element),
+          values: [assemble_title(title_info_element)]
         )
       end
       collapse_fields(return_values)
@@ -15,51 +20,62 @@ module ModsDisplay
     private
 
     # If there is a node with usage="primary", then it should come first.
-    def sorted_values
-      Array(@values).sort_by { |node| node['usage'] == 'primary' ? 0 : 1 }
+    def sorted_title_info_elements
+      Array(@stanford_mods_elements).sort_by { |title_info_element| title_info_element['usage'] == 'primary' ? 0 : 1 }
     end
 
     def delimiter
       '<br />'.html_safe
     end
 
-    def assemble_title(element)
+    def assemble_title(title_info_element)
       title = ''
       previous_element = nil
 
-      element.children.select { |value| title_parts.include? value.name }.each do |value|
-        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
+      title_info_element.children.select { |child| title_parts.include? child.name }.each do |child|
+        text = child.text.strip
+        next if text.empty?
+
+        delimiter = title_delimiter(title, previous_element, child)
 
         title += delimiter if delimiter
-        title += str
+        title += text
 
-        previous_element = value
+        previous_element = child
       end
 
-      if element['type'] == 'uniform' && element['nameTitleGroup'].present?
-        [uniform_title_name_part(element), title].compact.join('. ')
+      full_title = if title_info_element['type'] == 'uniform' && title_info_element['nameTitleGroup'].present?
+                     [uniform_title_name_part(title_info_element), title].compact.join('. ')
+                   else
+                     title
+                   end
+      linked_title(full_title)
+    end
+
+    def title_delimiter(title, previous_element, child)
+      if title.empty? || title.end_with?(' ')
+        nil
+      elsif previous_element&.name == 'nonSort' && title.end_with?('-', '\'')
+        nil
+      elsif title.end_with?('.', ',', ':', ';')
+        ' '
+      elsif child.name == 'subTitle'
+        ' : '
+      elsif child.name == 'partName' && previous_element.name == 'partNumber'
+        ', '
+      elsif child.name == 'partNumber' || child.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/fields/values.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module ModsDisplay
+  # This class has what is needed by view code in downstream applications
   class Values
     attr_accessor :label, :values, :field
 

data/lib/mods_display/html.rb

@@ -5,13 +5,26 @@ 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,
+      dateOther: :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 +42,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 +61,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 +71,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.6.0'
 end

data/lib/mods_display.rb

@@ -13,20 +13,33 @@ 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_other'
+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.6.0
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-12-05 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,32 @@ 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_other.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
@@ -246,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display