mods_display 1.0.0.alpha4 → 1.0.0.alpha5

data/app/components/mods_display/record_component.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class RecordComponent < ViewComponent::Base
     DEFAULT_FIELDS = [

data/app/helpers/mods_display/record_helper.rb

@@ -15,7 +15,7 @@ module ModsDisplay
       render component.new(field: field, delimiter: delimiter, value_transformer: block)
     end
 
-    def mods_name_field(field, &block)
+    def mods_name_field(field)
       mods_record_field(field) do |name|
         block_given? ? capture { yield(name.name) } : name.name
       end
@@ -55,15 +55,13 @@ module ModsDisplay
       link_buffer = []
       linked_subjects = []
       subjects.each do |subject|
-        if subject.present?
-          linked_subjects << link_to_mods_subject(subject, link_buffer, &block)
-        end
+        linked_subjects << link_to_mods_subject(subject, link_buffer, &block) if subject.present?
       end
       linked_subjects
     end
 
     # @private
-    def link_to_mods_subject(subject, buffer = [], &block)
+    def link_to_mods_subject(subject, buffer = [])
       subject_text = subject.respond_to?(:name) ? subject.name : subject
       link = block_given? ? capture { yield(subject_text, buffer) } : subject_text
       buffer << subject_text.strip
@@ -73,7 +71,7 @@ module ModsDisplay
 
     # 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])
+    def link_urls_and_email(val, tags: %w[a dl dd dt i b em strong br])
       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..]
@@ -101,6 +99,5 @@ module ModsDisplay
       sanitize val, tags: tags, attributes: %w[href]
     end
     # rubocop:enable Layout/LineLength
-
   end
 end

data/app/models/mods_display/record.rb

@@ -14,7 +14,8 @@ module ModsDisplay
 
     def mods_record
       return if xml.nil?
-      @mods_record ||= Stanford::Mods::Record.new.tap { |mods| mods.from_str(xml, false) }
+
+      @mods_record ||= Stanford::Mods::Record.new.tap { |mods| mods.from_str(xml) }
     end
 
     def mods_display_html

data/config.ru

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "rubygems"
-require "bundler"
+require 'rubygems'
+require 'bundler'
 
 Bundler.require :default, :development
 

data/lib/mods_display/country_codes.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module ModsDisplay
   module CountryCodes
     def country_codes

data/lib/mods_display/fields/abstract.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Abstract < Field
     private

data/lib/mods_display/fields/access_condition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class AccessCondition < Field
     LICENSES = {
@@ -111,21 +113,22 @@ module ModsDisplay
     def access_label(element)
       type = normalize_type(element)
       return access_labels[type] if access_labels.key?(type)
+
       I18n.t('mods_display.access_condition')
     end
 
     def normalize_type(element)
       type = element.attributes['type']
       return type.value.strip.gsub(/\s*/, '').downcase if type.respond_to?(:value)
+
       ''
     end
 
     def access_labels
-      { 'useandreproduction'  => I18n.t('mods_display.use_and_reproduction'),
+      { 'useandreproduction' => I18n.t('mods_display.use_and_reproduction'),
         'restrictiononaccess' => I18n.t('mods_display.restriction_on_access'),
-        'copyright'           => I18n.t('mods_display.copyright'),
-        'license'             => I18n.t('mods_display.license')
-       }
+        'copyright' => I18n.t('mods_display.copyright'),
+        'license' => I18n.t('mods_display.license') }
     end
   end
 end

data/lib/mods_display/fields/audience.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Audience < Field
     private

data/lib/mods_display/fields/cartographics.rb

@@ -1,15 +1,22 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Cartographics < Field
     def fields
       return nil if @values.nil?
+
       return_fields = []
       @values.each do |value|
         next unless value.respond_to?(:cartographics)
+
         value.cartographics.each do |field|
           scale = field.scale.empty? ? 'Scale not given' : field.scale.text
           projection = field.projection.empty? ? nil : field.projection.text
           coordinates = field.coordinates.empty? ? nil : field.coordinates.text
-          post_scale = [projection, coordinates].compact.length > 0 ? [projection, coordinates].compact.join(' ') : nil
+          post_scale = if [projection,
+                           coordinates].compact.length.positive?
+                         [projection, coordinates].compact.join(' ')
+                       end
           return_fields << ModsDisplay::Values.new(
             label: (displayLabel(field) || label || I18n.t('mods_display.map_data')),
             values: [[scale, post_scale].compact.join(' ; ')]

data/lib/mods_display/fields/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   ###
   #  Collection class to parse collection data out of Mods relatedItem fields
@@ -11,6 +13,7 @@ module ModsDisplay
       return_fields = []
       @values.each do |value|
         next unless related_item_is_a_collection?(value)
+
         return_fields << ModsDisplay::Values.new(
           label: collection_label(value),
           values: [value.titleInfo.text.strip]
@@ -27,8 +30,9 @@ module ModsDisplay
 
     def resource_type_is_collection?(value)
       return unless value.respond_to?(:typeOfResource)
-      return unless value.typeOfResource.attributes.length > 0
-      value.typeOfResource.attributes.length > 0 &&
+      return unless value.typeOfResource.attributes.length.positive?
+
+      value.typeOfResource.attributes.length.positive? &&
         value.typeOfResource.attributes.first.key?('collection') &&
         value.typeOfResource.attributes.first['collection'].value == 'yes'
     end

data/lib/mods_display/fields/contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Contact < Field
     def fields

data/lib/mods_display/fields/contents.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Contents < Field
     def to_html(view_context = ApplicationController.renderer)

data/lib/mods_display/fields/description.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Description < Field
     def fields
@@ -21,8 +23,7 @@ module ModsDisplay
 
     def labels
       { digitalOrigin: I18n.t('mods_display.digital_origin'),
-        note: I18n.t('mods_display.note')
-       }
+        note: I18n.t('mods_display.note') }
     end
   end
 end

data/lib/mods_display/fields/extent.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Extent < Field
     def fields
       return [] unless extent_fields.present?
+
       [
         ModsDisplay::Values.new(
           label: I18n.t('mods_display.extent'),

data/lib/mods_display/fields/field.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module ModsDisplay
   class Field
     def initialize(values)
@@ -9,7 +10,7 @@ module ModsDisplay
       return_fields = @values.map do |value|
         ModsDisplay::Values.new(
           label: displayLabel(value) || label,
-          values: [displayForm(@values) || value.text].flatten
+          values: [value.text]
         )
       end
       collapse_fields(return_fields)
@@ -17,6 +18,7 @@ module ModsDisplay
 
     def label
       return nil if @values.nil?
+
       displayLabel(@values.first)
     end
 
@@ -34,15 +36,10 @@ module ModsDisplay
       nil
     end
 
-    def displayForm(element)
-      return element unless element # basically return nil
-      display = element.children.find { |c| c.name == 'displayForm' }
-      return display.text if display
-    end
-
     def displayLabel(element)
       return unless element.respond_to?(:attributes) &&
                     element.attributes['displayLabel'].respond_to?(:value)
+
       "#{element.attributes['displayLabel'].value}:"
     end
 
@@ -52,7 +49,7 @@ module ModsDisplay
       display_fields.slice_when { |before, after| before.label != after.label }.map do |group|
         next group.first if group.length == 1
 
-        ModsDisplay::Values.new(label: group.first.label, values: group.map(&:values).flatten)
+        ModsDisplay::Values.new(label: group.first.label, values: group.map(&:values).flatten(1))
       end
     end
   end

data/lib/mods_display/fields/form.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Form < Field
     def fields
       return [] unless form_fields.present?
+
       [
         ModsDisplay::Values.new(
           label: I18n.t('mods_display.form'),

data/lib/mods_display/fields/genre.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Genre < Field
     def fields

data/lib/mods_display/fields/geo.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Geo < Field
     def fields
       return [] unless geo_extensions.present?
+
       extensions = geo_extensions.map(&method(:process_geo_extension))
       [
         ModsDisplay::Values.new(
@@ -16,8 +19,8 @@ module ModsDisplay
     def process_geo_extension(extension)
       rdf = Nokogiri::XML(extension.children.to_s)
       [
-        rdf.xpath('//format').text[/format=(.*)$/, 1],
-        rdf.xpath('//type').text[/#(.*)$/, 1]
+        rdf.xpath('//dc:format', dc: 'http://purl.org/dc/elements/1.1/').text[/format=(.*)$/, 1],
+        rdf.xpath('//dc:type', dc: 'http://purl.org/dc/elements/1.1/').text[/#(.*)$/, 1]
       ].compact.join('; ')
     end
 

data/lib/mods_display/fields/identifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModsDisplay
   class Identifier < Field
     def fields
@@ -13,28 +15,29 @@ module ModsDisplay
       if element.attributes['type'].respond_to?(:value)
         return identifier_labels[element.attributes['type'].value] || "#{element.attributes['type'].value}:"
       end
+
       I18n.t('mods_display.identifier')
     end
 
     def identifier_labels
-      { 'local'                     => I18n.t('mods_display.identifier'),
-        'isbn'                      => I18n.t('mods_display.isbn'),
-        'issn'                      => I18n.t('mods_display.issn'),
-        'issn-l'                    => I18n.t('mods_display.issn'),
-        'doi'                       => I18n.t('mods_display.doi'),
-        'hdl'                       => I18n.t('mods_display.handle'),
-        'isrc'                      => I18n.t('mods_display.isrc'),
-        'ismn'                      => I18n.t('mods_display.ismn'),
-        'issue number'              => I18n.t('mods_display.issue_number'),
-        'lccn'                      => I18n.t('mods_display.lccn'),
-        'oclc'                      => I18n.t('mods_display.oclc'),
-        'matrix number'             => I18n.t('mods_display.matrix_number'),
-        'music publisher'           => I18n.t('mods_display.music_publisher'),
-        'music plate'               => I18n.t('mods_display.music_plate'),
-        'sici'                      => I18n.t('mods_display.sici'),
-        'upc'                       => I18n.t('mods_display.upc'),
+      { 'local' => I18n.t('mods_display.identifier'),
+        'isbn' => I18n.t('mods_display.isbn'),
+        'issn' => I18n.t('mods_display.issn'),
+        'issn-l' => I18n.t('mods_display.issn'),
+        'doi' => I18n.t('mods_display.doi'),
+        'hdl' => I18n.t('mods_display.handle'),
+        'isrc' => I18n.t('mods_display.isrc'),
+        'ismn' => I18n.t('mods_display.ismn'),
+        'issue number' => I18n.t('mods_display.issue_number'),
+        'lccn' => I18n.t('mods_display.lccn'),
+        'oclc' => I18n.t('mods_display.oclc'),
+        'matrix number' => I18n.t('mods_display.matrix_number'),
+        'music publisher' => I18n.t('mods_display.music_publisher'),
+        'music plate' => I18n.t('mods_display.music_plate'),
+        'sici' => I18n.t('mods_display.sici'),
+        'upc' => I18n.t('mods_display.upc'),
         'videorecording identifier' => I18n.t('mods_display.videorecording_identifier'),
-        'stock number'              => I18n.t('mods_display.stock_number') }
+        'stock number' => I18n.t('mods_display.stock_number') }
     end
   end
 end