dataverse 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b1b7ca158eabe9bc66b2bd0e83a6e1da6aa0fe6984acef57119a477bc0252d
-  data.tar.gz: 426a3872a464ec3954b71b1c87851795be6ac219ef2f9777e38748f2c00b4914
+  metadata.gz: 2da0e7678288d4f1091c613efaef0214423da1c678f5dea4f905ba0117d6309e
+  data.tar.gz: 5529f3d38a3625932b4e181dcbef378bc8dc92edb9bdd8dd4a60a3044cb2c786
 SHA512:
-  metadata.gz: a3bb597791841213b4c1b445e62b511f5de2226e55ade9b16134afa3d96b7963892e42d429397a938237bb02f596662ba757d0497981c7419cdb284e0ecc1c32
-  data.tar.gz: cd3bf30ffc312df8142d2c176c3ecc7caddafb9e6a47bdcff2a364236d7e2841de05d8d789ff87cbf97efe32021e541cd1418ea515e4665edba1feaa404457f3
+  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.8)
+    dataverse (0.1.10)
       rest-client (~> 2.0)
 
 GEM
@@ -19,7 +19,7 @@ GEM
     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)
@@ -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/dataverse.rb

@@ -74,28 +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'
             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)
@@ -106,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.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataverse
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-07 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.1.6
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Dataverse API.