bolognese 1.8.18 → 1.9.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.8.18)
+    bolognese (1.9.5)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -19,7 +19,7 @@ PATH
       loofah (~> 2.0, >= 2.0.3)
       maremma (>= 4.7, < 5)
       namae (~> 1.0)
-      nokogiri (~> 1.10.4)
+      nokogiri (~> 1.11.2)
       oj (~> 3.10)
       oj_mimic_json (~> 1.0, >= 1.0.1)
       postrank-uri (~> 1.0, >= 1.0.18)
@@ -30,16 +30,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     benchmark_methods (0.7)
-    bibtex-ruby (5.1.5)
+    bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
     builder (3.2.4)
     citeproc (1.0.10)
@@ -48,15 +48,16 @@ GEM
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.5)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
+    concurrent-ruby (1.1.8)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     csl (1.5.2)
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.5)
     ebnf (2.1.2)
       htmlentities (~> 4.3)
       rdf (~> 3.1)
@@ -65,7 +66,7 @@ GEM
     edtf (3.0.6)
       activesupport (>= 3.0, < 7.0)
     excon (0.71.1)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.5)
       faraday
@@ -73,26 +74,26 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
-    haml (5.2.0)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashdiff (1.0.1)
     htmlentities (4.3.4)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
-    json (2.3.1)
-    json-canonicalization (0.2.0)
-    json-ld (3.1.4)
+    json (2.5.1)
+    json-canonicalization (0.2.1)
+    json-ld (3.1.9)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.14)
       rack (~> 2.0)
       rdf (~> 3.1)
-    json-ld-preloaded (3.1.3)
+    json-ld-preloaded (3.1.5)
       json-ld (~> 3.1)
       rdf (~> 3.1)
     jsonlint (0.3.0)
@@ -100,10 +101,10 @@ GEM
       optimist (~> 3)
     latex-decode (0.3.2)
     link_header (0.0.8)
-    loofah (2.7.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maremma (4.7.2)
+    maremma (4.7.4)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -111,17 +112,18 @@ GEM
       faraday (~> 0.17.3)
       faraday-encoding (~> 0.0.4)
       faraday_middleware (~> 0.14.0)
-      nokogiri (~> 1.10.4)
+      nokogiri (~> 1.11.2)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    namae (1.0.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oj (3.10.15)
+    namae (1.1.1)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oj (3.11.5)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     postrank-uri (1.0.24)
@@ -129,47 +131,50 @@ GEM
       nokogiri (>= 1.8.0)
       public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.3)
-    rdf (3.1.6)
+    rdf (3.1.13)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.1.0)
       rdf (~> 3.1)
-    rdf-rdfa (3.1.2)
-      haml (~> 5.1)
+    rdf-rdfa (3.1.3)
+      haml (~> 5.2)
       htmlentities (~> 4.3)
-      rdf (~> 3.1, >= 3.1.2)
+      rdf (~> 3.1, >= 3.1.13)
       rdf-aggregate-repo (~> 3.1)
-      rdf-vocab (~> 3.1, >= 3.1.5)
+      rdf-vocab (~> 3.1, >= 3.1.11)
       rdf-xsd (~> 3.1)
-    rdf-rdfxml (3.1.0)
+    rdf-rdfxml (3.1.1)
       htmlentities (~> 4.3)
       rdf (~> 3.1)
       rdf-rdfa (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-turtle (3.1.2)
-      ebnf (~> 2.0)
-      rdf (~> 3.1, >= 3.1.2)
-    rdf-vocab (3.1.8)
-      rdf (~> 3.1, >= 3.1.2)
-    rdf-xsd (3.1.0)
+    rdf-turtle (3.1.3)
+      ebnf (~> 2.1)
+      rdf (~> 3.1, >= 3.1.8)
+    rdf-vocab (3.1.13)
+      rdf (~> 3.1, >= 3.1.12)
+    rdf-xsd (3.1.1)
       rdf (~> 3.1)
+      rexml (~> 3.2)
+    rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
+    rspec-support (3.10.2)
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
@@ -182,18 +187,17 @@ GEM
     sxp (1.1.0)
       rdf (~> 3.1)
     temple (0.8.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.1.0)
     tilt (2.0.10)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode_utils (1.4.0)
     vcr (3.0.3)
-    webmock (3.9.3)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -211,4 +215,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/bolognese.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '>= 4.7', '< 5'
   s.add_dependency 'faraday', '~> 0.17.3'
-  s.add_dependency 'nokogiri', '~> 1.10.4'
+  s.add_dependency 'nokogiri', '~> 1.11.2'
   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'

data/lib/bolognese/author_utils.rb

@@ -15,7 +15,7 @@ module Bolognese
     def get_one_author(author)
       # author is a string
       author = { "creatorName" => author } if author.is_a?(String)
-      
+
       # malformed XML
       return nil if author.fetch("creatorName", nil).is_a?(Array)
 
@@ -31,17 +31,17 @@ module Bolognese
 
       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" => 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
@@ -59,6 +59,7 @@ module Bolognese
       return author if family_name.present?
 
       if is_personal_name?(author)
+        Namae.options[:include_particle_in_family] = true
         names = Namae.parse(name)
         parsed_name = names.first
 
@@ -79,7 +80,7 @@ module Bolognese
           "affiliation" => Array.wrap(author.fetch("affiliation", nil)),
           "contributorType" => contributor_type }.compact
       else
-        { "nameType" => name_type, 
+        { "nameType" => name_type,
           "name" => name,
           "nameIdentifiers" => Array.wrap(name_identifiers),
           "affiliation" => Array.wrap(author.fetch("affiliation", nil)),

data/lib/bolognese/datacite_utils.rb

@@ -40,6 +40,7 @@ module Bolognese
       insert_language(xml)
       insert_alternate_identifiers(xml)
       insert_related_identifiers(xml)
+      insert_related_items(xml)
       insert_sizes(xml)
       insert_formats(xml)
       insert_version(xml)
@@ -86,7 +87,7 @@ module Bolognese
       end
       Array.wrap(person["affiliation"]).each do |affiliation|
         attributes = { "affiliationIdentifier" => affiliation["affiliationIdentifier"], "affiliationIdentifierScheme" => affiliation["affiliationIdentifierScheme"], "schemeURI" => affiliation["schemeUri"] }.compact
-        xml.affiliation(affiliation["name"], attributes) 
+        xml.affiliation(affiliation["name"], attributes)
       end
     end
 
@@ -209,6 +210,71 @@ module Bolognese
       end
     end
 
+    def insert_related_items(xml)
+      return xml unless related_items.present?
+
+      xml.relatedItems do
+        related_items.each do |related_item|
+          attributes = {
+            'relatedItemType' => related_item["relatedItemType"],
+            'relationType' => related_item["relationType"],
+          }.compact
+
+          xml.relatedItem(related_item["relatedItem"], attributes) do
+
+            xml.relatedItemIdentifier(related_item["relatedItemIdentifier"]['relatedItemIdentifier'],
+              {
+                'relatedItemIdentifierType' => related_item["relatedItemIdentifier"]["relatedItemIdentifierType"],
+                'relatedMetadataScheme' => related_item["relatedItemIdentifier"]["relatedMetadataScheme"],
+                'schemeURI' => related_item["relatedItemIdentifier"]["schemeURI"],
+                'schemeType' => related_item["relatedItemIdentifier"]["schemeType"],
+              }.compact
+            )
+
+            xml.creators do
+              Array.wrap(related_item['creators']).each do |au|
+                xml.creator do
+                  insert_person(xml, au, "creator")
+                end
+              end
+            end
+
+            xml.titles do
+              Array.wrap(related_item['titles']).each do |title|
+                if title.is_a?(Hash)
+                  t = title
+                else
+                  t = {}
+                  t["title"] = title
+                end
+
+                attributes = { 'titleType' => t["titleType"], 'xml:lang' => t["lang"] }.compact
+                xml.title(t["title"], attributes)
+              end
+            end
+
+            xml.publicationYear(related_item['publicationYear'])
+            xml.volume(related_item['volume'])
+            xml.issue(related_item['issue'])
+            xml.number(related_item['number'], {'numberType' => related_item['numberType']}.compact)
+            xml.firstPage(related_item['firstPage'])
+            xml.lastPage(related_item['lastPage'])
+            xml.publisher(related_item['publisher'])
+            xml.edition(related_item['edition'])
+
+            xml.contributors do
+              Array.wrap(related_item["contributors"]).each do |con|
+                xml.contributor("contributorType" => con["contributorType"] || "Other") do
+                  insert_person(xml, con, "contributor")
+                end
+              end
+            end
+
+          end
+        end
+      end
+    end
+
     def insert_sizes(xml)
       xml.sizes do
         Array.wrap(sizes).each do |s|
@@ -238,12 +304,12 @@ module Bolognese
             r["rightsUri"] = normalize_id(rights)
           end
 
-          attributes = { 
+          attributes = {
             "rightsURI" => r["rightsUri"],
             "rightsIdentifier" => r["rightsIdentifier"],
             "rightsIdentifierScheme" => r["rightsIdentifierScheme"],
             "schemeURI" => r["schemeUri"],
-            "xml:lang" => r["lang"] 
+            "xml:lang" => r["lang"]
           }.compact
 
           xml.rights(r["rights"], attributes)
@@ -302,13 +368,14 @@ module Bolognese
                 xml.northBoundLatitude(geo_location.dig("geoLocationBox", "northBoundLatitude"))
               end
             end
-
             if geo_location["geoLocationPolygon"]
-              xml.geoLocationPolygon do
-                geo_location["geoLocationPolygon"].each do |polygon_point|
-                  xml.polygonPoint do
-                    xml.pointLatitude(polygon_point["pointLatitude"])
-                    xml.pointLongitude(polygon_point["pointLongitude"])
+              geo_location["geoLocationPolygon"].each do |geo_location_polygon|
+                xml.geoLocationPolygon do
+                  geo_location_polygon.each do |polygon_point|
+                    xml.polygonPoint do
+                      xml.pointLatitude(polygon_point.dig("polygonPoint", "pointLatitude"))
+                      xml.pointLongitude(polygon_point.dig("polygonPoint", "pointLongitude"))
+                    end
                   end
                 end
               end

data/lib/bolognese/metadata.rb

@@ -8,12 +8,12 @@ module Bolognese
 
     attr_accessor :string, :from, :sandbox, :meta, :regenerate, :issue, :show_errors
     attr_reader :doc, :page_start, :page_end
-    attr_writer :id, :provider_id, :client_id, :doi, :identifiers, :creators, :contributors, :titles, :publisher, 
+    attr_writer :id, :provider_id, :client_id, :doi, :identifiers, :creators, :contributors, :titles, :publisher,
                 :rights_list, :dates, :publication_year, :volume, :url, :version_info,
                 :subjects, :contributor, :descriptions, :language, :sizes,
                 :formats, :schema_version, :meta, :container, :agency,
                 :format, :funding_references, :state, :geo_locations,
-                :types, :content_url, :related_identifiers, :style, :locale, :date_registered
+                :types, :content_url, :related_identifiers, :related_items, :style, :locale, :date_registered
 
     def initialize(options={})
       options.symbolize_keys!
@@ -42,7 +42,7 @@ module Bolognese
         filename = File.basename(options[:input])
         ext = File.extname(options[:input])
         if %w(.bib .ris .xml .json).include?(ext)
-          hsh = { 
+          hsh = {
             "url" => options[:url],
             "state" => options[:state],
             "date_registered" => options[:date_registered],
@@ -57,7 +57,7 @@ module Bolognese
           exit 1
         end
       else
-        hsh = { 
+        hsh = {
           "url" => options[:url],
           "state" => options[:state],
           "date_registered" => options[:date_registered],
@@ -112,6 +112,7 @@ module Bolognese
         :language,
         :geo_locations,
         :related_identifiers,
+        :related_items,
         :formats,
         :sizes
       ).compact
@@ -150,7 +151,7 @@ module Bolognese
     def errors
       meta.fetch("errors", nil) || datacite_errors(xml: datacite, schema_version: schema_version)
     end
-    
+
     def descriptions
       @descriptions ||= meta.fetch("descriptions", nil)
     end
@@ -187,6 +188,10 @@ module Bolognese
       @related_identifiers ||= meta.fetch("related_identifiers", nil)
     end
 
+    def related_items
+      @related_items ||= meta.fetch("related_items", nil)
+    end
+
     def url
       @url ||= meta.fetch("url", nil)
     end