ro-crate 0.4.17 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad52a377a6affc48a0923460f3db8ebc5209f520f918a57097d74863114d7e42
-  data.tar.gz: bef654ae3d00ebd302c62fda5b53789c63ecda1295964667133eef47692731dd
+  metadata.gz: aa3bf8a8cdaa985143e1e2988d4fc24e14aad40bfd55763b4be17af23c8fa36a
+  data.tar.gz: 190326475ec90f7328e86252dd4f0c1150750ba8298fef7ba8337291ae988e21
 SHA512:
-  metadata.gz: 907b74cff05114843bac2710a54fe141587f55b577785075bdaca49c88aa4051b26dc66785c80a1cb9c4cdcfa66030509b0bf02cc1ff82b452f18e37d755ad2a
-  data.tar.gz: f2843ab1c44d290cee58f92ff302bf1a1cfb9f4f0a5275c400ff4fcca3b45d5a0470deb613730309eae6a9dead572433ebfc7d874749ab3311585077968d8b46
+  metadata.gz: 7cf568838eba39df6ff3770456a8f2133efe8797d1b916b0acf4523f1830623120e14e3a3e8d3e5bbbf09d7960fe5afc585389010ab674394cc80b3c944363d7
+  data.tar.gz: 151807e2411c7d7d09ef2930f75b1eca9f1274fce14ca28d084c7b609268defc70803832697d79b68b9efe282ed63b0af1b179fd1cb0de2dba641798b331afe9

data/.github/workflows/tests.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
       fail-fast: false
     steps:
       - name: Checkout

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.5
+ruby-3.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ro-crate (0.4.17)
+    ro-crate (0.5.0)
       addressable (>= 2.7, < 2.9)
       rubyzip (~> 2.0.0)
 
@@ -14,9 +14,10 @@ GEM
       safe_yaml (~> 1.0.0)
     docile (1.3.5)
     hashdiff (1.0.1)
-    power_assert (1.1.3)
+    power_assert (2.0.1)
     public_suffix (4.0.6)
     rake (13.0.0)
+    rexml (3.2.5)
     rubyzip (2.0.0)
     safe_yaml (1.0.5)
     simplecov (0.21.2)
@@ -25,7 +26,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    test-unit (3.2.9)
+    test-unit (3.5.3)
       power_assert
     webmock (3.8.3)
       addressable (>= 2.3.6)
@@ -38,9 +39,10 @@ PLATFORMS
 
 DEPENDENCIES
   rake (~> 13.0.0)
+  rexml (~> 3.2.5)
   ro-crate!
   simplecov (~> 0.21.2)
-  test-unit (~> 3.2.3)
+  test-unit (~> 3.5.3)
   webmock (~> 3.8.3)
   yard (~> 0.9.25)
 

data/lib/ro_crate/model/crate.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module ROCrate
   ##
   # A Ruby abstraction of an RO-Crate.
@@ -20,8 +22,8 @@ module ROCrate
     ##
     # Initialize an empty RO-Crate.
     def initialize(id = IDENTIFIER, properties = {})
-      @data_entities = []
-      @contextual_entities = []
+      @data_entities = Set.new
+      @contextual_entities = Set.new
       super(self, nil, id, properties)
     end
 
@@ -144,8 +146,8 @@ module ROCrate
     # @return [Entity] the entity itself, or a clone of the entity "owned" by this crate.
     def add_contextual_entity(entity)
       entity = claim(entity)
-      contextual_entities.delete(entity) # Remove (then re-add) the entity if it exists
-      contextual_entities.push(entity)
+      contextual_entities.delete?(entity) # Remove (then re-add) the entity if it exists
+      contextual_entities.add(entity)
       entity
     end
 
@@ -156,8 +158,8 @@ module ROCrate
     # @return [Entity] the entity itself, or a clone of the entity "owned" by this crate.
     def add_data_entity(entity)
       entity = claim(entity)
-      data_entities.delete(entity) # Remove (then re-add) the entity if it exists
-      data_entities.push(entity)
+      data_entities.delete?(entity) # Remove (then re-add) the entity if it exists
+      data_entities.add(entity)
       entity
     end
 
@@ -189,7 +191,7 @@ module ROCrate
     ##
     # All the entities within the crate. Includes contextual entities, data entities, the crate itself and its metadata file.
     #
-    # @return [Array<Entity>]
+    # @return [Set<Entity>]
     def entities
       default_entities | data_entities | contextual_entities
     end
@@ -197,9 +199,9 @@ module ROCrate
     ##
     # Entities for the metadata file and crate itself, which should be present in all RO-Crates.
     #
-    # @return [Array<Entity>]
+    # @return [Set<Entity>]
     def default_entities
-      [metadata, preview, self]
+      Set.new([metadata, preview, self])
     end
 
     def properties
@@ -217,7 +219,7 @@ module ROCrate
     #
     # @return [Addressable::URI]
     def canonical_id
-      Addressable::URI.parse("arcp://uuid,#{uuid}").join(id)
+      @canonical_id ||= Addressable::URI.parse("arcp://uuid,#{uuid}").join(id)
     end
 
     ##
@@ -248,8 +250,7 @@ module ROCrate
       # Gather a map of entries, starting from the crate itself, then any directory data entities, then finally any
       # file data entities. This ensures in the case of a conflict, the more "specific" data entities take priority.
       entries = own_payload
-      non_self_entities = default_entities.reject { |e| e == self }
-      sorted_entities = (non_self_entities | data_entities).sort_by { |e| e.is_a?(ROCrate::Directory) ? 0 : 1 }
+      sorted_entities = (default_entities.delete(self) | data_entities).sort_by { |e| e.is_a?(ROCrate::Directory) ? 0 : 1 }
 
       sorted_entities.each do |entity|
         entity.payload.each do |path, entry|
@@ -277,7 +278,7 @@ module ROCrate
       entity = dereference(entity) if entity.is_a?(String)
       return unless entity
 
-      deleted = data_entities.delete(entity) || contextual_entities.delete(entity)
+      deleted = data_entities.delete?(entity) || contextual_entities.delete?(entity)
 
       if deleted && remove_orphaned
         crate_entities = crate.linked_entities(deep: true)

data/lib/ro_crate/model/entity.rb

@@ -251,7 +251,7 @@ module ROCrate
         value = properties[key] # We're doing this to call the JSONLDHash#[] method which wraps
         value = [value] if value.is_a?(JSONLDHash)
 
-        if value.is_a?(Array)
+        if value.respond_to?(:each)
           value.each do |v|
             if v.is_a?(JSONLDHash) && !linked.key?(v['@id'])
               entity = v.dereference

data/lib/ro_crate/reader.rb

@@ -182,7 +182,7 @@ module ROCrate
         crate.metadata.context = context
         preview_properties = entity_hash.delete(ROCrate::Preview::IDENTIFIER)
         preview_path = ::File.join(source, ROCrate::Preview::IDENTIFIER)
-        preview_path = ::File.exists?(preview_path) ? Pathname.new(preview_path) : nil
+        preview_path = ::File.exist?(preview_path) ? Pathname.new(preview_path) : nil
         if preview_properties || preview_path
           crate.preview = ROCrate::Preview.new(crate, preview_path, preview_properties || {})
         end

data/ro_crate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ro-crate'
-  s.version     = '0.4.17'
+  s.version     = '0.5.0'
   s.summary     = 'Create, manipulate, read RO-Crates.'
   s.authors     = ['Finn Bacall']
   s.email       = 'finn.bacall@manchester.ac.uk'
@@ -11,8 +11,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable', '>= 2.7', '< 2.9'
   s.add_runtime_dependency 'rubyzip', '~> 2.0.0'
   s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'test-unit', '~> 3.2.3'
+  s.add_development_dependency 'test-unit', '~> 3.5.3'
   s.add_development_dependency 'simplecov', '~> 0.21.2'
   s.add_development_dependency 'yard', '~> 0.9.25'
   s.add_development_dependency 'webmock', '~> 3.8.3'
+  s.add_development_dependency 'rexml', '~> 3.2.5'
 end

data/test/crate_test.rb

@@ -171,7 +171,8 @@ class CrateTest < Test::Unit::TestCase
     crate.author = bob
     info.author = bob
 
-    assert_equal [bob], crate.contextual_entities
+    assert_includes crate.contextual_entities, bob
+    assert_equal 1, crate.contextual_entities.length
     assert_equal bob, info.author
     assert_equal bob, crate.author
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro-crate
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.5.0
 platform: ruby
 authors:
 - Finn Bacall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.5.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.3
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 description: 
 email: finn.bacall@manchester.ac.uk
 executables: []
@@ -2455,7 +2469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Create, manipulate, read RO-Crates.