dataverse 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 218801f555a41f3c5a6b5f780903c8558c5df6d1b149470e649a763bf2f7fd39
-  data.tar.gz: 498a782ecc5c745fa4b23c2bae2cd599b73a855dec072e91a1f96a254db9c8be
+  metadata.gz: 8cda403bd3db139414a52ba45bf1b56b4a049272c30c93c55992b565d641a884
+  data.tar.gz: 6417dbba3c344699a2eb1e108bbfe56fbc0e0beb35c485f9f817b4ba5c632c1a
 SHA512:
-  metadata.gz: 6cd333801c73346653ca2a9780f9cf99d22bb2d2e343d424dff73e48a6789dd87487309a8d7ae72b905bc6c9512de2f84d12f08e188c8a2d0cf1f18add2344c2
-  data.tar.gz: 65ad0e6cf95d2a557195414226da5fa751dde28e3111370beb46c5f24b00b65781ba40183d8b3dbee3fe568eab3520bf355920aa975e215326d20af5695978af
+  metadata.gz: 390ffc30a79de1d3a8ad498f1ddd6e09952dd6f0b01430a3c07de2ea66378cd0c3f05eea5722eae0541e95bae17732a03ad71171fc35068c14c5542473c8cc2b
+  data.tar.gz: 3cb02dfbf012360d234607669c30ce7ecbcf001269fe35bdde96ddf9abd2a9c4bd9edf20e748fad6bf604bd6767139fd253da831b29383b7dce0e98d73db705d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dataverse (0.1.0)
+    dataverse (0.1.4)
       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.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.1115)
     netrc (0.11.0)
     pry (0.14.0)
       coderay (~> 1.1)
@@ -45,9 +45,10 @@ GEM
     rspec-support (3.10.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -59,4 +60,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.15
+   2.2.18

data/README.md

@@ -1,8 +1,6 @@
-# Dataverse
+# Dataverse API gem
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dataverse`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This gem wraps the Dataverse API in a set of Ruby classes. You can use the classes to perform the API calls and process the result on the Ruby objects. It builds upon the rest-client gem to perform the low-level REST API calls. For more information about Dataverse and the API, see https://dataverse.org/ and https://guides.dataverse.org/en/latest/api/index.html
 
 ## Installation
 
@@ -14,15 +12,23 @@ gem 'dataverse'
 
 And then execute:
 
-    $ bundle install
+```
+$ bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install dataverse
+```
+$ gem install dataverse
+```
 
 ## Usage
 
-This gem wraps the Dataverse.org API in a set of Ruby classes. You can use the classes to perform the API calls and process the result on the Ruby objects. It builds upon the rest-client gem to perform the low-level REST API calls.
+First load the library with
+
+```ruby
+require 'dataverse'
+```
 
 In order to configure the API calls, you need to define at least two environment variables:
 
@@ -30,29 +36,31 @@ In order to configure the API calls, you need to define at least two environment
  - API_TOKEN: a token to identify and authorize the user. Note that for some API calls a superuser token may be required.
  - RESTCLIENT_LOG: if defined, will log the REST API calls to the given file. Set to 'stdout' if you want to log to screen.
 
+You can set these environment variables in a .env file and use the dotenv gem to load the variables. The file .env.template is provided as a starting point for you.
+
 ## Dataverse::Dataverse
 
-The class that captures the api dealing with dataverses.
+The class that captures the api dealing with Dataverse collections.
 
-### Accessing an existing dataverse
+### Accessing an existing Dataverse collection
 
-You can create a new instance by supplying the id or alias of an existing dataverse to the constructor:
+You can create a new instance by supplying the id or alias of an existing Dataverse collection to the constructor:
 
 ```ruby
 Dataverse::Dataverse.id('my_dataverse')
 # => #<Dataverse::Dataverse:0x0...>
 ```
 
-You can pass the value ':root' or use the #root class method if you want to access the root dataverse.
+You can pass the value ':root' or use the #root class method if you want to access the Dataverse root collection.
 
 ```ruby
 Dataverse::Dataverse.id(':root') == Dataverse::Dataverse.root
 # => true
 ```
 
-### Creating a new dataverse
+### Creating a new Dataverse collection
 
-To create a new dataverse, you should first open an instance for the parent dataverse, then call the #create method on it, supplying either a Hash, a file name or a JSON string.
+To create a new Dataverse collection, you should first open an instance for the parent Dataverse collection, then call the #create method on it, supplying either a Hash, a file name or a JSON string.
 
 ```ruby
 parent_dv = Dataverse::Dataverse.id('parent_dv')
@@ -77,14 +85,14 @@ Dataverse::Dataverse::TYPES
 #     "UNCATEGORIZED"]
 ```
 
-All the metadata of an existing dataverse can be retrieved as a Hash with the #rdm_data method:
+All the metadata of an existing Dataverse collection can be retrieved as a Hash with the #rdm_data method:
 
 ```ruby
 parent_dv.rdm_data
 # => {"id"=>5, "alias"=>"parent_dv", ...}
 ```
 
-The resulting Hash can be saved to a file and used to create a new dataverse:
+The resulting Hash can be saved to a file and used to create a new Dataverse collection:
 
 ```ruby
 data = parent_dv.rdm_data.dup
@@ -95,14 +103,14 @@ new_dv = parent_dv.create(filename)
 # => #<Dataverse::Dataverse:0x0...>
 ```
 
-### Deleting a dataverse
+### Deleting a Dataverse collection
 
 ```ruby
 new_dv.delete
 # => {"message" => "Dataverse 15 deleted"}
 ```
 
-### Publishing a dataverse
+### Publishing a Dataverse collection
 
 ```ruby
 new_dv.publish
@@ -112,11 +120,11 @@ new_dv.publish
 # => Dataverse::Error: Dataverse new_dv has already been published
 ```
 
-Note that if a dataverse was already published, the call will raise a Dataverse::Error exception.
+Note that if a Dataverse collection was already published, the call will raise a Dataverse::Error exception.
 
-### Access dataverse properties
+### Access properties of a Dataverse collection
 
-The Dataverse properties can be accessed similar to a Hash:
+The properties of a Dataverse collection can be accessed similar to a Hash:
 
 ```ruby
 parent_dv.keys
@@ -159,7 +167,7 @@ data
 # => {"alias" => "new_dv", ...}
 ```
 
-The id or alias that was used to instantiate the Dataverse:
+The id or alias that was used to instantiate the Dataverse collection:
 
 ```ruby
 parent_dv.id
@@ -179,7 +187,7 @@ parent_dv['alias']
 # => "parent_dv"
 ```
 
-### Report the data file size of a Dataverse (in bytes)
+### Report the data file size of a Dataverse collection (in bytes)
 
 ```ruby
 parent_dv.size
@@ -188,14 +196,14 @@ parent_dv.size
 
 ### Browsing
 
-Get an array of child dataverses and datasets:
+Get an array of child Dataverse collections and datasets:
 
 ```ruby
 parent_dv.children
 # => [#<Dataverse::Dataverse:0x0...>, #<Dataverse::Dataset:0x0...>]
 ```
 
-Iterate over all child dataverses recursively:
+Iterate over all child Dataverse collections recursively:
 
 ```ruby
 parent_dv.each_dataverse do |dv|
@@ -209,8 +217,8 @@ end
 Iterate over all child datasets recursively:
 
 ```ruby
-parent_dv.each_dataverse do |dv|
-    puts dv.size
+parent_dv.each_dataset do |ds|
+    puts ds.size
 end
 # => 123456
 # => 456123
@@ -223,7 +231,7 @@ The class that encapsulates the dataset related API.
 
 ### Accessing an existing dataset
 
-A new Dataset instance can be obtained from the parent Dataverse's #children call or can be directly instantiated if you know the dataset's id or persistent identifier:
+A new Dataset instance can be obtained from the parent Dataverse collection's #children call or can be directly instantiated if you know the dataset's id or persistent identifier:
 
 ```ruby
 ds = parent_dv.children[1]
@@ -238,7 +246,7 @@ Dataverse::Dataset.pid('doi:10.5072/FK2/J8SJZB')
 
 ### Creating a new dataset
 
-A new dataset can only be created on an existing dataverse. You should supply either a Hash, a file name or a JSON string to the #create_dataset method.
+A new dataset can only be created on an existing Dataverse collection. You should supply either a Hash, a file name or a JSON string to the #create_dataset method.
 
 ```ruby
 ds = parent_dv.create_dataset(
@@ -259,7 +267,7 @@ data = ds.raw_data
 # => {"datasetVersion" => {"metadataBlocks" => {"citation" => {...}}}}
 ```
 
-The resulting Hash can be used to create a new dataverse, either directly or by saving it to a file.
+The resulting Hash can be used to create a new dataset, either directly or by saving it to a file.
 
 ```ruby
 data = ds.raw_data
@@ -274,7 +282,7 @@ new_ds = parent_dv.create_dataset(filename)
 
 ### Importing a dataset
 
-The #import_dataset method on a dataverse allows to import an existing dataset. The dataset should be registred and its persisten identifier should be supplied in the pid argument. The data argument is similar to the #create_dataset method.
+The #import_dataset method on a Dataverse collection allows to import an existing dataset. The dataset should be registred and its persisten identifier should be supplied in the pid argument. The data argument is similar to the #create_dataset method.
 
 ```ruby
 data = 'dataset.json'
@@ -415,7 +423,7 @@ data = ds.export_metadata('schema.org')
 # => {"@context"=>"http://schema.org", "@type"=>"Dataset", ...}
 ```
 
-The resulting Hash can be used to create a new dataverse, either directly or by saving it to a file.
+The resulting Hash can be used to create a new dataset, either directly or by saving it to a file.
 
 ```ruby
 data = ds.raw_data
@@ -595,4 +603,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Dataverse project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/libis/dataverse_api/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Dataverse API project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/libis/dataverse_api/blob/master/CODE_OF_CONDUCT.md).

data/lib/dataverse/dataset.rb

@@ -25,7 +25,7 @@ module Dataverse
     end
 
     def delete
-      url = raise Error.new 'Can only delete draft version' unless draft_version
+      raise Error.new 'Can only delete draft version' unless draft_version
       versions
       result = call('versions/:draft', method: :delete)
       @version_data.delete(:draft)
@@ -61,7 +61,7 @@ module Dataverse
     end
 
     def size
-      data = call("storagesize". params: {includCached: 'true'})
+      data = call("storagesize", params: {includeCached: 'true'})
       data['message'][/[,\d]+/].delete(',').to_i
     end
 
@@ -140,6 +140,13 @@ module Dataverse
         .merge(version_data(version))
         .merge('metadata' => metadata(version: version))
         .merge('files' => files(version: version))
+        .tap do |h|
+          h['license'] = {
+            'label' => license_name,
+            'uri' => license_url,
+            'iconUrl' => license_icon
+          }
+        end
     end
 
     def raw_data(version: :latest, with_files: false)
@@ -188,6 +195,18 @@ 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)
@@ -255,7 +274,7 @@ module Dataverse
     end
 
     def version_data(version)
-      data = @version_data[resolve_version(version)].transform_keys {|k| k == 'id' ? 'versionId' : k}
+      @version_data[resolve_version(version)].transform_keys { |k| k == 'id' ? 'versionId' : k }
     end
 
     private
@@ -373,4 +392,4 @@ module Dataverse
     end
 
   end
-end
+end

data/lib/dataverse/dataverse.rb

@@ -127,7 +127,7 @@ module Dataverse
     end
 
     def export_metadata(md_type)
-      format = case md_type.to_s
+      case md_type.to_s
       when 'rdm'
         return rdm_data
       else

data/lib/dataverse/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataverse
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client