mods_display 0.9.1 → 1.0.0.alpha2

data/lib/mods_display/fields/nested_related_item.rb

@@ -18,30 +18,19 @@ module ModsDisplay
       end
     end
 
-    def to_html
-      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
+    def to_html(view_context = ApplicationController.renderer)
+      helpers = view_context.respond_to?(:simple_format) ? view_context : ApplicationController.new.view_context
+
+      component = ModsDisplay::FieldComponent.with_collection(fields, value_transformer: ->(value) { helpers.link_urls_and_email(value.to_s) })
+
+      view_context.render component
     end
 
     private
 
     def related_item_mods_object(value)
       mods = ::Stanford::Mods::Record.new.tap { |r| r.from_str("<mods>#{value.children.to_xml}</mods>", false) }
-      related_item = ModsDisplay::HTML.new(@config, mods, @klass)
+      related_item = ModsDisplay::HTML.new(mods)
 
       ModsDisplay::Values.new(
         label: related_item_label(value),

data/lib/mods_display/fields/note.rb

@@ -9,6 +9,10 @@ module ModsDisplay
 
     private
 
+    def delimiter
+      '<br />'
+    end
+
     def note_fields
       @values.select do |value|
         (!value.attributes['type'].respond_to?(:value) ||

data/lib/mods_display/fields/related_item.rb

@@ -20,6 +20,10 @@ module ModsDisplay
 
     private
 
+    def delimiter
+      '<br />'
+    end
+
     def process_location(item)
       ModsDisplay::Values.new(label: related_item_label(item), values: [item.location.text.strip])
     end

data/lib/mods_display/fields/resource_type.rb

@@ -2,7 +2,7 @@ module ModsDisplay
   class ResourceType < Field
     def fields
       return_fields = @values.map do |value|
-        ModsDisplay::Values.new(label: displayLabel(value) || label, values: [value.text.strip.capitalize].flatten)
+        ModsDisplay::Values.new(label: displayLabel(value) || label, values: [value.text.strip])
       end
       collapse_fields(return_fields)
     end

data/lib/mods_display/fields/sub_title.rb

@@ -1,7 +1,7 @@
 module ModsDisplay
-  class SubTitle < Field
-    def fields
-      ModsDisplay::Title.new(@values[1, @values.length], @config, @klass).fields
+  class SubTitle < ModsDisplay::Title
+    def initialize(values)
+      super(values[1..])
     end
   end
 end

data/lib/mods_display/fields/subject.rb

@@ -27,44 +27,14 @@ module ModsDisplay
     end
 
     # Would really like to clean this up, but it works and is tested for now.
-    def to_html
-      return nil if fields.empty? || @config.ignore?
-      output = ''
-      fields.each do |field|
-        output << "<dt#{label_class} #{sanitized_field_title(field.label)}>#{field.label}</dt>"
-        output << "<dd#{value_class}>"
-        subs = []
-        field.values.each do |subjects|
-          buffer = []
-          sub_parts = []
-          subjects.each do |val|
-            if val.is_a?(ModsDisplay::Name::Person)
-              buffer << val.name
-            else
-              buffer << val
-            end
-            if @config.link && @config.hierarchical_link
-              if val.is_a?(ModsDisplay::Name::Person)
-                sub_parts << link_to_value(val.name, buffer.join(' '))
-              else
-                sub_parts << link_to_value(val, buffer.join(' '))
-              end
-            elsif @config.link
-              if val.is_a?(ModsDisplay::Name::Person)
-                sub_parts << link_to_value(val.name)
-              else
-                sub_parts << link_to_value(val.to_s)
-              end
-            else
-              sub_parts << val.to_s
-            end
-          end
-          subs << sub_parts.join(@config.delimiter)
-        end
-        output << subs.join('<br/>')
-        output << '</dd>'
-      end
-      output
+    def to_html(view_context = ApplicationController.renderer)
+      component = ModsDisplay::FieldComponent.with_collection(
+        fields,
+        delimiter: '<br />'.html_safe,
+        value_transformer: ->(value) { value.join(' > ') }
+      )
+
+      view_context.render component
     end
 
     def process_hierarchicalGeographic(element)
@@ -72,13 +42,17 @@ module ModsDisplay
     end
 
     def process_name(element)
-      name = ModsDisplay::Name.new([element], @config, @klass).fields.first
+      name = ModsDisplay::Name.new([element]).fields.first
 
       name.values.first if name
     end
 
     private
 
+    def delimiter
+      ' &gt; '
+    end
+
     def values_from_subjects(element)
       return_values = []
       selected_subjects(element).each do |child|

data/lib/mods_display/fields/title.rb

@@ -4,31 +4,10 @@ module ModsDisplay
       return_values = []
       if @values
         @values.each do |value|
-          if displayForm(value)
-            return_values << ModsDisplay::Values.new(
-              label: displayLabel(value) || title_label(value),
-              values: [displayForm(value)]
-            )
-          else
-            nonSort = nil
-            title = nil
-            subTitle = nil
-            nonSort = value.nonSort.text.strip unless value.nonSort.text.strip.empty?
-            title = value.title.text.strip unless value.title.text.strip.empty?
-            subTitle = value.subTitle.text unless value.subTitle.text.strip.empty?
-            preSubTitle = [nonSort, title].compact.join(' ')
-            preSubTitle = nil if preSubTitle.strip.empty?
-            preParts = compact_and_join_with_delimiter([preSubTitle, subTitle], ' : ')
-            preParts = nil if preParts.strip.empty?
-            parts = value.children.select do |child|
-              %w(partName partNumber).include?(child.name)
-            end.map(&:text).compact.join(parts_delimiter(value))
-            parts = nil if parts.strip.empty?
-            return_values << ModsDisplay::Values.new(
-              label: displayLabel(value) || title_label(value),
-              values: [compact_and_join_with_delimiter([preParts, parts], '. ')]
-            )
-          end
+          return_values << ModsDisplay::Values.new(
+            label: displayLabel(value) || title_label(value),
+            values: [assemble_title(value)]
+          )
         end
       end
       collapse_fields(return_values)
@@ -36,14 +15,46 @@ module ModsDisplay
 
     private
 
-    def parts_delimiter(element)
-      children = element.children.to_a
-      # index will retun nil which is not comparable so we call 100
-      # if the element isn't present (thus meaning it's at the end of the list)
-      if (children.index { |c| c.name == 'partNumber' } || 100) < (children.index { |c| c.name == 'partName' } || 100)
-        return ', '
+    def delimiter
+      '<br />'
+    end
+
+    def assemble_title(element)
+      return displayForm(element) if displayForm(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 = case
+        when title.empty?, title.end_with?(' ')
+          nil
+        when title.end_with?('.', ',', ':', ';')
+          ' '
+        when value.name == 'subTitle'
+          ' : '
+        when value.name == 'partName' && previous_element.name == 'partNumber'
+          ', '
+        when value.name == 'partNumber', value.name == 'partName'
+          '. '
+        else
+          ' '
+        end
+
+        title += delimiter if delimiter
+        title += str
+
+        previous_element = value
       end
-      '. '
+
+      title
+    end
+
+    def title_parts
+      %w[nonSort title subTitle partName partNumber]
     end
 
     def title_label(element)

data/lib/mods_display/fields/values.rb

@@ -1,10 +1,10 @@
 module ModsDisplay
   class Values
     attr_accessor :label, :values
-    def initialize(values)
-      values.each do |key, value|
-        send("#{key}=".to_sym, value) if [:label, :values].include?(key)
-      end
+
+    def initialize(label: nil, values: [])
+      @label = label
+      @values = values
     end
   end
 end

data/lib/mods_display/html.rb

@@ -1,136 +1,85 @@
 module ModsDisplay
   class HTML
-    def initialize(config, xml, klass)
-      @config = config
+    MODS_DISPLAY_FIELD_MAPPING = {
+      title: :title_info,
+      subTitle: :title_info,
+      name: :plain_name,
+      resourceType: :typeOfResource,
+      genre: :genre,
+      form: :physical_description,
+      extent: :physical_description,
+      geo: :extension,
+      imprint: :origin_info,
+      language: :language,
+      description: :physical_description,
+      cartographics: :subject,
+      abstract: :abstract,
+      contents: :tableOfContents,
+      audience: :targetAudience,
+      note: :note,
+      contact: :note,
+      collection: :related_item,
+      nestedRelatedItem: :related_item,
+      relatedItem: :related_item,
+      subject: :subject,
+      identifier: :identifier,
+      location: :location,
+      accessCondition: :accessCondition
+    }.freeze
+
+    def initialize(xml)
       @stanford_mods = xml
       @xml = xml.mods_ng_xml
-      @klass = klass
     end
 
     def title
-      unless mods_field(@xml, :title).fields.empty?
-        return mods_field(@xml, :title).fields.first.values
+      unless mods_field(:title).fields.empty?
+        return mods_field(:title).fields.first.values
       end
       ''
     end
 
+    def render_in(view_context)
+      body(view_context)
+    end
+
     # Need to figure out how to get the 1st title out of the list.
     # Maybe have a separate class that will omit the first tite natively
     # and replace the first key in the the fields list with that.
-    def body
-      output = '<dl>'
-      body_fields = mods_display_fields.dup
-      body_fields[0] = :subTitle
-      body_fields.each do |field_key|
-        field = mods_field(@xml, field_key)
-        output << field.to_html unless field.nil? || field.to_html.nil?
-      end
-      output << '</dl>'
+    def body(view_context = ApplicationController.renderer)
+      view_context.render ModsDisplay::RecordComponent.new(record: self)
     end
 
-    def to_html
-      output = '<dl>'
-      mods_display_fields.each do |field_key|
-        field = mods_field(@xml, field_key)
-        output << field.to_html unless field.nil? || field.to_html.nil?
-      end
-      output << '</dl>'
+    # @deprecated
+    def to_html(view_context = ApplicationController.renderer)
+      fields = [:title] + ModsDisplay::RecordComponent::DEFAULT_FIELDS - [:subTitle]
+      view_context.render ModsDisplay::RecordComponent.new(record: self, fields: fields)
     end
 
-    def method_missing(method_name, *args, &block)
-      if to_s.respond_to?(method_name)
-        to_html.send(method_name, *args, &block)
-      elsif method_name == :subTitle || mods_display_fields.include?(method_name)
-        field = mods_field(@xml, method_name)
-        return field if (args.dig(0, :raw))
-        field.fields
-      else
-        super
-      end
-    end
+    MODS_DISPLAY_FIELD_MAPPING.each do |key, _value|
+      next if key == :title
 
-    private
+      define_method(key) do |raw: false|
+        field = mods_field(key)
+        next field if raw
 
-    def mods_field(xml, field_key)
-      if xml.respond_to?(mods_display_field_mapping[field_key])
-        field = xml.send(mods_display_field_mapping[field_key])
-        ModsDisplay.const_get(
-          "#{field_key.slice(0, 1).upcase}#{field_key.slice(1..-1)}"
-        ).new(field, field_config(field_key), @klass)
-      elsif @stanford_mods.respond_to?(field_key)
-        ModsDisplay.const_get(
-          "#{field_key.slice(0, 1).upcase}#{field_key.slice(1..-1)}"
-        ).new(@stanford_mods, field_config(field_key), @klass)
+        field.fields
       end
     end
 
-    def field_config(field_key)
-      @config.send(field_key_translation[field_key] || field_key)
-    rescue
-      ModsDisplay::Configuration::Base.new
-    end
+    def mods_field(key)
+      raise ArgumentError unless MODS_DISPLAY_FIELD_MAPPING[key] && @xml.respond_to?(MODS_DISPLAY_FIELD_MAPPING[key])
 
-    def mods_display_fields
-      [:title,
-       :name,
-       :language,
-       :imprint,
-       :resourceType,
-       :genre,
-       :form,
-       :extent,
-       :geo,
-       :description,
-       :cartographics,
-       :abstract,
-       :contents,
-       :audience,
-       :note,
-       :contact,
-       :collection,
-       :nestedRelatedItem,
-       :relatedItem,
-       :subject,
-       :identifier,
-       :location,
-       :accessCondition
-      ]
+      field = @xml.public_send(MODS_DISPLAY_FIELD_MAPPING[key])
+      mods_field_class(key).new(field)
     end
 
-    def mods_display_field_mapping
-      { title: :title_info,
-        subTitle: :title_info,
-        name: :plain_name,
-        resourceType: :typeOfResource,
-        genre: :genre,
-        form: :physical_description,
-        extent: :physical_description,
-        geo: :extension,
-        imprint: :origin_info,
-        language: :language,
-        description: :physical_description,
-        cartographics: :subject,
-        abstract: :abstract,
-        contents: :tableOfContents,
-        audience: :targetAudience,
-        note: :note,
-        contact: :note,
-        collection: :related_item,
-        nestedRelatedItem: :related_item,
-        relatedItem: :related_item,
-        subject: :subject,
-        identifier: :identifier,
-        location: :location,
-        accessCondition: :accessCondition }
-    end
+    private
 
-    def field_key_translation
-      { subTitle: :sub_title,
-        resourceType: :resource_type,
-        relatedItem: :related_item,
-        accessCondition: :access_condition,
-        nestedRelatedItem: :nested_related_item
-      }
+    def mods_field_class(key)
+      ModsDisplay.const_get(
+        "#{key.slice(0, 1).upcase}#{key.slice(1..-1)}"
+      )
     end
   end
 end

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = '0.9.1'
+  VERSION = '1.0.0.alpha2'
 end

data/lib/mods_display.rb

@@ -1,20 +1,8 @@
 require 'mods_display/version'
-require 'mods_display/controller_extension'
 require 'mods_display/html'
-require 'mods_display/model_extension'
 require 'mods_display/country_codes'
 require 'mods_display/relator_codes'
 require 'mods_display/related_item_concerns'
-require 'mods_display/configuration'
-require 'mods_display/configuration/base'
-require 'mods_display/configuration/access_condition'
-require 'mods_display/configuration/imprint'
-require 'mods_display/configuration/genre'
-require 'mods_display/configuration/name'
-require 'mods_display/configuration/note'
-require 'mods_display/configuration/related_item'
-require 'mods_display/configuration/subject'
-require 'mods_display/configuration/title'
 require 'mods_display/fields/field'
 require 'mods_display/fields/abstract'
 require 'mods_display/fields/access_condition'
@@ -38,8 +26,8 @@ require 'mods_display/fields/note'
 require 'mods_display/fields/related_item'
 require 'mods_display/fields/resource_type'
 require 'mods_display/fields/subject'
-require 'mods_display/fields/sub_title'
 require 'mods_display/fields/title'
+require 'mods_display/fields/sub_title'
 require 'mods_display/fields/values'
 
 require 'stanford-mods'
@@ -50,13 +38,10 @@ 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
+require 'mods_display/engine' if defined?(Rails)

data/mods_display.gemspec

@@ -1,7 +1,5 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mods_display/version'
+# frozen_string_literal: true
+require_relative "lib/mods_display/version"
 
 Gem::Specification.new do |gem|
   gem.name          = 'mods_display'
@@ -12,13 +10,20 @@ Gem::Specification.new do |gem|
   gem.summary       = 'The MODS Display gem allows implementers to configure a customized display of MODS metadata.  This display implements the specifications defined at Stanford for how to display MODS.'
   gem.homepage      = 'https://github.com/sul-dlss/mods_display'
 
-  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(spec)/})
-  gem.require_paths = ['lib']
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  gem.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  gem.bindir = "exe"
+  gem.executables = gem.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  gem.require_paths = ["lib"]
 
   gem.add_dependency 'stanford-mods', '~> 2.1'
   gem.add_dependency 'i18n'
+  gem.add_dependency 'view_component'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
@@ -26,5 +31,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'byebug'
-  gem.add_development_dependency 'rails', '~> 6.0'
+  gem.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '~> 6.0'
+  gem.add_development_dependency 'combustion', '~> 1.3'
 end