ro-crate 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f4e08570b547ac985a759af19d619747dd78a9001cd7994f314a42c014e001
-  data.tar.gz: e3711f54d12c1b4d6b1d68d16923dd051ae2b3a01a28a1d1e155a471bb84bfab
+  metadata.gz: cb6b4eba94b7190b7888cf3b1ddc8a8c6d0b464834ff48c45d9b50e6b13844ce
+  data.tar.gz: 70e0079caadfa3f17745e918f8109ec5908a8aa0c87d80aeaebfc55fdc03a9a8
 SHA512:
-  metadata.gz: 2a468ad85761945fc782b5ccb6943e4d1b53c7bb528dba59ed19f93ab2af08017f212d93bf47f9af983b6f00fd304dd1b2edfaef5e096f04ffdb181fd75352e5
-  data.tar.gz: 89edb2f44a6842a7409c2e3107e76b3c401533738c32e6c18faecc6c9c29e6fd71a0d06fbe20f67fdec62564d00b3c168da36b29662ab8badfe652d923b7ab58
+  metadata.gz: 62c9875be216987ceaca7e47f92112ba744109e4df9f8dcbba9023211ef3fc278f74f8ce7421523a0f443000f251627735eb01ce2357e9e526e36c23818bbba0
+  data.tar.gz: 0b5be2eedc7a045ccf25db4e3d800107f30d00b62e1e4b5bdb1deed1eed941897f46621bef9fa9a012891bc058857de82d6afebeb122153f8ffc944b8ca06a7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ro-crate (0.4.9)
+    ro-crate (0.4.10)
       addressable (~> 2.7.0)
       rubyzip (~> 2.0.0)
 

data/lib/ro_crate/reader.rb

@@ -84,7 +84,10 @@ module ROCrate
     def self.read_zip(source, target_dir: Dir.mktmpdir)
       unzip_to(source, target_dir)
 
-      read_directory(target_dir)
+      # Traverse the unzipped directory to try and find the crate's root
+      root_dir = detect_root_directory(target_dir)
+
+      read_directory(root_dir)
     end
 
     ##
@@ -252,5 +255,23 @@ module ROCrate
       raise "Metadata entity does not reference any root entity" unless root_id
       entities.delete(root_id)
     end
+
+    ##
+    # Finds an RO-Crate's root directory (where `ro-crate-metdata.json` is located) within a given directory.
+    #
+    # @param source [String, ::File, Pathname] The location of the directory.
+    # @return [Pathname, nil] The path to the root, or nil if not found.
+    def self.detect_root_directory(source)
+      Pathname(source).find do |entry|
+        if entry.file?
+          name = entry.basename.to_s
+          if name == ROCrate::Metadata::IDENTIFIER || name == ROCrate::Metadata::IDENTIFIER_1_0
+            return entry.parent
+          end
+        end
+      end
+
+      nil
+    end
   end
 end

data/ro_crate.gemspec

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

data/test/reader_test.rb

@@ -215,4 +215,16 @@ class ReaderTest < Test::Unit::TestCase
     assert string.is_a?(String)
     assert_equal 11, ROCrate::Reader.read_zip(string).entries.count
   end
+
+  test 'reading from zip where the crate root is nested somewhere within' do
+    crate = ROCrate::Reader.read_zip(fixture_file('nested_directory.zip'))
+
+    assert crate.entries['fish/info.txt']
+    assert_equal '1234', crate.entries['fish/info.txt'].source.read.chomp
+    assert crate.entries['fish/root.txt']
+    assert crate.entries['fish/data/info.txt']
+    assert crate.entries['fish/data/nested.txt']
+    assert crate.entries['fish/data/binary.jpg']
+    assert_equal ['./', 'fish/', 'ro-crate-metadata.json', 'ro-crate-preview.html'], crate.entities.map(&:id).sort
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro-crate
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Finn Bacall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -165,6 +165,7 @@ files:
 - test/fixtures/directory_crate/ro-crate-preview.html
 - test/fixtures/file with spaces.txt
 - test/fixtures/info.txt
+- test/fixtures/nested_directory.zip
 - test/fixtures/spaces/file with spaces.txt
 - test/fixtures/spaces/ro-crate-metadata.jsonld
 - test/fixtures/sparse_directory_crate.zip