dataverse 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cda403bd3db139414a52ba45bf1b56b4a049272c30c93c55992b565d641a884
-  data.tar.gz: 6417dbba3c344699a2eb1e108bbfe56fbc0e0beb35c485f9f817b4ba5c632c1a
+  metadata.gz: 37541ec28714a720b0b89aa7cd2edb75ed6b54f3dcbba34ee5abee4616698713
+  data.tar.gz: a3d02df5cdbae33b1f1727b8789ff43917b0aa4a5ad452992b9966e16d8c5222
 SHA512:
-  metadata.gz: 390ffc30a79de1d3a8ad498f1ddd6e09952dd6f0b01430a3c07de2ea66378cd0c3f05eea5722eae0541e95bae17732a03ad71171fc35068c14c5542473c8cc2b
-  data.tar.gz: 3cb02dfbf012360d234607669c30ce7ecbcf001269fe35bdde96ddf9abd2a9c4bd9edf20e748fad6bf604bd6767139fd253da831b29383b7dce0e98d73db705d
+  metadata.gz: 77f434897ca319d5c427b4397c21099f971f1ffe8c81d42775d650a706a97737b3d02b3cf138c37d630721eb85bd5dfa3412cec563a3caad684ea5bbce376dc8
+  data.tar.gz: 41ef2bd28fe675ef98e7d2fce66aa7c4be932d3f32d7630123d84d9afa0800fe981995430cbc19febe67dde5f03789b2cbfafa97111dca75aae085f159fd51d9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dataverse (0.1.4)
+    dataverse (0.1.7)
       rest-client (~> 2.0)
 
 GEM
@@ -19,12 +19,12 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     netrc (0.11.0)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -42,10 +42,10 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
 
 PLATFORMS
   ruby
@@ -60,4 +60,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.18
+   2.2.32

data/lib/dataverse/dataset.rb

@@ -141,10 +141,11 @@ module Dataverse
         .merge('metadata' => metadata(version: version))
         .merge('files' => files(version: version))
         .tap do |h|
-          h['license'] = {
-            'label' => license_name,
-            'uri' => license_url,
-            'iconUrl' => license_icon
+          h['license'] ||= {
+            'name' => license_spdx(h),
+            'label' => license_name(h),
+            'uri' => license_url(h),
+            'iconUrl' => license_icon(h)
           }
         end
     end
@@ -195,18 +196,6 @@ module Dataverse
       end
     end
 
-    def license_url
-      fetch('termsOfUse')[/(?<=href=")[^"]*(?=")/] rescue nil
-    end
-
-    def license_name
-      fetch('termsOfUse')[/[^>]*(?=<\/a>.$)/] rescue nil
-    end
-
-    def license_icon
-      fetch('termsOfUse')[/(?<=src=")[^"]*(?=")/] rescue nil
-    end
-
     protected
 
     def initialize(id)
@@ -279,6 +268,22 @@ module Dataverse
 
     private
 
+    def license_url(h)
+      h.fetch('termsOfUse')[/(?<=href=")[^"]*(?=")/] rescue nil
+    end
+
+    def license_name(h)
+      h.fetch('termsOfUse')[/[^>]*(?=<\/a>.$)/] rescue nil
+    end
+
+    def license_icon(h)
+      h.fetch('termsOfUse')[/(?<=src=")[^"]*(?=")/] rescue nil
+    end
+
+    def license_spdx(h)
+      h.fetch('termsOfUse')[/(?<=data-spdx=")[^"]*(?=")/] rescue nil
+    end
+
     def process_data(data)
       return {} if data.nil? || data.empty?
       version_data = data.delete('latestVersion')

data/lib/dataverse/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dataverse
-  VERSION = "0.1.4"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataverse
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Dataverse API.