briard 2.6.7 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc88de35682d2303ecacefc1de0d3a9f17317e88837a46e735ae802d13c27a59
-  data.tar.gz: 64cca2161dae986f704a24e2ea260ed1bee6e56209af39817d09a18b6849a2bf
+  metadata.gz: b3d66bec4bcc510e9852889eac37463af37edd73517bd852afdaa77f4e9f06f9
+  data.tar.gz: 4d50717dbd4d1ff8944ffb94ed7a9396879cfa1b8b7fefaa8efb38f00a8c27ae
 SHA512:
-  metadata.gz: e8a2ad0465b519ed445fca4a7cb0f87403ba6a0ad35d9528aee40715288462910cdb4ad8fc98e63d65d2b371bb85a7b387d14e03e601100f4e9c2e7f54cd642c
-  data.tar.gz: 141048f413c0b0d8d9b0fadf5f2c9851963e892fed00d64207e03d1f8d3c07ce565965180e6c9750074cc65df6a29bd59df435b550ddea2b3e34229e5fe4398f
+  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,19 +1,19 @@
 PATH
   remote: .
   specs:
-    briard (2.6.7)
-      activesupport (>= 4.2.5)
+    briard (2.7.1)
+      activesupport (>= 4.2.5, < 8.0)
       base32-url (>= 0.5.0, < 1)
       benchmark_methods (~> 0.7)
-      bibtex-ruby (>= 5.1.0)
+      bibtex-ruby (~> 6.0)
       builder (~> 3.2, >= 3.2.2)
-      citeproc-ruby (~> 1.1, >= 1.1.12)
+      citeproc-ruby (~> 2.0)
       colorize (~> 0.8.1)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      csl-styles (~> 1.0, >= 1.0.1.10)
+      csl-styles (~> 2.0)
       dotenv (~> 2.1, >= 2.1.1)
       edtf (~> 3.0, >= 3.0.4)
-      faraday (~> 0.17.3)
+      faraday (~> 2.6.0)
       faraday-multipart (~> 1.0.4)
       gender_detector (~> 0.1.2)
       iso8601 (~> 0.9.1)
@@ -29,7 +29,7 @@ PATH
       public_suffix (= 2.0.5)
       rdf-rdfxml (~> 3.1)
       rdf-turtle (~> 3.1)
-      thor (>= 1.1.0)
+      thor (~> 1.1, >= 1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -50,9 +50,9 @@ GEM
     builder (3.2.4)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.14)
+    citeproc-ruby (2.0.0)
       citeproc (~> 1.0, >= 1.0.9)
-      csl (~> 1.6)
+      csl (~> 2.0)
     code-scanning-rubocop (0.6.1)
       rubocop (~> 1.0)
     colorize (0.8.1)
@@ -60,11 +60,11 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    csl (1.6.0)
+    csl (2.0.0)
       namae (~> 1.0)
       rexml
-    csl-styles (1.0.1.11)
-      csl (~> 1.0)
+    csl-styles (2.0.1)
+      csl (~> 2.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dotenv (2.8.1)
@@ -78,14 +78,22 @@ GEM
     edtf (3.1.0)
       activesupport (>= 3.0, < 8.0)
     excon (0.71.1)
-    faraday (0.17.5)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.6.0)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
     faraday-encoding (0.0.5)
       faraday
+    faraday-excon (2.1.0)
+      excon (>= 0.27.4)
+      faraday (~> 2.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-gzip (0.1.0)
+      faraday (>= 1.0)
+      zlib (~> 2.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
+    faraday-net_http (3.0.2)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     haml (5.2.2)
@@ -116,15 +124,18 @@ GEM
     loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maremma (4.9.8)
+    maremma (4.9.9)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.71.0)
-      faraday (~> 0.17.3)
-      faraday-encoding (~> 0.0.4)
-      faraday_middleware (~> 0.14.0)
-      nokogiri (>= 1.11.2, < 1.14.0)
+      faraday (>= 2.0)
+      faraday-encoding (~> 0.0.5)
+      faraday-excon (~> 2.1.0)
+      faraday-follow_redirects (~> 0.3.0)
+      faraday-gzip (~> 0.1.0)
+      faraday-multipart (~> 1.0.4)
+      nokogiri (>= 1.13.1, < 1.14.0)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
@@ -136,7 +147,7 @@ GEM
     nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oj (3.13.22)
+    oj (3.13.23)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     parallel (1.22.1)
@@ -177,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)
@@ -195,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)
@@ -207,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)
@@ -215,6 +226,7 @@ GEM
     rubocop-rspec (2.15.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     scanf (1.0.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -238,15 +250,16 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zlib (2.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   briard!
-  bundler (>= 1.0)
+  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,21 +15,21 @@ 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'
+  s.add_dependency 'activesupport', '>= 4.2.5', '< 8.0'
   s.add_dependency 'base32-url', '>= 0.5.0', '< 1'
   s.add_dependency 'benchmark_methods', '~> 0.7'
-  s.add_dependency 'bibtex-ruby', '>= 5.1.0'
+  s.add_dependency 'bibtex-ruby', '~> 6.0'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
-  s.add_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.12'
+  s.add_dependency 'citeproc-ruby', '~> 2.0'
   s.add_dependency 'colorize', '~> 0.8.1'
   s.add_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.5'
-  s.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.10'
+  s.add_dependency 'csl-styles', '~> 2.0'
   s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
   s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
-  s.add_dependency 'faraday', '~> 0.17.3'
+  s.add_dependency 'faraday', '~> 2.6.0'
   s.add_dependency 'faraday-multipart', '~> 1.0.4'
   s.add_dependency 'gender_detector', '~> 0.1.2'
   s.add_dependency 'iso8601', '~> 0.9.1'
@@ -45,10 +45,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'public_suffix', '2.0.5'
   s.add_dependency 'rdf-rdfxml', '~> 3.1'
   s.add_dependency 'rdf-turtle', '~> 3.1'
-  s.add_dependency 'thor', '>= 1.1.0'
-  s.add_development_dependency 'bundler', '>= 1.0'
+  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/datacite_utils.rb

@@ -23,8 +23,8 @@ module Briard
         schema_version = 'http://datacite.org/schema/kernel-4'
       end
 
-      kernel = schema_version.to_s.split('/').last
-      filepath = File.expand_path("../../../resources/#{kernel}/metadata.xsd", __FILE__)
+      k = schema_version.to_s.split('/').last
+      filepath = File.expand_path("../../../resources/#{k}/metadata.xsd", __FILE__)
       schema = Nokogiri::XML::Schema(open(filepath))
 
       schema.validate(Nokogiri::XML(xml, nil, 'UTF-8')).map(&:to_s).unwrap

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']")