more flexible spdx parsing

datacite · Jun 29, 2020 · 379e153 · 379e153
1 parent 8abcee1
commit 379e153
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.6.7)
+    bolognese (1.6.8)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -56,7 +56,7 @@ GEM
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
-    diff-lcs (1.4.2)
+    diff-lcs (1.4.3)
     docile (1.3.2)
     ebnf (1.2.0)
       rdf (~> 3.1)
@@ -187,7 +187,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

diff --git a/lib/bolognese/utils.rb b/lib/bolognese/utils.rb
@@ -1127,8 +1127,8 @@ def hsh_to_spdx(hsh)
           "lang" => hsh["lang"] }.compact
       else
         {
-          "rights" => hsh["__content__"],
-          "rightsUri" => hsh["rightsURI"],
+          "rights" => hsh["__content__"] || hsh["rights"],
+          "rightsUri" => hsh["rightsURI"] || hsh["rightsUri"],
           "rightsIdentifier" => hsh["rightsIdentifier"],
           "rightsIdentifierScheme" => hsh["rightsIdentifierScheme"],
           "schemeUri" => hsh["schemeUri"],

diff --git a/lib/bolognese/version.rb b/lib/bolognese/version.rb
@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end