stanford-mods 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d2af555e2d1c5bf5e6bf11b0e41486999b9ccf5131551e1754b58cdcbd35d9
-  data.tar.gz: 88e8d8489fd5b10054511cf9e035ff8fb8082b17c1b19c77383056dd64408f19
+  metadata.gz: 1edb227541109c47923e060caf25a50ffeeaf2d362eb4a9276cc9bc89cfe9f51
+  data.tar.gz: 7b28b171dd95a6a0c8d2206bede0310cd3c6cd04f3a6280c84b27ce7aa8d4566
 SHA512:
-  metadata.gz: 6c634a77d490c3be26ee52467a0143a684d6c419662c80a746fc8fe790df46600065347636938359bfa9ed4c4afea5094c30b817ae9501c48aad928ad22895e8
-  data.tar.gz: 1e208cd646215f96d8a999a4fc8b636f1839433ae71c3b24356b5ba2d84cabe1fc7865bbb7bcbb8565c567e4bc56201c966b0a7813d52d787a8c1bbb1407f331
+  metadata.gz: 124ece600b2e52bfea0dbfd125ecc2f2b6dfaad5774009fd76a21a14e06cff916287497c76929616b45e7bf461b7ba72ee700a49e362d4e22bdfb5f28af54e0b
+  data.tar.gz: 1b8d1a934be80ad1f113e0e82eaa7e3084256dd5ef7cfee0c0d1d74b3d4f9b809592aa1fc34972e003d0ecbca18a411aa6c64edf40e2ae4aaddc091ffc6cbc8e

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 require: rubocop-rspec
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 200
 
 # shut hound up re: quote styles

data/.rubocop_todo.yml

@@ -1,19 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-11-14 11:35:35 -0800 using RuboCop version 0.60.0.
+# on 2020-03-13 16:37:30 -0700 using RuboCop version 0.80.1.
 # 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
-# Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -24,23 +16,11 @@ Layout/AccessModifierIndentation:
 
 # Offense count: 22
 # Cop supports --auto-correct.
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Exclude:
     - 'lib/stanford-mods/searchworks.rb'
     - 'spec/imprint_spec.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
-  Exclude:
-    - 'spec/fixtures/searchworks_imprint_data.rb'
-    - 'spec/fixtures/searchworks_pub_date_data.rb'
-    - 'spec/fixtures/spotlight_pub_date_data.rb'
-
 # Offense count: 12
 # Cop supports --auto-correct.
 Layout/BlockEndNewline:
@@ -71,11 +51,23 @@ Layout/EmptyLineAfterMagicComment:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'lib/stanford-mods/searchworks.rb'
 
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/fixtures/searchworks_imprint_data.rb'
+    - 'spec/fixtures/searchworks_pub_date_data.rb'
+    - 'spec/fixtures/spotlight_pub_date_data.rb'
+
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -120,7 +112,8 @@ Layout/SpaceAfterComma:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
 Layout/SpaceAroundOperators:
   Exclude:
     - 'lib/stanford-mods/searchworks.rb'
@@ -141,9 +134,9 @@ Layout/TrailingWhitespace:
   Exclude:
     - 'spec/searchworks_spec.rb'
 
-# Offense count: 32
+# Offense count: 31
 Metrics/AbcSize:
-  Max: 58
+  Max: 57
 
 # Offense count: 97
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -160,12 +153,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 116
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 199
-
 # Offense count: 31
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
@@ -183,8 +170,8 @@ Naming/FileName:
     - 'lib/stanford-mods.rb'
 
 # Offense count: 24
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'spec/geo_spatial_spec.rb'
@@ -194,7 +181,7 @@ Naming/HeredocDelimiterNaming:
     - 'spec/searchworks_basic_spec.rb'
 
 # Offense count: 3
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
@@ -202,24 +189,24 @@ Naming/MethodName:
     - 'lib/stanford-mods/searchworks.rb'
 
 # Offense count: 2
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/stanford-mods/imprint.rb'
+
+# Offense count: 2
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'
     - 'lib/stanford-mods/origin_info.rb'
 
-# Offense count: 2
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
-  Exclude:
-    - 'lib/stanford-mods/imprint.rb'
-
-# Offense count: 8
+# Offense count: 30
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
@@ -228,12 +215,6 @@ Naming/VariableName:
     - 'lib/stanford-mods/origin_info.rb'
     - 'lib/stanford-mods/searchworks.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/UnneededSort:
-  Exclude:
-    - 'lib/stanford-mods/origin_info.rb'
-
 # Offense count: 3
 RSpec/AnyInstance:
   Exclude:
@@ -252,7 +233,7 @@ RSpec/BeforeAfterAll:
     - 'spec/searchworks_subject_spec.rb'
     - 'spec/searchworks_title_spec.rb'
 
-# Offense count: 134
+# Offense count: 137
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -298,7 +279,7 @@ RSpec/EmptyLineAfterFinalLet:
     - 'spec/physical_location_spec.rb'
     - 'spec/sw_publication_spec.rb'
 
-# Offense count: 133
+# Offense count: 134
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Exclude:
@@ -339,7 +320,7 @@ RSpec/FilePath:
 RSpec/HookArgument:
   EnforcedStyle: each
 
-# Offense count: 931
+# Offense count: 935
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -374,6 +355,7 @@ RSpec/MultipleExpectations:
   Max: 9
 
 # Offense count: 2
+# Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Exclude:
     - 'spec/lib/stanford-mods/coordinate_spec.rb'
@@ -407,8 +389,8 @@ Style/Alias:
 
 # Offense count: 30
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
 # IgnoredMethods: lambda, proc, it
@@ -480,6 +462,13 @@ Style/ExpandPathArguments:
   Exclude:
     - 'stanford-mods.gemspec'
 
+# Offense count: 36
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 # Offense count: 3
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -533,13 +522,14 @@ Style/NumericLiteralPrefix:
   Exclude:
     - 'spec/date_parsing_spec.rb'
 
-# Offense count: 1
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
+    - 'lib/stanford-mods/origin_info.rb'
     - 'lib/stanford-mods/searchworks.rb'
 
 # Offense count: 8
@@ -556,6 +546,26 @@ Style/PreferredHashMethods:
   Exclude:
     - 'lib/stanford-mods/searchworks.rb'
 
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/RedundantCondition:
+  Exclude:
+    - 'lib/stanford-mods/origin_info.rb'
+    - 'lib/stanford-mods/searchworks.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'lib/stanford-mods/date_parsing.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantSort:
+  Exclude:
+    - 'lib/stanford-mods/origin_info.rb'
+
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
@@ -580,6 +590,17 @@ Style/RescueStandardError:
   Exclude:
     - 'lib/stanford-mods/imprint.rb'
 
+# Offense count: 18
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/stanford-mods/date_parsing.rb'
+    - 'lib/stanford-mods/imprint.rb'
+    - 'lib/stanford-mods/searchworks.rb'
+    - 'lib/stanford-mods/searchworks_subjects.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -617,14 +638,15 @@ Style/SymbolProc:
     - 'lib/stanford-mods/searchworks.rb'
     - 'lib/stanford-mods/searchworks_subjects.rb'
 
-# Offense count: 5
+# Offense count: 1
 # Cop supports --auto-correct.
-Style/UnneededCondition:
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArrayLiteral:
   Exclude:
-    - 'lib/stanford-mods/origin_info.rb'
-    - 'lib/stanford-mods/searchworks.rb'
+    - 'spec/date_parsing_spec.rb'
 
-# Offense count: 124
+# Offense count: 125
 # Cop supports --auto-correct.
 # Configuration parameters: MinSize, WordRegex.
 # SupportedStyles: percent, brackets
@@ -634,7 +656,7 @@ Style/WordArray:
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: all_comparison_operators, equality_operators_only
+# SupportedStyles: forbid_for_all_comparison_operators, forbid_for_equality_operators_only, require_for_all_comparison_operators, require_for_equality_operators_only
 Style/YodaCondition:
   Exclude:
     - 'lib/stanford-mods/date_parsing.rb'

data/.travis.yml

@@ -1,12 +1,17 @@
 language: ruby
 script: rake
 rvm:
-  - 2.4.4
-  - 2.3.7
-  # we used to use jruby for merged DOR + MARC records, but no more ...
-  - jruby-9.2.4.0
-matrix:
-  allow_failures:
-    - rvm: jruby-9.2.4.0
+  - 2.7.0
+  - jruby-9.2.11.0
 notifications: false
-sudo: false
+env:
+  global:
+    - CC_TEST_REPORTER_ID=102848d93bffaa165e4a28cf9998693634256355cd5821349afdea9792dbedaa
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # See stanford-mods.gemspec for this gem's dependencies
 gemspec
-
-group :test, :development do
-  gem 'rubocop', '~> 0.60.0', require: false
-  gem 'rubocop-rspec', require: false
-  gem 'coveralls', require: false
-end

data/lib/stanford-mods/imprint.rb

@@ -48,7 +48,7 @@ module Stanford
 
                               date_elements = origin_info_node.send(date_field)
                               date_elements.map(&:as_object).map(&:first) if date_elements.any?
-                            end.first
+                            end.compact.first
                           end
 
           if date_elements.nil? || date_elements.none?

data/lib/stanford-mods/searchworks_languages.rb

@@ -1,5 +1,6 @@
 # Language Values used by SearchWorks
 # From  https://github.com/solrmarc/stanford-solr-marc/blob/master/stanford-sw/translation_maps/language_map.properties
+# code 'ase' from iso639-3
 SEARCHWORKS_LANGUAGES = {
   'aaa' => 'Afar',
   'abk' => 'Abkhaz',
@@ -30,6 +31,7 @@ SEARCHWORKS_LANGUAGES = {
   'arp' => 'Arapaho',
   'art' => 'Artificial (Other)',
   'arw' => 'Arawak',
+  'ase' => 'American Sign Language',
   'asm' => 'Assamese',
   'ast' => 'Bable',
   'ath' => 'Athapascan (Other)',

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = '2.6.1'.freeze
+    VERSION = '2.6.2'.freeze
   end
 end

data/spec/fixtures/searchworks_imprint_data.rb

@@ -1293,7 +1293,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>1500 CE</dateIssued>
         <issuance>monographic</issuance>' +
         mods_origin_info_end_str => 'Italy, 1500 CE'
-    },
+    }
   # water
   # wilpf?
   # yotsuba

data/spec/fixtures/searchworks_pub_date_data.rb

@@ -972,7 +972,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateIssued>1500 CE</dateIssued>' +
         mods_origin_info_end_str => [1500, '1500']
-    },
+    }
   # water
   # wilpf?
   # yotsuba

data/spec/imprint_spec.rb

@@ -14,6 +14,7 @@ describe Stanford::Mods::Imprint do
         '' => [],
         '<dateIssued point="start">unparsable</dateIssued>' => [],
         '<dateIssued>1957</dateIssued>' => [1957],
+        '<dateCreated>1957</dateCreated>' => [1957],
         '<dateIssued>195u</dateIssued>' => (1950..1959).to_a,
         '<dateCreated keyDate="yes">1964</dateCreated><dateIssued>195u</dateIssued>' => [1964],
         '<dateIssued>1964</dateIssued><dateCreated>195u</dateCreated>' => [1964],

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+SimpleCov.start
 
 require 'stanford-mods'
 

data/stanford-mods.gemspec

@@ -27,4 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard"
   # tests
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rubocop', '~> 0.60'
+  gem.add_development_dependency 'rubocop-rspec'
+  gem.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -95,6 +95,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stanford specific wrangling of MODS metadata from DOR, the Stanford Digital
   Object Repository
 email:
@@ -170,8 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata