mods_display 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b03e06562734d42e266b7cf94990c8e53255236e9fe2556fef3d765a5c46a6
-  data.tar.gz: 8ee71ec68c1fdc65ff0a696e07437d54813d7066d0775d934bb96a60f13d2a21
+  metadata.gz: bb30184d2c6b81caa114445a1dbb6f06ef18c413c35c2b6737d02cf383c5aa76
+  data.tar.gz: 9c3414483586142a98cd9a350e7a4300959c4cd7c9a2f00e42e43f93362c335a
 SHA512:
-  metadata.gz: 05d001784ff0a12ce43372efcef6ecbb32b29b000f6459cd188b84566a7fa32e1d87d1481ceffaf23705edeb79dce71e7efe41cc9ab825d00b938cd0e4a4c57e
-  data.tar.gz: 33817a156ed6ae43b2fa626f002263ebd0617a270008c3f5459d993b5fb5fe06aba96000305e22008be78c25adce4b72aaee3d832ebee0093845328e71e131c2
+  metadata.gz: c259bff4aae3d28754646b78b24fa2e3a2fd94039fb9184767a9a644fec3e013a6400129263424887e77752244465ee0502f65c7a960e74fb0b4223d0df8d224
+  data.tar.gz: 9661658df503d9dbe555de30a3a72d081add769a0c11ca6e7908ff2df47f30e8911bc8ffeb75abb41a58f7d8f2c3c10ead31b2de7335dd989a453aa1f151c17e

data/.rubocop.yml

@@ -1,16 +1,20 @@
 inherit_from: .rubocop_todo.yml
 
-require: rubocop-rspec
+require:
+  - rubocop-rspec
+  - rubocop-rspec_rails
+  - rubocop-capybara
 
 AllCops:
   Exclude:
-    - '*.gemspec'
-    - 'bin/**/*'
-    - 'db/**/*'
-    - 'spec/fixtures/**/*'
-    - 'vendor/**/*'
+    - "*.gemspec"
+    - "bin/**/*"
+    - "db/**/*"
+    - "spec/fixtures/**/*"
+    - "vendor/**/*"
   TargetRubyVersion: 2.7
   NewCops: enable
+  SuggestExtensions: false
 
 # Use single-quoted strings where possible
 Style/StringLiterals:
@@ -35,4 +39,4 @@ Naming/MethodName:
   Enabled: false
 
 Naming/VariableName:
-  Enabled: false
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,80 +1,59 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-10-25 22:18:52 UTC using RuboCop version 1.57.1.
+# on 2023-12-06 18:14:53 UTC using RuboCop version 1.58.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 2
 Capybara/SpecificMatcher:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
 # Offense count: 2
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
-    - 'lib/mods_display/fields/title.rb'
+    - "lib/mods_display/fields/title.rb"
 
 # Offense count: 1
 Lint/ShadowingOuterLocalVariable:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
-# Offense count: 16
+# Offense count: 15
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 44
+  Max: 42
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 146
+  Max: 132
 
 # Offense count: 1
 # Configuration parameters: LengthThreshold.
 Metrics/CollectionLiteralLength:
   Exclude:
-    - 'lib/mods_display/relator_codes.rb'
+    - "lib/mods_display/relator_codes.rb"
 
-# Offense count: 10
+# Offense count: 9
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 18
+  Max: 12
 
-# Offense count: 16
+# Offense count: 18
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 29
+  Max: 24
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 20
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/mods_display/fields/geo.rb'
+  Max: 13
 
-# Offense count: 7
-# Configuration parameters: EnforcedStyle, AllowedPatterns.
-# SupportedStyles: snake_case, camelCase
-Naming/MethodName:
-  Exclude:
-    - 'lib/mods_display/fields/abstract.rb'
-    - 'lib/mods_display/fields/audience.rb'
-    - 'lib/mods_display/fields/contents.rb'
-    - 'lib/mods_display/fields/field.rb'
-    - 'lib/mods_display/fields/genre.rb'
-    - 'lib/mods_display/fields/resource_type.rb'
-    - 'lib/mods_display/fields/subject.rb'
-
-# Offense count: 18
+# Offense count: 17
 RSpec/BeforeAfterAll:
   Enabled: false
 
@@ -83,34 +62,34 @@ RSpec/BeforeAfterAll:
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
-    - 'spec/fields/contents_spec.rb'
-    - 'spec/fields/form_spec.rb'
+    - "spec/fields/contents_spec.rb"
+    - "spec/fields/form_spec.rb"
 
 # Offense count: 1
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Exclude:
-    - '**/spec/features/**/*'
-    - '**/spec/requests/**/*'
-    - '**/spec/routing/**/*'
-    - '**/spec/system/**/*'
-    - '**/spec/views/**/*'
-    - 'spec/integration/html_spec.rb'
+    - "**/spec/features/**/*"
+    - "**/spec/requests/**/*"
+    - "**/spec/routing/**/*"
+    - "**/spec/system/**/*"
+    - "**/spec/views/**/*"
+    - "spec/integration/html_spec.rb"
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/ExpectActual:
   Exclude:
-    - '**/spec/routing/**/*'
-    - 'spec/fields/name_spec.rb'
+    - "**/spec/routing/**/*"
+    - "spec/fields/name_spec.rb"
 
-# Offense count: 25
+# Offense count: 39
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
+RSpec/SpecFilePathSuffix:
   Enabled: false
 
-# Offense count: 99
+# Offense count: 96
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
@@ -118,10 +97,10 @@ RSpec/InstanceVariable:
 # Offense count: 2
 RSpec/IteratedExpectation:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
-    - 'spec/integration/html_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
+    - "spec/integration/html_spec.rb"
 
-# Offense count: 1
+# Offense count: 4
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -132,7 +111,7 @@ RSpec/MessageSpies:
 RSpec/MultipleMemoizedHelpers:
   Max: 6
 
-# Offense count: 2
+# Offense count: 8
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 4
@@ -140,23 +119,23 @@ RSpec/NestedGroups:
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
-RSpec/Rails/InferredSpecType:
+RSpecRails/InferredSpecType:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
-# Offense count: 25
+# Offense count: 39
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
-# Offense count: 36
+# Offense count: 50
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -164,22 +143,22 @@ Style/Documentation:
 # Offense count: 4
 Style/MixinUsage:
   Exclude:
-    - 'spec/fields/cartographics_spec.rb'
-    - 'spec/fields/imprint_spec.rb'
-    - 'spec/fields/name_spec.rb'
-    - 'spec/fields/subject_spec.rb'
+    - "spec/fields/cartographics_spec.rb"
+    - "spec/fields/imprint_spec.rb"
+    - "spec/fields/name_spec.rb"
+    - "spec/fields/subject_spec.rb"
 
 # Offense count: 1
 Style/MultilineBlockChain:
   Exclude:
-    - 'lib/mods_display/fields/imprint.rb'
+    - "lib/mods_display/fields/imprint.rb"
 
-# Offense count: 10
+# Offense count: 13
 Style/OpenStructUse:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
-# Offense count: 33
+# Offense count: 46
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

data/Gemfile

@@ -3,7 +3,9 @@
 source 'https://rubygems.org'
 
 gem 'debug'
+gem 'rubocop-capybara', require: false
 gem 'rubocop-rspec', require: false
+gem 'rubocop-rspec_rails', require: false
 
 # Specify your gem's dependencies in mods_display.gemspec
 gemspec

data/lib/mods_display/fields/abstract.rb

@@ -5,7 +5,7 @@ module ModsDisplay
     private
 
     def displayLabel(element)
-      super(element) || I18n.t('mods_display.abstract')
+      super || I18n.t('mods_display.abstract')
     end
   end
 end

data/lib/mods_display/fields/audience.rb

@@ -5,7 +5,7 @@ module ModsDisplay
     private
 
     def displayLabel(element)
-      super(element) || I18n.t('mods_display.target_audience')
+      super || I18n.t('mods_display.target_audience')
     end
   end
 end

data/lib/mods_display/fields/cartographics.rb

@@ -10,7 +10,7 @@ module ModsDisplay
         next unless subject_element.respond_to?(:cartographics)
 
         subject_element.cartographics.each do |field|
-          scale = field.scale.empty? ? 'Scale not given' : element_text(field.scale)
+          scale = field.scale.empty? ? nil : element_text(field.scale)
           projection = field.projection.empty? ? nil : element_text(field.projection)
           coordinates = field.coordinates.empty? ? nil : element_text(field.coordinates)
           post_scale = [projection, coordinates].compact.join(' ') if [projection, coordinates].compact.length.positive?

data/lib/mods_display/fields/contents.rb

@@ -26,7 +26,7 @@ module ModsDisplay
     private
 
     def displayLabel(element)
-      super(element) || I18n.t('mods_display.table_of_contents')
+      super || I18n.t('mods_display.table_of_contents')
     end
   end
 end

data/lib/mods_display/fields/date_other.rb

@@ -17,7 +17,8 @@ module ModsDisplay
 
     def type_attribute_value(date)
       if date.is_a?(Stanford::Mods::Imprint::DateRange)
-        date.start.value.type || date.stop.value.type
+        # Note that a range can be only single ended.
+        date.start&.value&.type || date.stop&.value&.type
       else
         date.value.type
       end

data/lib/mods_display/fields/genre.rb

@@ -19,7 +19,7 @@ module ModsDisplay
     end
 
     def displayLabel(element)
-      super(element) || I18n.t('mods_display.genre')
+      super || I18n.t('mods_display.genre')
     end
   end
 end

data/lib/mods_display/fields/geo.rb

@@ -25,7 +25,7 @@ module ModsDisplay
     end
 
     def geo_extensions
-      @geo_values ||= @stanford_mods_elements.select do |extension_element|
+      @geo_extensions ||= @stanford_mods_elements.select do |extension_element|
         displayLabel(extension_element) =~ /^geo:?$/
       end
     end

data/lib/mods_display/fields/name.rb

@@ -20,7 +20,7 @@ module ModsDisplay
     end
 
     def to_html(view_context = ApplicationController.renderer)
-      component = ModsDisplay::FieldComponent.with_collection(fields, value_transformer: ->(value) { value.to_s })
+      component = ModsDisplay::FieldComponent.with_collection(fields, value_transformer: lambda(&:to_s))
 
       view_context.render component, layout: false
     end

data/lib/mods_display/fields/nested_related_item.rb

@@ -8,14 +8,14 @@ module ModsDisplay
   class NestedRelatedItem < Field
     include ModsDisplay::RelatedItemConcerns
 
-    def initialize(values, value_renderer: ValueRenderer)
-      super(values)
+    def initialize(related_item_elements, value_renderer: ValueRenderer)
+      super(related_item_elements)
       @value_renderer = value_renderer
     end
 
     def fields
       @fields ||= begin
-        return_fields = RelatedItemValue.for_values(@stanford_mods_elements).map do |related_item_element|
+        return_fields = RelatedItemValue.for_stanford_mods_elements(@stanford_mods_elements).map do |related_item_element|
           next if related_item_element.collection?
           next unless render_nested_related_item?(related_item_element)
 
@@ -30,6 +30,20 @@ module ModsDisplay
       end
     end
 
+    # Used by exhibits
+    def to_html(view_context = ApplicationController.renderer)
+      helpers = view_context.respond_to?(:simple_format) ? view_context : ApplicationController.new.view_context
+
+      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' }
+      )
+
+      view_context.render component, layout: false
+    end
+
     # this class provides html markup and is subclassed in purl application
     class ValueRenderer
       def initialize(related_item_element)

data/lib/mods_display/fields/reference_title.rb

@@ -17,7 +17,7 @@ module ModsDisplay
     end
 
     def displayLabel(element)
-      super(element) || I18n.t('mods_display.title')
+      super || I18n.t('mods_display.title')
     end
 
     def title_value

data/lib/mods_display/fields/related_item.rb

@@ -4,13 +4,13 @@ module ModsDisplay
   class RelatedItem < Field
     include ModsDisplay::RelatedItemConcerns
 
-    def initialize(values, value_renderer: ValueRenderer)
-      super(values)
+    def initialize(related_item_elements, value_renderer: ValueRenderer)
+      super(related_item_elements)
       @value_renderer = value_renderer
     end
 
     def fields
-      return_fields = RelatedItemValue.for_values(@stanford_mods_elements).map do |related_item_element|
+      return_fields = RelatedItemValue.for_stanford_mods_elements(@stanford_mods_elements).map do |related_item_element|
         next if related_item_element.collection?
         next if render_nested_related_item?(related_item_element)
 

data/lib/mods_display/fields/resource_type.rb

@@ -15,7 +15,7 @@ module ModsDisplay
     private
 
     def displayLabel(type_of_resource_element)
-      super(type_of_resource_element) || I18n.t('mods_display.type_of_resource')
+      super || I18n.t('mods_display.type_of_resource')
     end
   end
 end

data/lib/mods_display/fields/subject.rb

@@ -52,15 +52,13 @@ module ModsDisplay
     end
 
     def values_from_subjects(element)
-      return_values = []
-      selected_subjects(element).each do |child|
-        return_values << if element_text(child).include?('--')
-                           element_text(child).split('--').map(&:strip)
-                         else
-                           element_text(child)
-                         end
+      selected_subjects(element).map do |child|
+        if element_text(child).include?('--')
+          element_text(child).split('--').map(&:strip)
+        else
+          element_text(child)
+        end
       end
-      return_values
     end
 
     def selected_subjects(element = @value)

data/lib/mods_display/related_item_concerns.rb

@@ -56,8 +56,8 @@ module ModsDisplay
         @type_attribute ||= get_attribute('type')
       end
 
-      def self.for_values(values)
-        values.map { |value| new(value) }
+      def self.for_stanford_mods_elements(stanford_mods_elements)
+        stanford_mods_elements.map { |element| new(element) }
       end
     end
   end

data/lib/mods_display/version.rb

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

data/mods_display.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '~> 6.0'
+  gem.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '~> 7.0'
   gem.add_development_dependency 'combustion', '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -262,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.5.15
 signing_key:
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display