mods_display 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2d497d858d90fede285e8d03675de0c39802897a8bd2a029a369e420704fc9
-  data.tar.gz: 89f053e8c0d2e8ad75325fd15319113cbada0c0023079e97f91dcdc65dd3efc8
+  metadata.gz: e868af7e44bc4f527becc8d13606b0ff234bfcccd53b0691894b162b8fcd7f65
+  data.tar.gz: 7e2cebdcc63f8a0acf1a41a8b71a2df62a98fc194c493d82cb939d72818f1353
 SHA512:
-  metadata.gz: 8900b21680099143212fcd369df69e5321a4ae8e85b1de1708408d5a97e4fd469d4cb5ea8489debf0cc516a44baadccdedabeacd6446bc5f6d95164289bb7501
-  data.tar.gz: e5a85a9ead273ff102873f55424e5499138b8260ac1c1d3cd0cb0c3e55cf431ed564be1a686c44ecc37d0a9181903b72f4a080f067df893748f093888e2af83e
+  metadata.gz: a5805de4d23405f4d0b3d128f566580409b295cfe18ca3ef868068266414d18f93c92f89a3d46effc00292ba7903bc12ea32ff1c2ccf2a4f5eb797a0c3d4b29b
+  data.tar.gz: 35c6e5b038d55932a99a800f34a69089a2937e575a6dcd375629c98fea3ecd7475f232436d27a35286b21b0eb78b487aa8e294d333e47139d278c5f07ea4d9a3

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

@@ -9,18 +9,18 @@
 # 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: 15
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
@@ -36,7 +36,7 @@ Metrics/ClassLength:
 # Configuration parameters: LengthThreshold.
 Metrics/CollectionLiteralLength:
   Exclude:
-    - 'lib/mods_display/relator_codes.rb'
+    - "lib/mods_display/relator_codes.rb"
 
 # Offense count: 9
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -62,31 +62,31 @@ 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: 39
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
+RSpec/SpecFilePathSuffix:
   Enabled: false
 
 # Offense count: 96
@@ -97,8 +97,8 @@ 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: 4
 # Configuration parameters: .
@@ -119,9 +119,9 @@ 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: 39
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
@@ -133,7 +133,7 @@ RSpec/SpecFilePathFormat:
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
 # Offense count: 50
 # Configuration parameters: AllowedConstants.
@@ -143,20 +143,20 @@ 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: 13
 Style/OpenStructUse:
   Exclude:
-    - 'spec/helpers/record_helper_spec.rb'
+    - "spec/helpers/record_helper_spec.rb"
 
 # Offense count: 46
 # This cop supports safe autocorrection (--autocorrect).

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/app/components/mods_display/field_component.rb

@@ -5,7 +5,7 @@ module ModsDisplay
     with_collection_parameter :field
 
     def initialize(field:, delimiter: nil, label_html_attributes: {}, value_html_attributes: {}, value_transformer: nil)
-      super
+      super()
 
       @field = field
       @delimiter = delimiter

data/app/components/mods_display/record_component.rb

@@ -31,7 +31,7 @@ module ModsDisplay
     with_collection_parameter :record
 
     def initialize(record:, fields: DEFAULT_FIELDS, html_attributes: {})
-      super
+      super()
 
       @record = record
       @fields = fields

data/app/components/mods_display/row_field_component.rb

@@ -5,7 +5,7 @@ module ModsDisplay
     with_collection_parameter :field
 
     def initialize(field:, delimiter: nil, label_html_attributes: {}, value_html_attributes: {}, value_transformer: nil)
-      super
+      super()
 
       @field = field
       @delimiter = delimiter

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/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/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/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/fields/title.rb

@@ -63,7 +63,7 @@ module ModsDisplay
         ' : '
       elsif child.name == 'partName' && previous_element.name == 'partNumber'
         ', '
-      elsif child.name == 'partNumber' || child.name == 'partName'
+      elsif %w[partNumber partName].include?(child.name)
         '. '
       else
         ' '
@@ -80,7 +80,10 @@ module ModsDisplay
       names = element.xpath("//m:name[@nameTitleGroup=\"#{element['nameTitleGroup']}\"]", **Mods::Record::NS_HASH)
       names = element.xpath("//name[@nameTitleGroup=\"#{element['nameTitleGroup']}\"]") if names.empty?
 
-      ModsDisplay::Name.new(names).fields.first&.values&.first&.to_s
+      field = ModsDisplay::Name.new(names).fields.first
+      return unless field
+
+      field.values.first.to_s
     end
 
     def title_parts

data/lib/mods_display/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ModsDisplay
-  VERSION = '1.6.2'
+  VERSION = '1.7.0'
 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,13 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Jessie Keck
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -148,14 +147,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
@@ -247,7 +246,6 @@ files:
 homepage: https://github.com/sul-dlss/mods_display
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display
   of MODS metadata.  This display implements the specifications defined at Stanford