parse_date 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c444ed79ea6842f49bfb44d2adc5bd1a6790d483fe43e0bd4a0880001a6005
-  data.tar.gz: a62f906a4c908c4b774ef9fe1dae2a047deee79ee6569688d1c2db9796bb3b2e
+  metadata.gz: f613d991c15686a1b4ba6306fe8f0260a1b0e6159b868cba4f6894be3369df2c
+  data.tar.gz: 6c39918199136340604ab472ecc8c3898a13b88aea1f2d2bbd19ea7090a5bfec
 SHA512:
-  metadata.gz: a949b307fb3259f1a20fa279aa2af395137b514b35b15dbce8c63701047462b06b5b6cb31723f25dbef2c8f1db249cf8e95914d92c113dd4439ed6737267878f
-  data.tar.gz: e1e3e154a6bc4851a7aafa199da3ee66e0d4b7d5d27537528cee36d2f0b2f80761fbbffffa1d2a544ca4a204f4fd7816f85a6d0b975824fff06cead4d64cf3f2
+  metadata.gz: 1dece18d4386a1701e57097c016dc8910eee7d9c447ae365ccdd27bea973fed67d377d154e42f5cb4c91bdc6c187a19c63d491f2ee7b8eeb30ac6fe62963ca91
+  data.tar.gz: 7e4b96fce7029cf4c1918c6cd6614d26e170e160ba72e94ee8fc8f1402a780000469c965249f8c69be30882161f93125aa44e592c0dbec4f49c7040a2c4a8ed3

data/.circleci/config.yml

@@ -0,0 +1,11 @@
+version: 2.1
+orbs:
+  ruby-rails: sul-dlss/ruby-rails@4.6.0
+workflows:
+  build:
+    jobs:
+      - ruby-rails/lint-gem:
+          name: lint
+      - ruby-rails/test-gem:
+          name: test
+          context: dlss

data/.gitignore

@@ -10,6 +10,5 @@
 # rspec failure tracking
 .rspec_status
 
-Gemfile.lock
 
 .pry_history

data/.rubocop.yml

@@ -1,5 +1,24 @@
+plugins:
+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-rake
+  - rubocop-rspec
+  - rubocop-rspec_rails
+
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 3.1
+  SuggestExtensions: false
+  DisplayCopNames: true
+  Include:
+    - './Rakefile' # rake only
+    - '**/*.rb'
+  Exclude:
+    # autogenerated files (that we don't change) should go here
+    - 'bin/**/*'
+    - 'spec/spec_helper.rb'
+
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
@@ -27,6 +46,12 @@ Metrics/ModuleLength:
   Exclude:
     - lib/parse_date/int_from_string.rb
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Max: 4 # default: 3
+
 Style/Documentation:
   Exclude:
     - lib/parse_date.rb
@@ -48,8 +73,6 @@ Style/WordArray:
 Style/YodaCondition:
   Enabled: false
 
-Gemspec/DateAssignment: # (new in 1.10)
-  Enabled: true
 Layout/SpaceBeforeBrackets: # (new in 1.7)
   Enabled: true
 Lint/AmbiguousAssignment: # (new in 1.7)
@@ -108,3 +131,283 @@ Style/StringChars: # (new in 1.12)
   Enabled: true
 Style/SwapValues: # (new in 1.1)
   Enabled: true
+Gemspec/DeprecatedAttributeAssignment: # new in 1.30
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineContinuationLeadingSpace: # new in 1.31
+  Enabled: true
+Layout/LineContinuationSpacing: # new in 1.31
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: true
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/CompoundHash: # new in 1.28
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/EnvHome: # new in 1.29
+  Enabled: true
+Style/FetchEnvVar: # new in 1.28
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MapCompactWithConditionalBlock: # new in 1.30
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/ObjectThen: # new in 1.28
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+RSpec/BeEq: # new in 2.9.0
+  Enabled: true
+RSpec/BeNil: # new in 2.9.0
+  Enabled: true
+RSpec/ChangeByZero: # new in 2.11
+  Enabled: true
+RSpec/ClassCheck: # new in 2.13
+  Enabled: true
+RSpec/ExcessiveDocstringSpacing: # new in 2.5
+  Enabled: true
+RSpec/IdenticalEqualityAssertion: # new in 2.4
+  Enabled: true
+RSpec/NoExpectationExample: # new in 2.13
+  Enabled: true
+RSpec/SubjectDeclaration: # new in 2.5
+  Enabled: true
+RSpec/VerifiedDoubleReference: # new in 2.10.0
+  Enabled: true
+Capybara/SpecificFinders: # new in 2.13
+  Enabled: true
+Capybara/SpecificMatcher: # new in 2.12
+  Enabled: true
+FactoryBot/SyntaxMethods: # new in 2.7
+  Enabled: true
+RSpecRails/AvoidSetupHook: # new in 2.4
+  Enabled: true
+RSpecRails/HaveHttpStatus: # new in 2.12
+  Enabled: true
+
+Gemspec/AddRuntimeDependency: # new in 1.65
+  Enabled: true
+Gemspec/DevelopmentDependencies: # new in 1.44
+  Enabled: true
+Lint/ArrayLiteralInRegexp: # new in 1.71
+  Enabled: true
+Lint/ConstantReassignment: # new in 1.70
+  Enabled: true
+Lint/CopDirectiveSyntax: # new in 1.72
+  Enabled: true
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Lint/DuplicateSetElement: # new in 1.67
+  Enabled: true
+Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/NumericOperationWithConstantResult: # new in 1.69
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Lint/RedundantTypeConversion: # new in 1.72
+  Enabled: true
+Lint/SharedMutableDefault: # new in 1.70
+  Enabled: true
+Lint/SuppressedExceptionInNumberConversion: # new in 1.72
+  Enabled: true
+Lint/UnescapedBracketInRegexp: # new in 1.68
+  Enabled: true
+Lint/UselessConstantScoping: # new in 1.72
+  Enabled: true
+  Exclude:
+    - lib/parse_date/int_from_string.rb
+Lint/UselessDefined: # new in 1.69
+  Enabled: true
+Lint/UselessNumericOperation: # new in 1.66
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Metrics/CollectionLiteralLength: # new in 1.47
+  Enabled: true
+Style/AmbiguousEndlessMethodDefinition: # new in 1.68
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/BitwisePredicate: # new in 1.68
+  Enabled: true
+Style/CombinableDefined: # new in 1.68
+  Enabled: true
+Style/ComparableBetween: # new in 1.74
+  Enabled: true
+Style/ComparableClamp: # new in 1.44
+  Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/DigChain: # new in 1.69
+  Enabled: true
+Style/DirEmpty: # new in 1.48
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/FileEmpty: # new in 1.48
+  Enabled: true
+Style/FileNull: # new in 1.69
+  Enabled: true
+Style/FileTouch: # new in 1.69
+  Enabled: true
+Style/HashFetchChain: # new in 1.75
+  Enabled: true
+Style/HashSlice: # new in 1.71
+  Enabled: true
+Style/ItAssignment: # new in 1.70
+  Enabled: true
+Style/ItBlockParameter: # new in 1.75
+  Enabled: true
+Style/KeywordArgumentsMerging: # new in 1.68
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantFormat: # new in 1.72
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
+  Enabled: true
+Style/RedundantInterpolationUnfreeze: # new in 1.66
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+  Exclude:
+    - lib/parse_date/int_from_string.rb
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/SafeNavigationChainLength: # new in 1.68
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+Capybara/FindAllFirst: # new in 2.22
+  Enabled: true
+Capybara/MatchStyle: # new in 2.17
+  Enabled: true
+Capybara/NegationMatcher: # new in 2.14
+  Enabled: true
+Capybara/NegationMatcherAfterVisit: # new in 2.22
+  Enabled: true
+Capybara/RedundantWithinFind: # new in 2.20
+  Enabled: true
+Capybara/SpecificActions: # new in 2.14
+  Enabled: true
+Capybara/RSpec/HaveSelector: # new in 2.19
+  Enabled: true
+Capybara/RSpec/PredicateMatcher: # new in 2.19
+  Enabled: true
+FactoryBot/AssociationStyle: # new in 2.23
+  Enabled: true
+FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+  Enabled: true
+FactoryBot/ExcessiveCreateList: # new in 2.25
+  Enabled: true
+FactoryBot/FactoryAssociationWithStrategy: # new in 2.23
+  Enabled: true
+FactoryBot/FactoryNameStyle: # new in 2.16
+  Enabled: true
+FactoryBot/IdSequence: # new in 2.24
+  Enabled: true
+FactoryBot/RedundantFactoryOption: # new in 2.23
+  Enabled: true
+RSpec/IncludeExamples: # new in 3.6
+  Enabled: true
+RSpecRails/InferredSpecType: # new in 2.14
+  Enabled: true
+RSpecRails/MinitestAssertions: # new in 2.17
+  Enabled: true
+RSpecRails/NegationBeValid: # new in 2.23
+  Enabled: true
+RSpecRails/TravelAround: # new in 2.19
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,7 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-03-26 19:20:09 UTC using RuboCop version 1.12.0.
+# on 2022-10-07 22:01:55 UTC using RuboCop version 1.36.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: 5
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'lib/parse_date/int_from_string.rb'
+
+# Offense count: 11
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/parse_date/int_from_string_spec.rb'
+    - 'spec/parse_date_spec.rb'
+
+# Offense count: 14
+RSpec/RepeatedExample:
+  Exclude:
+    - 'spec/parse_date/int_from_string_spec.rb'
+    - 'spec/parse_date_spec.rb'

data/Gemfile.lock

@@ -0,0 +1,123 @@
+PATH
+  remote: .
+  specs:
+    parse_date (0.4.4)
+      zeitwerk (~> 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.3)
+    date (3.4.1)
+    debug (1.11.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    erb (5.0.2)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.5.1)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rdoc (6.14.2)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.11.3)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.5)
+    rubocop (1.80.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.7.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.1.7)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    zeitwerk (2.7.3)
+
+PLATFORMS
+  arm64-darwin-24
+  x86_64-darwin-19
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  debug
+  parse_date!
+  rake (~> 13.0.3)
+  rspec (~> 3.0)
+  rubocop (~> 1.12)
+  rubocop-capybara
+  rubocop-factory_bot
+  rubocop-rake
+  rubocop-rspec
+  rubocop-rspec_rails
+  simplecov
+
+BUNDLED WITH
+   2.7.2

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/parse_date.svg)](https://badge.fury.io/rb/parse_date)
-[![Build Status](https://travis-ci.com/sul-dlss/parse_date.svg?branch=main)](https://travis-ci.com/sul-dlss/parse_date)
-[![Maintainability](https://api.codeclimate.com/v1/badges/2d006b4ccb3100434f4a/maintainability)](https://codeclimate.com/github/sul-dlss/parse_date/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/2d006b4ccb3100434f4a/test_coverage)](https://codeclimate.com/github/sul-dlss/parse_date/test_coverage)
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/sul-dlss/parse_date/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/sul-dlss/parse_date/tree/main)
+[![codecov](https://codecov.io/github/sul-dlss/parse_date/graph/badge.svg?token=SLX8J6L6ZV)](https://codecov.io/github/sul-dlss/parse_date)
 
 # ParseDate
 

data/lib/parse_date/int_from_string.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 class ParseDate
-
   # Parse (Year) Integers from Date Strings
   module IntFromString
-
     # earliest year as Integer if we can parse one from date_str
     #  e.g. if 17uu, result is 1700
     # NOTE:  if we have a x/x/yy or x-x-yy pattern (the only 2 digit year patterns
@@ -13,19 +11,19 @@ class ParseDate
     #   1/1/17  ->  2017
     #   1/1/27  ->  1927
     # @return [Integer, nil] Integer year if we could parse one, nil otherwise
-    def self.earliest_year(date_str)
+    def earliest_year(date_str)
       return unless date_str && !date_str.empty?
       return if date_str == '0000-00-00' # shpc collection has these useless dates
 
       # B.C. first (match longest string first)
-      bc_result = ParseDate.send(:earliest_year_bc_parsing, date_str)
+      bc_result = earliest_year_bc_parsing(date_str)
       return bc_result if bc_result
 
-      result = ParseDate.send(:earliest_year_parsing, date_str)
+      result = earliest_year_parsing(date_str)
       return result if result
 
       # try removing brackets between digits in case we have 169[5] or [18]91
-      no_brackets = ParseDate.send(:remove_brackets, date_str)
+      no_brackets = remove_brackets(date_str)
       earliest_year(no_brackets) if no_brackets
     end
 
@@ -37,40 +35,43 @@ class ParseDate
     #   1/1/17  ->  2017
     #   1/1/27  ->  1927
     # @return [Integer, nil] Integer year if we could parse one, nil otherwise
-    def self.latest_year(date_str)
+    def latest_year(date_str)
       return unless date_str && !date_str.empty?
       return if date_str == '0000-00-00' # shpc collection has these useless dates
 
       # B.C. first (match longest string first)
-      bc_result = ParseDate.send(:latest_year_bc_parsing, date_str)
+      bc_result = latest_year_bc_parsing(date_str)
       return bc_result if bc_result
 
-      result = ParseDate.send(:latest_year_parsing, date_str)
+      result = latest_year_parsing(date_str)
       return result if result
 
       # try removing brackets between digits in case we have 169[5] or [18]91
-      no_brackets = ParseDate.send(:remove_brackets, date_str)
+      no_brackets = remove_brackets(date_str)
       latest_year(no_brackets) if no_brackets
     end
 
     # true if the year is between -9999 and (current year + 1), inclusive
     # @return [Boolean] true if the year is between -999 and (current year + 1); false otherwise
-    def self.year_int_valid?(year)
+    def year_int_valid?(year)
       return false unless year.is_a? Integer
 
       (-10000 < year.to_i) && (year < Date.today.year + 2)
     end
 
-    protected
+    private
 
     def earliest_year_bc_parsing(date_str)
-      return ParseDate.send(:earliest_century_bc, date_str) if date_str.match(YY_YY_CENTURY_BC_REGEX)
-      return ParseDate.send(:between_bc_earliest_year, date_str) if date_str.match(BETWEEN_Yn_AND_Yn_BC_REGEX)
-      return ParseDate.send(:year_int_for_bc, date_str) if date_str.match(YEAR_BC_REGEX)
+      return earliest_century_bc(date_str) if date_str.match(YY_YY_CENTURY_BC_REGEX)
+      return between_bc_earliest_year(date_str) if date_str.match(BETWEEN_Yn_AND_Yn_BC_REGEX)
+
+      year_int_for_bc(date_str) if date_str.match(YEAR_BC_REGEX)
     end
 
     def earliest_year_parsing(date_str)
       [
+        # DataWorks date ranges include slashes and hyphens that match date_str/date_str
+        :slash_earliest_year,
         # longest string first, more or less
         :between_earliest_year,
         :hyphen_4digit_earliest_year,
@@ -81,23 +82,26 @@ class ParseDate
         :first_year_for_century, # includes some BC
         :year_for_early_numeric
       ].each do |method_name|
-        result = ParseDate.send(method_name, date_str)
+        result = send(method_name, date_str)
         return result.to_i if result && year_int_valid?(result.to_i)
       end
       nil
     end
 
     def latest_year_bc_parsing(date_str)
-      return ParseDate.send(:last_year_mult_centuries_bc, date_str) if date_str.match(YY_YY_CENTURY_BC_REGEX)
-      return ParseDate.send(:between_bc_latest_year, date_str) if date_str.match(BETWEEN_Yn_AND_Yn_BC_REGEX)
-      return ParseDate.send(:last_year_for_bc_century, date_str) if date_str.match(BC_CENTURY_REGEX)
-      return ParseDate.send(:year_int_for_bc, date_str) if date_str.match(BC_REGEX)
+      return last_year_mult_centuries_bc(date_str) if date_str.match(YY_YY_CENTURY_BC_REGEX)
+      return between_bc_latest_year(date_str) if date_str.match(BETWEEN_Yn_AND_Yn_BC_REGEX)
+      return last_year_for_bc_century(date_str) if date_str.match(BC_CENTURY_REGEX)
+
+      year_int_for_bc(date_str) if date_str.match(BC_REGEX)
     end
 
     # rubocop:disable Metrics/MethodLength
     def latest_year_parsing(date_str)
       result = nil
       [
+        # DataWorks date ranges include slashes and hyphens that match date_str/date_str
+        :slash_latest_year,
         # longest string first, more or less
         :between_latest_year,
         :hyphen_4digit_latest_year,
@@ -115,7 +119,7 @@ class ParseDate
         :last_year_for_century,
         :last_year_for_early_numeric
       ].each do |method|
-        result ||= ParseDate.send(method, date_str)
+        result ||= send(method, date_str)
         return result.to_i if result && year_int_valid?(result.to_i)
       end
       nil
@@ -143,8 +147,8 @@ class ParseDate
     # @return [Integer, nil] yyyy if date_str matches pattern; nil otherwise
     def hyphen_4digit_latest_year(date_str)
       latest = Regexp.last_match(:last) if date_str.match(YYYY_HYPHEN_YYYY_REGEX)
-      if ParseDate.year_int_valid?(latest.to_i)
-        ParseDate.latest_year(latest) # accommodates '1980s - 1990s'
+      if year_int_valid?(latest.to_i)
+        latest_year(latest) # accommodates '1980s - 1990s'
       else
         # return the bad value;  parse_range might need to complain about it
         latest
@@ -162,7 +166,7 @@ class ParseDate
       first = Regexp.last_match(:first)
       century = first[0..-3] # whatever is before the last 2 digits
       last = "#{century}#{Regexp.last_match(:last)}"
-      last.to_i if ParseDate.year_range_valid?(first.to_i, last.to_i)
+      last.to_i if year_range_valid?(first.to_i, last.to_i)
     end
 
     YYYY_HYPHEN_Y_REGEX = Regexp.new(/(?<first>\d{3,4})\??\s*(-|—|–|to)\s*(?<last>\d{1})\??([^-0-9].*)?$/)
@@ -176,7 +180,7 @@ class ParseDate
       first = Regexp.last_match(:first)
       decade = first[0..-2] # whatever is before the last digit
       last = "#{decade}#{Regexp.last_match(:last)}"
-      last.to_i if ParseDate.year_range_valid?(first.to_i, last.to_i)
+      last.to_i if year_range_valid?(first.to_i, last.to_i)
     end
 
     YYUU = '\\d{1,2}[u\\-]{2}'
@@ -279,7 +283,7 @@ class ParseDate
     def last_year_for_0s_decade(date_str)
       decade_matches = date_str.match(DECADE_0S_REGEX)
       changed_to_nine = decade_matches.to_s.sub(/0'?s/, '9') if decade_matches
-      ParseDate.first_four_digits(changed_to_nine) if changed_to_nine
+      first_four_digits(changed_to_nine) if changed_to_nine
     end
 
     DECADE_4CHAR_REGEX = Regexp.new('(^|\D)\d{3}[u\-?x]($|\D)', REGEX_OPTS)
@@ -290,7 +294,7 @@ class ParseDate
     def first_year_for_decade(date_str)
       decade_matches = date_str.match(DECADE_4CHAR_REGEX)
       changed_to_zero = decade_matches.to_s.tr('u\-?x', '0') if decade_matches
-      ParseDate.first_four_digits(changed_to_zero) if changed_to_zero
+      first_four_digits(changed_to_zero) if changed_to_zero
     end
 
     # last year of decade (as String) if we have:  yyyu, yyy-, yyy? or yyyx pattern
@@ -299,7 +303,7 @@ class ParseDate
     def last_year_for_decade(date_str)
       decade_matches = date_str.match(DECADE_4CHAR_REGEX)
       changed_to_nine = decade_matches.to_s.tr('u\-?x', '9') if decade_matches
-      ParseDate.first_four_digits(changed_to_nine) if changed_to_nine
+      first_four_digits(changed_to_nine) if changed_to_nine
     end
 
     CENTURY_WORD_REGEX = Regexp.new('(\d{1,2})[a-z]{2}?\s*century', REGEX_OPTS)
@@ -313,7 +317,8 @@ class ParseDate
       return Regexp.last_match(1).to_i * -100 - 99 if date_str.match(BC_CENTURY_REGEX)
       return Regexp.last_match(1).to_i * 100 if date_str.match(CENTURY_4CHAR_REGEX)
       return (Regexp.last_match(:first).to_i - 1) * 100 if date_str.match(YY_YY_CENTURY_REGEX)
-      return (Regexp.last_match(1).to_i - 1) * 100 if date_str.match(CENTURY_WORD_REGEX)
+
+      (Regexp.last_match(1).to_i - 1) * 100 if date_str.match(CENTURY_WORD_REGEX)
     end
     # rubocop:enable Metrics/AbcSize
 
@@ -321,7 +326,8 @@ class ParseDate
     # @return [Integer, nil] yy99 if date_str matches pattern, nil otherwise; also nil if B.C. in pattern
     def last_year_for_century(date_str)
       return Regexp.last_match(1).to_i * 100 + 99 if date_str.match(CENTURY_4CHAR_REGEX)
-      return (Regexp.last_match(1).to_i - 1) * 100 + 99 if date_str.match(CENTURY_WORD_REGEX)
+
+      (Regexp.last_match(1).to_i - 1) * 100 + 99 if date_str.match(CENTURY_WORD_REGEX)
     end
 
     # last year of century (as String) if we have:  nth century BC
@@ -330,6 +336,21 @@ class ParseDate
       Regexp.last_match(1).to_i * -100 if date_str.match(BC_CENTURY_REGEX)
     end
 
+    # Regex for a date range pattern with a slash: 2023-01-02T19:20:30+01:00/2025-01-01
+    DATESTR_REGEX = Regexp.new(/\b(\d{4})\b.*?\/.*?\b(\d{4})\b/im) # rubocop:disable Style/RegexpLiteral
+
+    # Integer value for earliest if we have "date_str/date_str" pattern
+    # @return [Integer, nil] year if date_str matches pattern; nil otherwise
+    def slash_earliest_year(date_str)
+      Regexp.last_match(1).to_i if date_str.match(DATESTR_REGEX)
+    end
+
+    # Integer value for latest if we have "date_str/date_str" pattern
+    # @return [Integer, nil] year if date_str matches pattern; nil otherwise
+    def slash_latest_year(date_str)
+      Regexp.last_match(2).to_i if date_str.match(DATESTR_REGEX)
+    end
+
     BETWEEN_Yn_AND_Yn_REGEX = Regexp.new(/between\s+(?<first>\d{1,4})\??\s+and\s+(?<last>\d{1,4})\??/im)
 
     # Integer value for earliest if we have "between y and y" pattern

data/lib/parse_date/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ParseDate
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/parse_date.rb

@@ -23,31 +23,18 @@ class ParseDate
   class Error < StandardError; end
 
   include Singleton
-  extend ParseDate::IntFromString
-
-  # class method delegation
-  def self.earliest_year(date_str)
-    ParseDate::IntFromString.earliest_year(date_str)
-  end
-
-  def self.latest_year(date_str)
-    ParseDate::IntFromString.latest_year(date_str)
-  end
-
-  def self.year_int_valid?(date_str)
-    ParseDate::IntFromString.year_int_valid?(date_str)
-  end
+  extend IntFromString
 
   # @return [Array] array of Integer year values from earliest year to latest year, inclusive
   def self.parse_range(date_str)
     first = earliest_year(date_str)
     last = latest_year(date_str)
     return nil unless first || last
-    raise ParseDate::Error, "Unable to parse range from '#{date_str}'" unless year_range_valid?(first, last)
+    raise Error, "Unable to parse range from '#{date_str}'" unless year_range_valid?(first, last)
 
     range_array(first, last)
   rescue StandardError => e
-    raise ParseDate::Error, "Unable to parse range from '#{date_str}': #{e.message}"
+    raise Error, "Unable to parse range from '#{date_str}': #{e.message}"
   end
 
   # true if:
@@ -65,20 +52,16 @@ class ParseDate
   # @param [Integer, String] first_year, expecting integer or parseable string for .to_i
   # @param [Integer, String] last_year, expecting integer or parseable string for .to_i
   # @return [Array] array of Integer year values from first to last, inclusive
-  # rubocop:disable Metrics/CyclomaticComplexity
-  # rubocop:disable Metrics/PerceivedComplexity
-  def self.range_array(first_year, last_year)
+  def self.range_array(first_year, last_year) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     first_year = first_year.to_i if first_year.is_a?(String) && first_year.match?(/^-?\d+$/)
     last_year = last_year.to_i if last_year.is_a?(String) && last_year.match?(/^-?\d+$/)
 
     return [] unless last_year || first_year
     return [first_year] if last_year.nil? && first_year
     return [last_year] if first_year.nil? && last_year
-    raise(ParseDate::Error, "unable to create year range array from #{first_year}, #{last_year}") unless
+    raise(Error, "unable to create year range array from #{first_year}, #{last_year}") unless
       year_range_valid?(first_year, last_year)
 
     Range.new(first_year, last_year).to_a
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
-  # rubocop:enable Metrics/PerceivedComplexity
 end

data/parse_date.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/sul-dlss/parse_date'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
-
+  spec.metadata['rubygems_mfa_required'] = 'true'
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/sul-dlss/parse_date'
 
@@ -31,10 +31,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'zeitwerk', '~> 2.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'debug'
   spec.add_development_dependency 'rake', '~> 13.0.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.12'
+  spec.add_development_dependency 'rubocop-capybara'
+  spec.add_development_dependency 'rubocop-factory_bot'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov', '~> 0.17.1' # CodeClimate cannot use SimpleCov >= 0.18.0 for generating test coverage
+  spec.add_development_dependency 'rubocop-rspec_rails'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: parse_date
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Naomi Dushay
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -39,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +93,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  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: rubocop-factory_bot
+  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: rubocop-rake
+  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: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +149,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec_rails
+  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.17.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0'
 description: Get normalized date values for searching, faceting and display (e.g.
   in Solr search engine)
 email:
@@ -130,13 +185,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -150,9 +206,9 @@ homepage: https://github.com/sul-dlss/parse_date
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org/
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/sul-dlss/parse_date
   source_code_uri: https://github.com/sul-dlss/parse_date
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.7.0
 specification_version: 4
 summary: parse date values out of strings and normalize them
 test_files: []

data/.travis.yml

@@ -1,23 +0,0 @@
-dist: bionic
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.3
-  - 2.6.4
-
-env:
-  - 'RAILS_VERSION=5.2.3'
-  - 'RAILS_VERSION=6.0.0'
-
-before_install: gem install bundler -v 2.0.2
-
-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
-
-notifications:
-  email: false