briard 2.4.2 → 2.6.0

data/.rubocop_todo.yml

@@ -0,0 +1,76 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-01-30 21:43:14 UTC using RuboCop version 1.25.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: 101
+InternalAffairs/NodeDestructuring:
+  Enabled: false
+
+# Offense count: 55
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 191
+
+# Offense count: 235
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+Metrics/MethodLength:
+  Max: 14
+
+# Offense count: 8
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ModuleLength:
+  Max: 129
+
+# Offense count: 9
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/rubocop/cli_spec.rb'
+    - 'spec/rubocop/cli/suggest_extensions_spec.rb'
+    - 'spec/rubocop/cop/lint/duplicate_methods_spec.rb'
+    - 'spec/rubocop/cop/team_spec.rb'
+    - 'spec/rubocop/target_finder_spec.rb'
+
+# Offense count: 1279
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Enabled: false
+
+# Offense count: 2414
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Enabled: false
+
+# Offense count: 39
+RSpec/ExpectOutput:
+  Exclude:
+    - 'spec/rubocop/cli/auto_gen_config_spec.rb'
+    - 'spec/rubocop/cli/options_spec.rb'
+    - 'spec/rubocop/config_spec.rb'
+    - 'spec/rubocop/cop/cop_spec.rb'
+    - 'spec/rubocop/formatter/disabled_config_formatter_spec.rb'
+    - 'spec/rubocop/formatter/formatter_set_spec.rb'
+    - 'spec/rubocop/options_spec.rb'
+    - 'spec/rubocop/rake_task_spec.rb'
+    - 'spec/rubocop/result_cache_spec.rb'
+    - 'spec/rubocop/target_finder_spec.rb'
+
+# Offense count: 404
+RSpec/MultipleExpectations:
+  Max: 25
+
+# Offense count: 9
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/rubocop/config_spec.rb'
+    - 'spec/rubocop/formatter/json_formatter_spec.rb'
+    - 'spec/rubocop/formatter/pacman_formatter_spec.rb'
+    - 'spec/rubocop/formatter/progress_formatter_spec.rb'
+
+# Offense count: 12
+Rake/MethodDefinitionInTask:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [v2.5.1](https://github.com/front-matter/briard/tree/v2.5.1) (2022-09-18)
+
+[Full Changelog](https://github.com/front-matter/briard/compare/v2.5.0...v2.5.1)
+
+## [v2.5.0](https://github.com/front-matter/briard/tree/v2.5.0) (2022-09-18)
+
+[Full Changelog](https://github.com/front-matter/briard/compare/v2.4.2...v2.5.0)
+
+**Fixed bugs:**
+
+- Incomplete URL substring sanitization [\#12](https://github.com/front-matter/briard/issues/12)
+- Incomplete URL substring sanitization [\#11](https://github.com/front-matter/briard/issues/11)
+- Incomplete URL substring sanitization [\#10](https://github.com/front-matter/briard/issues/10)
+
+## [v2.4.2](https://github.com/front-matter/briard/tree/v2.4.2) (2022-08-24)
+
+[Full Changelog](https://github.com/front-matter/briard/compare/v2.4.1...v2.4.2)
+
 ## [v2.4.1](https://github.com/front-matter/briard/tree/v2.4.1) (2022-08-24)
 
 [Full Changelog](https://github.com/front-matter/briard/compare/v2.4...v2.4.1)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    briard (2.4.2)
+    briard (2.5.1)
       activesupport (>= 4.2.5)
       base32-url (>= 0.5.0, < 1)
       benchmark_methods (~> 0.7)
@@ -34,7 +34,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -42,6 +42,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     amazing_print (1.4.0)
+    ast (2.4.2)
     base32-url (0.5)
     benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
@@ -52,6 +53,8 @@ GEM
     citeproc-ruby (1.1.14)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
+    code-scanning-rubocop (0.6.1)
+      rubocop (~> 1.0)
     colorize (0.8.1)
     concurrent-ruby (1.1.10)
     crack (0.4.5)
@@ -110,7 +113,7 @@ GEM
       optimist (~> 3)
     latex-decode (0.4.0)
     link_header (0.0.8)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     maremma (4.9.8)
@@ -136,6 +139,9 @@ GEM
     oj (3.13.21)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
     postrank-uri (1.0.24)
       addressable (>= 2.4.0)
       nokogiri (>= 1.8.0)
@@ -145,6 +151,7 @@ GEM
     rack (2.2.4)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
+    rainbow (3.1.1)
     rake (12.3.3)
     rdf (3.2.9)
       link_header (~> 0.0, >= 0.0.8)
@@ -170,6 +177,7 @@ GEM
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -177,16 +185,36 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
+    rubocop (1.36.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.13.1)
+      rubocop (~> 1.33)
+    ruby-progressbar (1.11.0)
     scanf (1.0.0)
     simplecov (0.17.1)
       docile (~> 1.1)
@@ -201,7 +229,8 @@ GEM
     tilt (2.0.11)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-types (1.7.0)
+    unicode-display_width (2.3.0)
+    unicode-types (1.8.0)
     unicode_utils (1.4.0)
     vcr (3.0.3)
     webmock (3.18.1)
@@ -215,11 +244,16 @@ PLATFORMS
 DEPENDENCIES
   briard!
   bundler (>= 1.0)
+  code-scanning-rubocop (~> 0.6.1)
   hashdiff (>= 1.0.0.beta1, < 2.0.0)
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)
   rspec-xsd (~> 0.1.0)
+  rubocop (~> 1.36)
+  rubocop-performance (~> 1.15)
+  rubocop-rake (~> 0.6.0)
+  rubocop-rspec (~> 2.13)
   simplecov (= 0.17.1)
   vcr (~> 3.0, >= 3.0.3)
   webmock (~> 3.0, >= 3.0.1)

data/Rakefile

@@ -10,4 +10,4 @@ Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new('spec')
 
 # default task is running rspec tests
-task :default => :spec
+task default: :spec

data/{bolognese.gemspec → briard.gemspec}

@@ -1,61 +1,68 @@
-require "date"
-require File.expand_path("../lib/briard/version", __FILE__)
+# frozen_string_literal: true
+
+require 'English'
+require 'date'
+require File.expand_path('lib/briard/version', __dir__)
 
 Gem::Specification.new do |s|
-  s.authors       = "Martin Fenner"
-  s.email         = "martin@front-matter.io"
-  s.name          = "briard"
-  s.homepage      = "https://github.com/front-matter/briard"
-  s.summary       = "Ruby client library for conversion of DOI Metadata"
-  s.date          = Date.today
-  s.description   = "Ruby gem and command-line utility for conversion of DOI metadata from and to different metadata formats, including schema.org. Fork of version 1.19.12 of the bolognese gem."
-  s.require_paths = ["lib"]
+  s.authors       = 'Martin Fenner'
+  s.email         = 'martin@front-matter.io'
+  s.name          = 'briard'
+  s.homepage      = 'https://github.com/front-matter/briard'
+  s.summary       = 'Ruby client library for conversion of DOI Metadata'
+  s.description   = 'Ruby gem and command-line utility for conversion of DOI metadata from and to different metadata formats, including schema.org. Fork of version 1.19.12 of the bolognese gem.'
+  s.require_paths = ['lib']
   s.version       = Briard::VERSION
-  s.extra_rdoc_files = ["README.md"]
-  s.license       = 'MIT'
+  s.extra_rdoc_files = ['README.md']
+  s.license = 'MIT'
   s.required_ruby_version = '~> 2.3'
 
   # Declare dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '>= 4.9.7', '< 5'
-  s.add_dependency 'base32-url', '>= 0.5.0', '< 1'
-  s.add_dependency 'faraday', '~> 0.17.3'
-  s.add_dependency 'faraday-multipart', '~> 1.0.4'
-  s.add_dependency 'nokogiri', '~> 1.13.1'
-  s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
-  s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'activesupport', '>= 4.2.5'
+  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 'thor', '>= 1.1.0'
-  s.add_dependency 'colorize', '~> 0.8.1'
-  s.add_dependency 'namae', '~> 1.0'
-  s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
+  s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.12'
+  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 '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-multipart', '~> 1.0.4'
+  s.add_dependency 'gender_detector', '~> 0.1.2'
   s.add_dependency 'iso8601', '~> 0.9.1'
-  s.add_dependency 'postrank-uri', '~> 1.0', '>= 1.0.18'
-  s.add_dependency 'public_suffix', '2.0.5'
   s.add_dependency 'json-ld-preloaded', '~> 3.1', '>= 3.1.3'
   s.add_dependency 'jsonlint', '~> 0.3.0'
+  s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
+  s.add_dependency 'maremma', '>= 4.9.7', '< 5'
+  s.add_dependency 'namae', '~> 1.0'
+  s.add_dependency 'nokogiri', '~> 1.13.1'
   s.add_dependency 'oj', '~> 3.10'
-  s.add_dependency "oj_mimic_json", "~> 1.0", ">= 1.0.1"
-  s.add_dependency 'rdf-turtle', '~> 3.1'
+  s.add_dependency 'oj_mimic_json', '~> 1.0', '>= 1.0.1'
+  s.add_dependency 'postrank-uri', '~> 1.0', '>= 1.0.18'
+  s.add_dependency 'public_suffix', '2.0.5'
   s.add_dependency 'rdf-rdfxml', '~> 3.1'
-  s.add_dependency 'benchmark_methods', '~> 0.7'
-  s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
-  s.add_dependency 'gender_detector', '~> 0.1.2'
-  s.add_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.5'
+  s.add_dependency 'rdf-turtle', '~> 3.1'
+  s.add_dependency 'thor', '>= 1.1.0'
   s.add_development_dependency 'bundler', '>= 1.0'
+  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', '~> 0'
+  s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rspec-xsd', '~> 0.1.0'
-  s.add_development_dependency 'rake', '~> 12.0'
-  s.add_development_dependency 'rack-test', '~> 0'
+  s.add_development_dependency 'rubocop', '~> 1.36'
+  s.add_development_dependency 'rubocop-performance', '~> 1.15'
+  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.13'
+  s.add_development_dependency 'simplecov', '0.17.1'
   s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
   s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
-  s.add_development_dependency 'simplecov', '0.17.1'
-  s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
 
-  s.require_paths = ["lib"]
-  s.files       = `git ls-files`.split($/)
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = ["briard"]
+  s.require_paths = ['lib']
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.executables = ['briard']
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/briard/array.rb

@@ -4,9 +4,9 @@
 # Reverses Array.wrap, but uses self to allow chaining with Array.wrap
 class Array
   def unwrap
-    case self.length
+    case length
     when 0 then nil
-    when 1 then self.first
+    when 1 then first
     else self
     end
   end

data/lib/briard/author_utils.rb

@@ -8,53 +8,56 @@ module Briard
     #
     # benchmark :get_authors
 
-    IDENTIFIER_SCHEME_URIS = {
-      "ORCID" => "https://orcid.org/"
-    }
+    IDENTIFIER_SCHEME_URIS = { 'ORCID' => 'https://orcid.org/' }.freeze
 
     def get_one_author(author)
       # author is a string
-      author = { "creatorName" => author } if author.is_a?(String)
+      author = { 'creatorName' => author } if author.is_a?(String)
 
       # malformed XML
-      return nil if author.fetch("creatorName", nil).is_a?(Array)
+      return nil if author.fetch('creatorName', nil).is_a?(Array)
 
-      name = parse_attributes(author.fetch("creatorName", nil)) ||
-             parse_attributes(author.fetch("contributorName", nil))
-      given_name = parse_attributes(author.fetch("givenName", nil))
-      family_name = parse_attributes(author.fetch("familyName", nil))
+      name = parse_attributes(author.fetch('creatorName', nil)) ||
+             parse_attributes(author.fetch('contributorName', nil))
+      given_name = parse_attributes(author.fetch('givenName', nil))
+      family_name = parse_attributes(author.fetch('familyName', nil))
       name = cleanup_author(name)
-      name = [family_name, given_name].join(", ") if family_name.present? && given_name.present?
-      contributor_type = parse_attributes(author.fetch("contributorType", nil))
+      name = [family_name, given_name].join(', ') if family_name.present? && given_name.present?
+      contributor_type = parse_attributes(author.fetch('contributorType', nil))
 
-      name_type = parse_attributes(author.fetch("creatorName", nil), content: "nameType", first: true) || parse_attributes(author.fetch("contributorName", nil), content: "nameType", first: true)
+      name_type = parse_attributes(author.fetch('creatorName', nil), content: 'nameType',
+                                                                     first: true) || parse_attributes(author.fetch('contributorName', nil), content: 'nameType',
+                                                                                                                                            first: true)
 
-      name_identifiers = Array.wrap(author.fetch("nameIdentifier", nil)).map do |ni|
-        if ni["nameIdentifierScheme"] == "ORCID"
+      name_identifiers = Array.wrap(author.fetch('nameIdentifier', nil)).map do |ni|
+        if ni['nameIdentifierScheme'] == 'ORCID'
           {
-            "nameIdentifier" => normalize_orcid(ni["__content__"]),
-            "schemeUri" => "https://orcid.org",
-            "nameIdentifierScheme" => "ORCID" }.compact
-        elsif ni["schemeURI"].present?
+            'nameIdentifier' => normalize_orcid(ni['__content__']),
+            'schemeUri' => 'https://orcid.org',
+            'nameIdentifierScheme' => 'ORCID'
+          }.compact
+        elsif ni['schemeURI'].present?
           {
-            "nameIdentifier" => ni["schemeURI"].to_s + ni["__content__"].to_s,
-            "schemeUri" => ni["schemeURI"].to_s,
-            "nameIdentifierScheme" => ni["nameIdentifierScheme"] }.compact
+            'nameIdentifier' => ni['schemeURI'].to_s + ni['__content__'].to_s,
+            'schemeUri' => ni['schemeURI'].to_s,
+            'nameIdentifierScheme' => ni['nameIdentifierScheme']
+          }.compact
         else
           {
-            "nameIdentifier" => ni["__content__"],
-            "schemeUri" => nil,
-            "nameIdentifierScheme" => ni["nameIdentifierScheme"] }.compact
+            'nameIdentifier' => ni['__content__'],
+            'schemeUri' => nil,
+            'nameIdentifierScheme' => ni['nameIdentifierScheme']
+          }.compact
         end
       end.presence
 
-      author = { "nameType" => name_type,
-                 "name" => name,
-                 "givenName" => given_name,
-                 "familyName" => family_name,
-                 "nameIdentifiers" => name_identifiers,
-                 "affiliation" => get_affiliations(author.fetch("affiliation", nil)),
-                 "contributorType" => contributor_type }.compact
+      author = { 'nameType' => name_type,
+                 'name' => name,
+                 'givenName' => given_name,
+                 'familyName' => family_name,
+                 'nameIdentifiers' => name_identifiers,
+                 'affiliation' => get_affiliations(author.fetch('affiliation', nil)),
+                 'contributorType' => contributor_type }.compact
 
       return author if family_name.present?
 
@@ -66,25 +69,25 @@ module Briard
         if parsed_name.present?
           given_name = parsed_name.given
           family_name = parsed_name.family
-          name = [family_name, given_name].join(", ")
+          name = [family_name, given_name].join(', ')
         else
           given_name = nil
           family_name = nil
         end
 
-        { "nameType" => "Personal",
-          "name" => name,
-          "givenName" => given_name,
-          "familyName" => family_name,
-          "nameIdentifiers" => Array.wrap(name_identifiers),
-          "affiliation" => Array.wrap(author.fetch("affiliation", nil)),
-          "contributorType" => contributor_type }.compact
+        { 'nameType' => 'Personal',
+          'name' => name,
+          'givenName' => given_name,
+          'familyName' => family_name,
+          'nameIdentifiers' => Array.wrap(name_identifiers),
+          'affiliation' => Array.wrap(author.fetch('affiliation', nil)),
+          'contributorType' => contributor_type }.compact
       else
-        { "nameType" => name_type,
-          "name" => name,
-          "nameIdentifiers" => Array.wrap(name_identifiers),
-          "affiliation" => Array.wrap(author.fetch("affiliation", nil)),
-          "contributorType" => contributor_type }.compact
+        { 'nameType' => name_type,
+          'name' => name,
+          'nameIdentifiers' => Array.wrap(name_identifiers),
+          'affiliation' => Array.wrap(author.fetch('affiliation', nil)),
+          'contributorType' => contributor_type }.compact
       end
     end
 
@@ -92,10 +95,12 @@ module Briard
       return nil unless author.present?
 
       # detect pattern "Smith J.", but not "Smith, John K."
-      author = author.gsub(/[[:space:]]([A-Z]\.)?(-?[A-Z]\.)$/, ', \1\2') unless author.include?(",")
+      unless author.include?(',')
+        author = author.gsub(/[[:space:]]([A-Z]\.)?(-?[A-Z]\.)$/, ', \1\2')
+      end
 
       # remove spaces around hyphens
-      author = author.gsub(" - ", "-")
+      author = author.gsub(' - ', '-')
 
       # titleize strings
       # remove non-standard space characters
@@ -103,12 +108,15 @@ module Briard
     end
 
     def is_personal_name?(author)
-      return false if author.fetch("nameType", nil) == "Organizational"
-      return true if Array.wrap(author.fetch("nameIdentifiers", nil)).find { |a| a["nameIdentifierScheme"] == "ORCID" }.present? ||
-                     author.fetch("familyName", "").present? ||
-                     (author.fetch("name", "").include?(",") &&
-                     author.fetch("name", "").exclude?(";")) ||
-                     name_exists?(author.fetch("name", "").split(" ").first)
+      return false if author.fetch('nameType', nil) == 'Organizational'
+      return true if Array.wrap(author.fetch('nameIdentifiers', nil)).find do |a|
+                       a['nameIdentifierScheme'] == 'ORCID'
+                     end.present? ||
+                     author.fetch('familyName', '').present? ||
+                     (author.fetch('name', '').include?(',') &&
+                     author.fetch('name', '').exclude?(';')) ||
+                     name_exists?(author.fetch('name', '').split.first)
+
       false
     end
 
@@ -126,14 +134,14 @@ module Briard
 
     def authors_as_string(authors)
       Array.wrap(authors).map do |a|
-        if a["familyName"].present?
-          [a["familyName"], a["givenName"]].join(", ")
-        elsif a["type"] == "Person"
-          a["name"]
-        elsif a["name"].present?
-          "{" + a["name"] + "}"
+        if a['familyName'].present?
+          [a['familyName'], a['givenName']].join(', ')
+        elsif a['type'] == 'Person'
+          a['name']
+        elsif a['name'].present?
+          "{#{a['name']}}"
         end
-      end.join(" and ").presence
+      end.join(' and ').presence
     end
 
     def get_affiliations(affiliations)
@@ -144,22 +152,22 @@ module Briard
           affiliation_identifier_scheme = nil
           scheme_uri = nil
         else
-          if a["affiliationIdentifier"].present?
-            affiliation_identifier = a["affiliationIdentifier"]
-            if a["schemeURI"].present?
-              schemeURI = a["schemeURI"].end_with?("/") ? a["schemeURI"] : a["schemeURI"] + "/"
+          if a['affiliationIdentifier'].present?
+            affiliation_identifier = a['affiliationIdentifier']
+            if a['schemeURI'].present?
+              schemeURI = a['schemeURI'].end_with?('/') ? a['schemeURI'] : "#{a['schemeURI']}/"
             end
-            affiliation_identifier = !affiliation_identifier.to_s.start_with?("https://") && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
+            affiliation_identifier = !affiliation_identifier.to_s.start_with?('https://') && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
           end
-          name = a["__content__"].to_s.squish.presence
-          affiliation_identifier_scheme = a["affiliationIdentifierScheme"]
-          scheme_uri = a["SchemeURI"]
+          name = a['__content__'].to_s.squish.presence
+          affiliation_identifier_scheme = a['affiliationIdentifierScheme']
+          scheme_uri = a['SchemeURI']
         end
 
-        { "name" => name,
-          "affiliationIdentifier" => affiliation_identifier,
-          "affiliationIdentifierScheme" => affiliation_identifier_scheme,
-          "schemeUri" => scheme_uri }.compact
+        { 'name' => name,
+          'affiliationIdentifier' => affiliation_identifier,
+          'affiliationIdentifierScheme' => affiliation_identifier_scheme,
+          'schemeUri' => scheme_uri }.compact
       end.presence
     end
   end

data/lib/briard/cli.rb

@@ -1,7 +1,6 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
-require "thor"
+require 'thor'
 
 require_relative 'doi_utils'
 require_relative 'utils'
@@ -18,18 +17,18 @@ module Briard
     # from http://stackoverflow.com/questions/22809972/adding-a-version-option-to-a-ruby-thor-cli
     map %w[--version -v] => :__print_version
 
-    desc "--version, -v", "print the version"
+    desc '--version, -v', 'print the version'
     def __print_version
       puts Briard::VERSION
     end
 
-    desc "", "convert metadata"
-    method_option :from, aliases: "-f"
-    method_option :to, aliases: "-t", default: "schema_org"
-    method_option :regenerate, :type => :boolean, :force => false
-    method_option :style, aliases: "-s", default: "apa"
-    method_option :locale, aliases: "-l", default: "en-US"
-    method_option :show_errors, :type => :boolean, :force => false
+    desc '', 'convert metadata'
+    method_option :from, aliases: '-f'
+    method_option :to, aliases: '-t', default: 'schema_org'
+    method_option :regenerate, type: :boolean, force: false
+    method_option :style, aliases: '-s', default: 'apa'
+    method_option :locale, aliases: '-l', default: 'en-US'
+    method_option :show_errors, type: :boolean, force: false
     method_option :depositor
     method_option :email
     method_option :registrant
@@ -44,16 +43,16 @@ module Briard
                               depositor: options[:depositor],
                               email: options[:email],
                               registrant: options[:registrant])
-      to = options[:to] || "schema_org"
+      to = options[:to] || 'schema_org'
 
       if options[:show_errors] && !metadata.valid?
-        $stderr.puts metadata.errors
+        warn metadata.errors
       else
         puts metadata.send(to)
       end
     end
 
-    desc "", "encode"
+    desc '', 'encode'
     def encode(prefix)
       puts encode_doi(prefix)
     end