dataverse 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37541ec28714a720b0b89aa7cd2edb75ed6b54f3dcbba34ee5abee4616698713
-  data.tar.gz: a3d02df5cdbae33b1f1727b8789ff43917b0aa4a5ad452992b9966e16d8c5222
+  metadata.gz: 2da0e7678288d4f1091c613efaef0214423da1c678f5dea4f905ba0117d6309e
+  data.tar.gz: 5529f3d38a3625932b4e181dcbef378bc8dc92edb9bdd8dd4a60a3044cb2c786
 SHA512:
-  metadata.gz: 77f434897ca319d5c427b4397c21099f971f1ffe8c81d42775d650a706a97737b3d02b3cf138c37d630721eb85bd5dfa3412cec563a3caad684ea5bbce376dc8
-  data.tar.gz: 41ef2bd28fe675ef98e7d2fce66aa7c4be932d3f32d7630123d84d9afa0800fe981995430cbc19febe67dde5f03789b2cbfafa97111dca75aae085f159fd51d9
+  metadata.gz: b9217fc9aa689af803b1658e3d2549aa7f269f027afc2776d9c0d211a26df2dbe98c708fe64bfa20179835f5089afae147a8bf60d87f4e4c8bec5a0a8c15d0ba
+  data.tar.gz: a5adaec85a22668edd06b6b0598233bf78335cec5fd62882b902a5d57b99859fb4fd3c486597c127450fbf42b8f6cbe64cd14c2cf25ebf00a8a7d2f5b0c09226

data/.gitignore

@@ -14,3 +14,4 @@
 
 /*.json
 /*.xml
+/*.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dataverse (0.1.7)
+    dataverse (0.1.10)
       rest-client (~> 2.0)
 
 GEM
@@ -14,12 +14,12 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     netrc (0.11.0)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -45,7 +45,7 @@ GEM
     rspec-support (3.10.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
 
 PLATFORMS
   ruby
@@ -60,4 +60,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.32
+   2.3.25

data/lib/dataverse/base.rb

@@ -49,7 +49,7 @@ module Dataverse
       self.class.api_call(url, **args)
     end
 
-    def self.api_call(url, method: :get, headers: {},  params: {}, body: nil, format: :api, block: nil, options: {})
+    def self.api_call(url, method: :get, headers: {},  params: {}, body: nil, format: :api, block: nil, timeout: 120, options: {})
 
       unless ENV.has_key?('API_URL') && ENV.has_key?('API_TOKEN')
         raise Error.new("Set environment variables 'API_URL' and 'API_TOKEN'")
@@ -83,6 +83,7 @@ module Dataverse
         url: url,
         headers: headers,
         payload: body,
+        timeout: timeout,
         # log: STDOUT,
         **options
       )
@@ -117,8 +118,8 @@ module Dataverse
   end
 end
 
-# if log = ENV['RESTCLIENT_LOG']
-#   RestClient.log = STDOUT if log.upcase == 'STDOUT'
-#   RestClient.log = STDERR if log.upcase == 'STDERR'
-#   RestClient.log = log
-# end
+if log = ENV['RESTCLIENT_LOG']
+  RestClient.log = STDOUT if log.upcase == 'STDOUT'
+  RestClient.log = STDERR if log.upcase == 'STDERR'
+  RestClient.log = log
+end

data/lib/dataverse/dataset.rb

@@ -286,12 +286,14 @@ module Dataverse
 
     def process_data(data)
       return {} if data.nil? || data.empty?
+      return {} unless data.has_key?('latestVersion')
       version_data = data.delete('latestVersion')
       process_version_data(version_data)
       data
     end
 
     def process_version_data(data)
+      return nil unless data
       metadata = pack_metadata(data.delete('metadataBlocks'))
       files = pack_files(data.delete('files'))
       version = get_version_number(data)
@@ -318,7 +320,7 @@ module Dataverse
 
     def pack_metadata(metadata)
       data = {}
-      metadata.each_value do |block|
+      (metadata || {}).each_value do |block|
         block['fields'].each do |field|
           data[field['typeName']] = field_to_value(field)
         end

data/lib/dataverse/dataverse.rb

@@ -74,27 +74,65 @@ module Dataverse
       api_call("dataverses/#{id}/#{url}", **args)
     end
 
-    def children
-      @children ||= begin
-        result = []
-        data = call("contents")
-        data.each do |x|
+    def each_child(&block)
+      data = call("contents")
+      data.each do |x|
+        begin
           case x['type']
           when 'dataverse'
-            result << Dataverse.id(x['id'])
+            dv = Dataverse.id(x['id'])
+            data << (block_given? ? yield(child) : child)
+
           when 'dataset'
-            result << Dataset.id(x['id'])
+            ds = Dataset.id(x['id'])
+            result << ds if ds.version
           else
             raise Error.new("Unsupported type: #{x['type']} (#{x['name']})")
           end
+        rescue => e
+          puts "ERROR: Skipped creating #{x['type']} object '#{x['id']}' : '#{e.message}'."
+        end
+      end
+      result
+    end
+
+
+    def children(&block)
+      if @children && @children.is_a?(Array)
+        @children.each { |child| yield(child) } if block_given?
+      else
+        @children = begin
+          result = []
+          data = call("contents")
+          data.each do |x|
+            begin
+              case x['type']
+              when 'dataverse'
+                dv = Dataverse.id(x['id'])
+                yield dv if block_given?
+                result << dv
+              when 'dataset'
+                ds = Dataset.id(x['id'])
+                if ds.version
+                  yield ds if block_given?
+                  result << ds
+                end
+              else
+                raise Error.new("Unsupported type: #{x['type']} (#{x['name']})")
+              end
+            rescue => e
+              puts "ERROR: Skipped #{x['type']} object '#{x['id']}' : '#{e.message}'."
+            end
+          end
+          result
         end
-        result
       end
+      @children
     end
 
     def each_dataverse(&block)
       data = []
-      children.each do |child|
+      children do |child|
         if child.is_a?(Dataverse)
           data << (block_given? ? yield(child) : child)
           data += child.each_dataverse(&block)
@@ -105,7 +143,7 @@ module Dataverse
 
     def each_dataset(&block)
       data = []
-      children.each do |child|
+      children do |child|
         if child.is_a?(Dataverse)
           data += child.each_dataset(&block)
         elsif child.is_a?(Dataset)

data/lib/dataverse/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataverse
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2023-06-02 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.32
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Dataverse API.