briard 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274ef31afd2d0496eaa834fca379f2546ebadc1729c3139dc29e73411046cc82
-  data.tar.gz: a8eb31f51c2224c87856e1ce9ff547b33c3bc9b50579926a9152f2dd6083163e
+  metadata.gz: b3d66bec4bcc510e9852889eac37463af37edd73517bd852afdaa77f4e9f06f9
+  data.tar.gz: 4d50717dbd4d1ff8944ffb94ed7a9396879cfa1b8b7fefaa8efb38f00a8c27ae
 SHA512:
-  metadata.gz: 7e91cec9de02a686f161b410736974b57cae8710fb80f92a8bca64d271c9b19c1593e03ef3fd96c288af72c7e99748f6ffe01648d3750161da247c8ddc77c728
-  data.tar.gz: 52c75c7fc2ea549f3fff4ca25a32e833d08df761ffc511c18cd80b1a64a4268f01afb7551bb98c2046b4369d21653ad2d91e8dd0d783ed510e9af4ede256c622
+  metadata.gz: 414c0b2dc8daa281d9b4611d4af896e510ebd878bc17128e9e08af78d12441cedfd7f30e2c81bdc34f3ecb91d455314e0979ec6b24f1fb6ee580895bb15436de
+  data.tar.gz: 042afdd61e0ba95031ae621fd4db19641091a44de66f1e201f32c5ca2ecd412622d0b546e60b9f541d6792af6a9e049c7f360f35ab6e3bc98d28bd17d2a1fda9

data/.rubocop.yml

@@ -15,7 +15,7 @@ AllCops:
     - 'tmp/**/*'
     - '.git/**/*'
     - 'bin/*'
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   SuggestExtensions: false
 
 Naming/PredicateName:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    briard (2.7.0)
+    briard (2.7.1)
       activesupport (>= 4.2.5, < 8.0)
       base32-url (>= 0.5.0, < 1)
       benchmark_methods (~> 0.7)
@@ -188,7 +188,7 @@ GEM
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -206,7 +206,7 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    rubocop (1.38.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -218,7 +218,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
@@ -259,7 +259,7 @@ DEPENDENCIES
   briard!
   bundler (~> 2.3, >= 2.3.1)
   code-scanning-rubocop (~> 0.6.1)
-  hashdiff (>= 1.0.0.beta1, < 2.0.0)
+  hashdiff (~> 1.0.1)
   rack-test (~> 2.0)
   rake (~> 12.0)
   rspec (~> 3.4)

data/README.md

@@ -134,7 +134,7 @@ Briard reads and/or writes these metadata formats:
 
 ## Installation
 
-Requires Ruby 2.3 or later. Then add the following to your `Gemfile` to install the
+Requires Ruby 2.7 or later. Then add the following to your `Gemfile` to install the
 latest version:
 
 ```ruby

data/briard.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.version       = Briard::VERSION
   s.extra_rdoc_files = ['README.md']
   s.license = 'MIT'
-  s.required_ruby_version = '~> 2.3'
+  s.required_ruby_version = '>= 2.7.0'
 
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'activesupport', '>= 4.2.5', '< 8.0'
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor', '~> 1.1', '>= 1.1.0'
   s.add_development_dependency 'bundler', '~> 2.3', '>= 2.3.1'
   s.add_development_dependency 'code-scanning-rubocop', '~> 0.6.1'
-  s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
+  s.add_development_dependency 'hashdiff', '~> 1.0.1'
   s.add_development_dependency 'rack-test', '~> 2.0'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.4'

data/lib/briard/doi_utils.rb

@@ -12,10 +12,10 @@ module Briard
       doi = Array(%r{\A(?:(http|https):/(/)?(dx\.)?(doi\.org|handle\.stage\.datacite\.org|handle\.test\.datacite\.org)/)?(doi:)?(10\.13039/)?([1-9]\d+)\z}.match(doi)).last
 
       # remove non-printing whitespace and downcase
-      if doi.present?
-        doi.delete("\u200B").downcase
-        "https://doi.org/10.13039/#{doi}"
-      end
+      return unless doi.present?
+
+      doi.delete("\u200B").downcase
+      "https://doi.org/10.13039/#{doi}"
     end
 
     def validate_prefix(doi)
@@ -41,10 +41,12 @@ module Briard
     end
 
     def doi_from_url(url)
-      if %r{\A(?:(http|https)://(dx\.)?(doi\.org|handle\.stage\.datacite\.org|handle\.test\.datacite\.org)/)?(doi:)?(10\.\d{4,5}/.+)\z}.match?(url)
-        uri = Addressable::URI.parse(url)
-        uri.path.gsub(%r{^/}, '').downcase
+      unless %r{\A(?:(http|https)://(dx\.)?(doi\.org|handle\.stage\.datacite\.org|handle\.test\.datacite\.org)/)?(doi:)?(10\.\d{4,5}/.+)\z}.match?(url)
+        return
       end
+
+      uri = Addressable::URI.parse(url)
+      uri.path.gsub(%r{^/}, '').downcase
     end
 
     def doi_as_url(doi)

data/lib/briard/readers/crossref_reader.rb

@@ -373,10 +373,9 @@ module Briard
       def crossref_date_published(bibliographic_metadata)
         pub_date = Array.wrap(bibliographic_metadata.fetch('publication_date', nil)).presence ||
                    Array.wrap(bibliographic_metadata.fetch('acceptance_date', nil))
-        if pub_date.present?
-          get_date_from_parts(pub_date.first['year'], pub_date.first['month'],
-                              pub_date.first['day'])
-        end
+        return unless pub_date.present?
+
+        get_date_from_parts(pub_date.first['year'], pub_date.first['month'], pub_date.first['day'])
       end
 
       def crossref_is_part_of(model_metadata)

data/lib/briard/readers/schema_org_reader.rb

@@ -50,7 +50,7 @@ module Briard
           # workaround for html language attribute if no language is set via schema.org
           lang = doc.at('html')['lang']
           hsh['inLanguage'] = lang if hsh['inLanguage'].blank?
-          
+
           # workaround if issn not included with schema.org
           name = doc.at("meta[property='og:site_name']")
           issn = doc.at("meta[name='citation_issn']")