diff --git a/Gemfile.lock b/Gemfile.lock index c395f951f..b769943fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,14 +109,14 @@ GEM latex-decode (~> 0.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bolognese (1.4.3) + bolognese (1.4.5) activesupport (>= 4.2.5, < 6) benchmark_methods (~> 0.7) bibtex-ruby (~> 4.1) builder (~> 3.2, >= 3.2.2) citeproc-ruby (~> 1.1, >= 1.1.10) colorize (~> 0.8.1) - concurrent-ruby (~> 1.0.5) + concurrent-ruby (~> 1.1, >= 1.1.5) csl-styles (~> 1.0, >= 1.0.1.8) edtf (~> 3.0, >= 3.0.4) faraday (= 0.17.0) @@ -158,7 +158,7 @@ GEM colorize (0.8.1) commonmarker (0.17.13) ruby-enum (~> 0.5) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) countries (2.1.4) i18n_data (~> 0.8.0) money (~> 6.9) @@ -371,7 +371,7 @@ GEM pwqgen.rb (0.1.0) docopt (~> 0.5) sysrandom - rack (2.1.2) + rack (2.2.1) rack-accept (0.4.5) rack (>= 0.4) rack-cors (1.1.1) diff --git a/app/models/concerns/crosscitable.rb b/app/models/concerns/crosscitable.rb index 8e126610f..450531d65 100644 --- a/app/models/concerns/crosscitable.rb +++ b/app/models/concerns/crosscitable.rb @@ -86,7 +86,7 @@ def update_xml end.to_h.compact meta = from.present? ? send("read_" + from, { string: xml, doi: doi, sandbox: sandbox }.merge(read_attrs)) : {} - + xml = datacite_xml write_attribute(:xml, xml) @@ -125,19 +125,19 @@ def clean_xml(string) def well_formed_xml(string) return nil unless string.present? - + from_xml(string) || from_json(string) string end - + def from_xml(string) return nil unless string.start_with?('