briard 2.6.7 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc88de35682d2303ecacefc1de0d3a9f17317e88837a46e735ae802d13c27a59
-  data.tar.gz: 64cca2161dae986f704a24e2ea260ed1bee6e56209af39817d09a18b6849a2bf
+  metadata.gz: 274ef31afd2d0496eaa834fca379f2546ebadc1729c3139dc29e73411046cc82
+  data.tar.gz: a8eb31f51c2224c87856e1ce9ff547b33c3bc9b50579926a9152f2dd6083163e
 SHA512:
-  metadata.gz: e8a2ad0465b519ed445fca4a7cb0f87403ba6a0ad35d9528aee40715288462910cdb4ad8fc98e63d65d2b371bb85a7b387d14e03e601100f4e9c2e7f54cd642c
-  data.tar.gz: 141048f413c0b0d8d9b0fadf5f2c9851963e892fed00d64207e03d1f8d3c07ce565965180e6c9750074cc65df6a29bd59df435b550ddea2b3e34229e5fe4398f
+  metadata.gz: 7e91cec9de02a686f161b410736974b57cae8710fb80f92a8bca64d271c9b19c1593e03ef3fd96c288af72c7e99748f6ffe01648d3750161da247c8ddc77c728
+  data.tar.gz: 52c75c7fc2ea549f3fff4ca25a32e833d08df761ffc511c18cd80b1a64a4268f01afb7551bb98c2046b4369d21653ad2d91e8dd0d783ed510e9af4ede256c622

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    briard (2.6.7)
-      activesupport (>= 4.2.5)
+    briard (2.7.0)
+      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)
@@ -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,13 +250,14 @@ 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)
   rack-test (~> 2.0)

data/briard.gemspec

@@ -18,18 +18,18 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '~> 2.3'
 
   # 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,8 +45,8 @@ 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 'rack-test', '~> 2.0'

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Briard
-  VERSION = '2.6.7'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briard
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.7.0
 platform: ruby
 authors:
 - Martin Fenner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: base32-url
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +68,16 @@ dependencies:
   name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.12
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.12
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -152,20 +152,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1.10
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1.10
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +206,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
@@ -464,6 +458,9 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
@@ -471,6 +468,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
@@ -478,16 +478,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: code-scanning-rubocop
   requirement: !ruby/object:Gem::Requirement