ro-crate 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f4b8cd765215082edea1be4e3c065a29ddcdbbc43a79576a4782ba8d797f07
-  data.tar.gz: d8936210124988edd8fd942c978a93ea6ee6f17fa1bcbfd3b6528e7475143ca1
+  metadata.gz: b489bc85ce753f46035d1f5843ac9539de35e1403b92a9139c19061901d6b2d6
+  data.tar.gz: 6aab0b3d9f9323d7470554d82a887376fc00db95f68d0fae011416c66eb38937
 SHA512:
-  metadata.gz: cf88d846278c037fd4437db9f1cd5f3fd31d6901eeb161a38417a5919edaf9e013f28cfadea7a59bf77a687c5946f540ee6cfa28ccc001d473dac41eaf3c5f3e
-  data.tar.gz: ab8413b46ad23145ca6d68f2554cad6eacb9f2ecd349e890b6380295029da5426110e447c863170d997071a6dba3f76c72006ca6a90b9a456ac96858e114aa86
+  metadata.gz: 55769c5b1a9b22ec5ad19e762ce9651e47407dbd01673c790c59753c6ac617cfa2ea81ecdcc6004313775069344845147c765e6396303491c94091e006c98b5b
+  data.tar.gz: 1798256fa994b7851da4b0adf0d78514aeaadc2e48935820d3c1f5dc546a8a633d5da11db19adeec7bd8763093a133744551e37f702d943a376c1b082e12d388

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ro-crate (0.4.15)
+    ro-crate (0.4.16)
       addressable (>= 2.7, < 2.9)
       rubyzip (~> 2.0.0)
 

data/lib/ro_crate/model/contextual_entity.rb

@@ -4,8 +4,7 @@ module ROCrate
   # Contextual Entities are used to describe and provide context to the Data Entities within the crate.
   class ContextualEntity < Entity
     def self.format_local_id(id)
-      i = super
-      i.start_with?('#') ? i : "##{i}"
+      super(id.start_with?('#') ? id : "##{id}")
     end
 
     ##

data/lib/ro_crate/model/entity.rb

@@ -57,7 +57,12 @@ module ROCrate
     # @param id [String] The candidate local ID to be formatted.
     # @return [String] The formatted local ID.
     def self.format_local_id(id)
-      Addressable::URI.escape(id.sub(/\A\.\//, '')) # Remove initial ./ if present
+      if id.start_with?('#')
+        '#' + Addressable::URI.encode_component(id[1..-1], Addressable::URI::CharacterClasses::QUERY)
+      else
+        # Remove initial ./ if present
+        Addressable::URI.encode_component(id.sub(/\A\.\//, ''), Addressable::URI::CharacterClasses::PATH)
+      end
     end
 
     ##

data/ro_crate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ro-crate'
-  s.version     = '0.4.15'
+  s.version     = '0.4.16'
   s.summary     = 'Create, manipulate, read RO-Crates.'
   s.authors     = ['Finn Bacall']
   s.email       = 'finn.bacall@manchester.ac.uk'

data/test/entity_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test_helper'
 
 class EntityTest < Test::Unit::TestCase
@@ -75,6 +76,7 @@ class EntityTest < Test::Unit::TestCase
     assert_equal "#Hello%20World/Goodbye%20World", ROCrate::ContextualEntity.format_id('#Hello World/Goodbye World')
     assert_equal "#Hello%20World/Goodbye%20World", ROCrate::ContextualEntity.format_id('Hello World/Goodbye World')
     assert_equal "#%F0%9F%98%8A", ROCrate::ContextualEntity.format_id("😊")
+    assert_equal "https://orcid.org/0000-0002-0048-3300", ROCrate::ContextualEntity.format_id("https://orcid.org/0000-0002-0048-3300")
 
     assert_equal "test123/hello.txt", ROCrate::File.format_id('./test123/hello.txt')
     assert_equal "test123/hello.txt", ROCrate::File.format_id('./test123/hello.txt/')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro-crate
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Finn Bacall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable