bolognese 1.6.2 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f153c7bf6a7dd69a2cf35844b9fe303574ebeb6f515a00581cea60955dc6d6
-  data.tar.gz: ebc11d65b789fb08e97dafa25c2e9e0b2ddfb6085011478498f2e619ebdd605c
+  metadata.gz: 6d9b80d36b9f15e7887ad094ed6bd8dede0ae1bf9eec3e90c5628ed536f746e7
+  data.tar.gz: 4d746ae8b815cf873840cc7e1c62475038ef649977c2a07c356059672ab1f43f
 SHA512:
-  metadata.gz: d30e6e90b55e93bf4febdef8cf5fe3aa17e1821e2ee317f521957cdee0e811f8f94ed07f929b974ea967a8e5e4b7f0c8e7c08f47bc9bee681e72702f263ac80e
-  data.tar.gz: e30113a9e7ceddb8772a8e26310c7bc9ecdb349c93a33596c4d2ff0167c12650631e7dee7860c32a2e4dd8323453ed6acd7315c292060aef5a03954fbca61682
+  metadata.gz: efb671e6feb5a1f6e9f849607b686b38505cd7f814f3bce86da05dc143150e9b52838598f4736e1676ac1147c9b028ec24e2c868ec31add03dc35ac557875727
+  data.tar.gz: 540cbb6605586c66fe18212115b1c108961a7fc2a02f4df750e49a852bfd9ac221150eab3c805eb40109a3d70e0747c88a4406daa5aa3f87fc2431b2d87e978d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.6.2)
+    bolognese (1.6.7)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -14,7 +14,7 @@ PATH
       faraday (= 0.17.0)
       gender_detector (~> 0.1.2)
       iso8601 (~> 0.9.1)
-      json-ld (~> 2.2, >= 2.2.1)
+      json-ld (~> 3.1, >= 3.1.4)
       jsonlint (~> 0.3.0)
       loofah (~> 2.0, >= 2.0.3)
       maremma (>= 4.3, < 5)
@@ -25,12 +25,12 @@ PATH
       postrank-uri (~> 1.0, >= 1.0.18)
       rdf-rdfxml (~> 3.1)
       rdf-turtle (~> 3.1)
-      thor (~> 0.19)
+      thor (~> 1.0, >= 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -56,7 +56,7 @@ GEM
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.2)
     docile (1.3.2)
     ebnf (1.2.0)
       rdf (~> 3.1)
@@ -79,18 +79,23 @@ GEM
       concurrent-ruby (~> 1.0)
     hashdiff (1.0.1)
     htmlentities (4.3.4)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
-    json-ld (2.2.1)
-      multi_json (~> 1.12)
-      rdf (>= 2.2.8, < 4.0)
+    json-canonicalization (0.2.0)
+    json-ld (3.1.4)
+      htmlentities (~> 4.3)
+      json-canonicalization (~> 0.2)
+      link_header (~> 0.0, >= 0.0.8)
+      multi_json (~> 1.14)
+      rack (~> 2.0)
+      rdf (~> 3.1)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
     latex-decode (0.3.1)
     link_header (0.0.8)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     maremma (4.7)
@@ -119,11 +124,11 @@ GEM
       nokogiri (>= 1.8.0)
       public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.3)
-    rdf (3.1.2)
+    rdf (3.1.3)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.1.0)
@@ -171,7 +176,7 @@ GEM
     sxp (1.1.0)
       rdf (~> 3.1)
     temple (0.8.2)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tzinfo (1.2.7)

data/bolognese.gemspec

@@ -15,15 +15,15 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
   s.required_ruby_version = '~> 2.3'
 
-  # Declary dependencies here, rather than in the Gemfile
+  # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '>= 4.3', '< 5'
-  s.add_dependency 'faraday', '0.17.0'
+  s.add_dependency 'faraday', "0.17.0"
   s.add_dependency 'nokogiri', '~> 1.10.4'
   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 'bibtex-ruby', '>= 5.1.0'
-  s.add_dependency 'thor', '~> 0.19'
+  s.add_dependency 'thor', '~> 1.0', '>= 1.0.1'
   s.add_dependency 'colorize', '~> 0.8.1'
   s.add_dependency 'namae', '~> 1.0'
   s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.8'
   s.add_dependency 'iso8601', '~> 0.9.1'
   s.add_dependency 'postrank-uri', '~> 1.0', '>= 1.0.18'
-  s.add_dependency 'json-ld', '~> 2.2', '>= 2.2.1'
+  s.add_dependency 'json-ld', '~> 3.1', '>= 3.1.4'
   s.add_dependency 'jsonlint', '~> 0.3.0'
   s.add_dependency 'oj', '~> 3.10'
   s.add_dependency "oj_mimic_json", "~> 1.0", ">= 1.0.1"

data/lib/bolognese/datacite_utils.rb

@@ -172,9 +172,9 @@ module Bolognese
     end
 
     def insert_version(xml)
-      return xml unless version.present?
+      return xml unless version_info.present?
 
-      xml.version(version)
+      xml.version(version_info)
     end
 
 
@@ -232,7 +232,13 @@ module Bolognese
             r["rightsUri"] = normalize_id(rights)
           end
 
-          attributes = { 'rightsURI' => r["rightsUri"], 'xml:lang' => r["lang"] }.compact
+          attributes = { 
+            "rightsURI" => r["rightsUri"],
+            "rightsIdentifier" => r["rightsIdentifier"],
+            "rightsIdentifierScheme" => r["rightsIdentifierScheme"],
+            "schemeURI" => r["schemeUri"],
+            "xml:lang" => r["lang"] 
+          }.compact
 
           xml.rights(r["rights"], attributes)
         end

data/lib/bolognese/metadata.rb

@@ -9,7 +9,7 @@ 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, 
-                :rights_list, :dates, :publication_year, :volume, :url, :version,
+                :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,
@@ -106,7 +106,7 @@ module Bolognese
         :publication_year,
         :descriptions,
         :rights_list,
-        :version,
+        :version_info,
         :subjects,
         :language,
         :geo_locations,
@@ -117,7 +117,8 @@ module Bolognese
 
       @regenerate = options[:regenerate] || read_options.present?
       # generate name for method to call dynamically
-      @meta = @from.present? ? send("read_" + @from, { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)) : {}
+      opts = { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)
+      @meta = @from.present? ? send("read_" + @from, **opts) : {}
     end
 
     def id
@@ -189,13 +190,10 @@ module Bolognese
       @url ||= meta.fetch("url", nil)
     end
 
-    def version
-      @version ||= meta.fetch("version", nil)
+    def version_info
+      @version_info ||= meta.fetch("version_info", nil) || meta.fetch("version", nil)
     end
 
-    # for backwards compatibility
-    alias_attribute :version_info, :version
-
     def publication_year
       @publication_year ||= meta.fetch("publication_year", nil)
     end

data/lib/bolognese/metadata_utils.rb

@@ -140,8 +140,14 @@ module Bolognese
         author = to_citeproc(creators)
       end
 
+      if types["resourceTypeGeneral"] == "Software" && version_info.present?
+        type = "book"
+      else
+        type = types["citeproc"]
+      end
+
       {
-        "type" => types["citeproc"],
+        "type" => type,
         "id" => normalize_doi(doi),
         "categories" => Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.presence,
         "language" => language,
@@ -158,7 +164,8 @@ module Bolognese
         "publisher" => publisher,
         "title" => parse_attributes(titles, content: "title", first: true),
         "URL" => url,
-        "version" => version
+        "copyright" => Array.wrap(rights_list).map { |l| l["rights"] }.first,
+        "version" => version_info
       }.compact.symbolize_keys
     end
 
@@ -180,7 +187,7 @@ module Bolognese
         "identifiers" => identifiers,
         "sizes" => sizes,
         "formats" => formats,
-        "version" => version,
+        "version" => version_info,
         "rights_list" => rights_list,
         "descriptions" => descriptions,
         "geo_locations" => geo_locations,

data/lib/bolognese/readers/bibtex_reader.rb

@@ -76,6 +76,7 @@ module Bolognese
                     "dateType" => "Issued" }]
                 end
         publication_year =  meta.try(:date).present? ? meta.date.to_s[0..3] : nil
+        rights_list = meta.try(:copyright).present? ? [hsh_to_spdx("rightsURI" => meta[:copyright])] : []
 
         { "id" => normalize_doi(doi),
           "types" => types,
@@ -90,7 +91,7 @@ module Bolognese
           "dates" => dates,
           "publication_year" => publication_year,
           "descriptions" => meta.try(:abstract).present? ? [{ "description" => meta.try(:abstract) && sanitize(meta.abstract.to_s).presence, "descriptionType" => "Abstract" }] : [],
-          "rights_list" =>  meta.try(:copyright).present? ? [{ "rightsUri" => meta.try(:copyright).to_s.presence }.compact] : [],
+          "rights_list" => rights_list,
           "state" => state
         }.merge(read_options)
       end

data/lib/bolognese/readers/citeproc_reader.rb

@@ -60,7 +60,7 @@ module Bolognese
                 end
         publication_year = get_date_from_date_parts(meta.fetch("issued", nil)).to_s[0..3]
         rights_list = if meta.fetch("copyright", nil)
-                        [{ "rightsUri" => normalize_url(meta.fetch("copyright")) }.compact]
+                        [hsh_to_spdx("rightsURI" => meta.fetch("copyright"))]
                       end
         related_identifiers = if meta.fetch("container-title", nil).present? && meta.fetch("ISSN", nil).present?
                                 [{ "type" => "Periodical",
@@ -121,7 +121,7 @@ module Bolognese
           "publication_year" => publication_year,
           "descriptions" => meta.fetch("abstract", nil).present? ? [{ "description" => sanitize(meta.fetch("abstract")), "descriptionType" => "Abstract" }] : [],
           "rights_list" => rights_list,
-          "version" => meta.fetch("version", nil),
+          "version_info" => meta.fetch("version", nil),
           "subjects" => subjects,
           "state" => state
         }.merge(read_options)

data/lib/bolognese/readers/codemeta_reader.rb

@@ -64,8 +64,8 @@ module Bolognese
         end
 
         has_title = meta.fetch("title", nil)
-
         titles =  has_title.nil? ?  [{ "title" => meta.fetch("name", nil) }] : [{ "title" => has_title }]  
+        rights_list = meta.fetch("licenseId", nil).present? ? [hsh_to_spdx("rightsIdentifier" => meta.fetch("licenseId"))] : nil
 
         { "id" => id,
           "types" => types,
@@ -80,8 +80,8 @@ module Bolognese
           "dates" => dates,
           "publication_year" => publication_year,
           "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : nil,
-          "rights_list" => [{ "rightsUri" => meta.fetch("license", nil) }.compact],
-          "version" => meta.fetch("version", nil),
+          "rights_list" => rights_list,
+          "version_info" => meta.fetch("version", nil),
           "subjects" => subjects,
           "state" => state
         }.merge(read_options)

data/lib/bolognese/readers/crossref_reader.rb

@@ -172,7 +172,7 @@ module Bolognese
           "publication_year" => publication_year,
           "descriptions" => crossref_description(bibliographic_metadata),
           "rights_list" => crossref_license(program_metadata),
-          "version" => nil,
+          "version_info" => nil,
           "subjects" => nil,
           "language" => nil,
           "sizes" => nil,
@@ -211,7 +211,7 @@ module Bolognese
         access_indicator = Array.wrap(program_metadata).find { |m| m["name"] == "AccessIndicators" }
         if access_indicator.present?
           Array.wrap(access_indicator["license_ref"]).map do |license|
-            { "rightsUri" => normalize_url(parse_attributes(license)) }
+            hsh_to_spdx("rightsURI" => parse_attributes(license))
           end.uniq
         else
           []

data/lib/bolognese/readers/datacite_reader.rb

@@ -117,9 +117,9 @@ module Bolognese
           if r.blank?
             nil
           elsif r.is_a?(String)
-            { "rights" => r }
+            name_to_spdx(r)
           elsif r.is_a?(Hash)
-            { "rights" => r["__content__"], "rightsUri" => normalize_url(r["rightsURI"]), "lang" => r["lang"] }.compact
+            hsh_to_spdx(r)
           end
         end.compact
         
@@ -235,7 +235,7 @@ module Bolognese
           "publication_year" => parse_attributes(meta.fetch("publicationYear", nil), first: true).to_s.strip.presence,
           "descriptions" => descriptions,
           "rights_list" => Array.wrap(rights_list),
-          "version" => meta.fetch("version", nil).to_s.presence,
+          "version_info" => meta.fetch("version", nil).to_s.presence,
           "subjects" => subjects,
           "language" => parse_attributes(meta.fetch("language", nil), first: true).to_s.strip.presence,
           "geo_locations" => geo_locations,

data/lib/bolognese/readers/npm_reader.rb

@@ -105,7 +105,7 @@ module Bolognese
           #"publication_year" => publication_year,
           "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : [],
           "rights_list" => rights_list,
-          "version" => meta.fetch("version", nil),
+          "version_info" => meta.fetch("version", nil),
           "subjects" => subjects
           #"state" => state
         }.merge(read_options)

data/lib/bolognese/readers/schema_org_reader.rb

@@ -107,10 +107,9 @@ module Bolognese
           Array.wrap(schema_org_is_supplement_to(meta)) +
           Array.wrap(schema_org_is_supplemented_by(meta))
 
-        rights_list = [{
-          "rightsUri" => parse_attributes(meta.fetch("license", nil), content: "id", first: true),
-          "rights" => parse_attributes(meta.fetch("license", nil), content: "name", first: true)
-        }]
+        rights_list = Array.wrap(meta.fetch("license", nil)).compact.map do |rl|
+          hsh_to_spdx("__content__" => rl["name"], "rightsURI" => rl["id"])
+        end
 
         funding_references = Array.wrap(meta.fetch("funder", nil)).compact.map do |fr|
           if fr["@id"].present?
@@ -178,7 +177,7 @@ module Bolognese
           "dates" => dates,
           "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : nil,
           "rights_list" => rights_list,
-          "version" => meta.fetch("version", nil).to_s.presence,
+          "version_info" => meta.fetch("version", nil).to_s.presence,
           "subjects" => subjects,
           "state" => state,
           "schema_version" => meta.fetch("schemaVersion", nil).to_s.presence,

data/lib/bolognese/utils.rb

@@ -2,13 +2,44 @@
 
 module Bolognese
   module Utils
-    LICENSE_NAMES = {
-      "http://creativecommons.org/publicdomain/zero/1.0/" => "Public Domain (CC0 1.0)",
-      "http://creativecommons.org/licenses/by/3.0/" => "Creative Commons Attribution 3.0 (CC-BY 3.0)",
-      "http://creativecommons.org/licenses/by/4.0/" => "Creative Commons Attribution 4.0 (CC-BY 4.0)",
-      "http://creativecommons.org/licenses/by-nc/4.0/" => "Creative Commons Attribution Noncommercial 4.0 (CC-BY-NC 4.0)",
-      "http://creativecommons.org/licenses/by-sa/4.0/" => "Creative Commons Attribution Share Alike 4.0 (CC-BY-SA 4.0)",
-      "http://creativecommons.org/licenses/by-nc-nd/4.0/" => "Creative Commons Attribution Noncommercial No Derivatives 4.0 (CC-BY-NC-ND 4.0)"
+    NORMALIZED_LICENSES = {
+      "https://creativecommons.org/licenses/by/1.0" => "https://creativecommons.org/licenses/by/1.0/legalcode",
+      "https://creativecommons.org/licenses/by/2.0" => "https://creativecommons.org/licenses/by/2.0/legalcode",
+      "https://creativecommons.org/licenses/by/2.5" => "https://creativecommons.org/licenses/by/2.5/legalcode",
+      "https://creativecommons.org/licenses/by/3.0" => "https://creativecommons.org/licenses/by/3.0/legalcode",
+      "https://creativecommons.org/licenses/by/4.0" => "https://creativecommons.org/licenses/by/4.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc/1.0" => "https://creativecommons.org/licenses/by-nc/1.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc/2.0" => "https://creativecommons.org/licenses/by-nc/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc/2.5" => "https://creativecommons.org/licenses/by-nc/2.5/legalcode",
+      "https://creativecommons.org/licenses/by-nc/3.0" => "https://creativecommons.org/licenses/by-nc/3.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc/4.0" => "https://creativecommons.org/licenses/by-nc/4.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd-nc/1.0" => "https://creativecommons.org/licenses/by-nd-nc/1.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd-nc/2.0" => "https://creativecommons.org/licenses/by-nd-nc/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd-nc/2.5" => "https://creativecommons.org/licenses/by-nd-nc/2.5/legalcode",
+      "https://creativecommons.org/licenses/by-nd-nc/3.0" => "https://creativecommons.org/licenses/by-nd-nc/3.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd-nc/4.0" => "https://creativecommons.org/licenses/by-nd-nc/4.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-sa/1.0" => "https://creativecommons.org/licenses/by-nc-sa/1.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-sa/2.0" => "https://creativecommons.org/licenses/by-nc-sa/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-sa/2.5" => "https://creativecommons.org/licenses/by-nc-sa/2.5/legalcode",
+      "https://creativecommons.org/licenses/by-nc-sa/3.0" => "https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-sa/4.0" => "https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd/1.0" => "https://creativecommons.org/licenses/by-nd/1.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd/2.0" => "https://creativecommons.org/licenses/by-nd/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd/2.5" => "https://creativecommons.org/licenses/by-nd/2.5/legalcode",
+      "https://creativecommons.org/licenses/by-nd/3.0" => "https://creativecommons.org/licenses/by-nd/3.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd/4.0" => "https://creativecommons.org/licenses/by-nd/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-sa/1.0" => "https://creativecommons.org/licenses/by-sa/1.0/legalcode",
+      "https://creativecommons.org/licenses/by-sa/2.0" => "https://creativecommons.org/licenses/by-sa/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-sa/2.5" => "https://creativecommons.org/licenses/by-sa/2.5/legalcode",
+      "https://creativecommons.org/licenses/by-sa/3.0" => "https://creativecommons.org/licenses/by-sa/3.0/legalcode",
+      "https://creativecommons.org/licenses/by-sa/4.0" => "https://creativecommons.org/licenses/by-sa/4.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-nd/1.0" => "https://creativecommons.org/licenses/by-nc-nd/1.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-nd/2.0" => "https://creativecommons.org/licenses/by-nc-nd/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-nd/2.5" => "https://creativecommons.org/licenses/by-nc-nd/2.5/legalcode",
+      "https://creativecommons.org/licenses/by-nc-nd/3.0" => "https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode",
+      "https://creativecommons.org/licenses/by-nc-nd/4.0" => "https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode",
+      "https://creativecommons.org/licenses/publicdomain" => "https://creativecommons.org/licenses/publicdomain/",
+      "https://creativecommons.org/publicdomain/zero/1.0" => "https://creativecommons.org/publicdomain/zero/1.0/legalcode",
     }
 
     DC_TO_SO_TRANSLATIONS = {
@@ -475,7 +506,7 @@ module Bolognese
       nil
     end
 
-    def normalize_url(id)
+    def normalize_url(id, options={})
       return nil unless id.present?
 
       # handle info URIs
@@ -485,13 +516,23 @@ module Bolognese
       uri = Addressable::URI.parse(id)
 
       return nil unless uri && uri.host && %w(http https ftp).include?(uri.scheme)
+  
+      # optionally turn into https URL
+      uri.scheme = "https" if options[:https]
 
       # clean up URL
-      PostRank::URI.clean(id)
+      uri.path = PostRank::URI.clean(uri.path)
+
+      uri.to_s
     rescue Addressable::URI::InvalidURIError
       nil
     end
 
+    def normalize_cc_url(id)
+      id = normalize_url(id, https: true)
+      NORMALIZED_LICENSES.fetch(id, id)
+    end
+
     def normalize_orcid(orcid)
       orcid = validate_orcid(orcid)
       return nil unless orcid.present?
@@ -1056,6 +1097,45 @@ module Bolognese
       error_array
     end
 
+    def name_to_spdx(name)
+      spdx = JSON.load(File.read(File.expand_path('../../../resources/spdx/licenses.json', __FILE__))).fetch("licenses")
+      license = spdx.find { |l| l["name"] == name || l["licenseId"] == name || l["seeAlso"].first == normalize_cc_url(name) }
+
+      if license
+        {
+          "rights" => license["name"],
+          "rightsUri" => license["seeAlso"].first,
+          "rightsIdentifier" => license["licenseId"],
+          "rightsIdentifierScheme" => "SPDX",
+          "schemeUri" => "https://spdx.org/licenses/" }.compact
+      else
+        { "rights" => name }
+      end
+    end
+
+    def hsh_to_spdx(hsh)
+      spdx = JSON.load(File.read(File.expand_path('../../../resources/spdx/licenses.json', __FILE__))).fetch("licenses")
+      license = spdx.find { |l| l["licenseId"] == hsh["rightsIdentifier"] || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) }
+
+      if license
+        {
+          "rights" => license["name"],
+          "rightsUri" => license["seeAlso"].first,
+          "rightsIdentifier" => license["licenseId"],
+          "rightsIdentifierScheme" => "SPDX",
+          "schemeUri" => "https://spdx.org/licenses/",
+          "lang" => hsh["lang"] }.compact
+      else
+        {
+          "rights" => hsh["__content__"],
+          "rightsUri" => hsh["rightsURI"],
+          "rightsIdentifier" => hsh["rightsIdentifier"],
+          "rightsIdentifierScheme" => hsh["rightsIdentifierScheme"],
+          "schemeUri" => hsh["schemeUri"],
+          "lang" => hsh["lang"] }.compact
+      end
+    end
+
     def name_to_fos(name)
       # first find subject in Fields of Science (OECD)
       fos = JSON.load(File.read(File.expand_path('../../../resources/oecd/fos-mappings.json', __FILE__))).fetch("fosFields")